Index: openacs-4/packages/acs-admin/lib/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/password-update.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/lib/password-update.tcl 17 Jul 2018 11:42:26 -0000 1.9
+++ openacs-4/packages/acs-admin/lib/password-update.tcl 17 Jul 2018 13:32:18 -0000 1.10
@@ -47,7 +47,7 @@
{html {size 20}}
}
} -on_request {
-
+
} -validate {
{password_1
{ [string equal $password_1 $password_2] }
@@ -71,21 +71,21 @@
ad_returnredirect [export_vars -base [ad_conn url] -entire_form -exclude { old_password } -override { { password_old $old_password } }]
ad_script_abort
}
- ad_return_error $result(password_message) ""
- ad_script_abort
+ ad_return_error $result(password_message) ""
+ ad_script_abort
}
default {
form set_error update password_1 $result(password_message)
- break
+ break
}
}
-
+
# If the account was closed, it might be open now
if {[ad_conn account_status] eq "closed"} {
auth::verify_account_status
}
-
+
} -after_submit {
if { $return_url eq "" } {
set return_url [ad_pvt_home]
Index: openacs-4/packages/acs-api-browser/www/proc-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-api-browser/www/proc-search.tcl 17 Jul 2018 11:42:26 -0000 1.22
+++ openacs-4/packages/acs-api-browser/www/proc-search.tcl 17 Jul 2018 13:32:18 -0000 1.23
@@ -69,7 +69,7 @@
set private_matches [list]
# place a [list proc_name score positionals] into matches for every proc
-foreach proc [nsv_array names api_proc_doc] {
+foreach proc [nsv_array names api_proc_doc] {
set score 0
array set doc_elements [nsv_get api_proc_doc $proc]
@@ -87,23 +87,23 @@
if {[string tolower $query_string] eq [string tolower $proc]} {
incr score [expr {$name_weight * 2}]
} elseif { ! $exact_match_p } {
- incr score [expr {$name_weight * [::apidoc::ad_keywords_score $query_string $proc]}]
+ incr score [expr {$name_weight * [::apidoc::ad_keywords_score $query_string $proc]}]
}
}
-
+
################
## Param Search:
################
if {$param_weight} {
incr score [expr {$param_weight * [::apidoc::ad_keywords_score $query_string "$doc_elements(positionals) $doc_elements(switches)"]}]
}
-
+
##############
## Doc Search:
##############
if {$doc_weight > 0} {
-
+
set doc_string [lindex $doc_elements(main) 0]
if {[info exists doc_elements(param)]} {
foreach parameter $doc_elements(param) {
@@ -114,9 +114,9 @@
append doc_string " $doc_elements(return)"
}
incr score [expr {$doc_weight * [::apidoc::ad_keywords_score $query_string $doc_string]}]
-
+
}
-
+
#################
## Source Search:
#################
@@ -128,15 +128,15 @@
#####
## Place Needed info in matches
if {$score} {
- if {$doc_elements(varargs_p)} {
+ if {$doc_elements(varargs_p)} {
set args "$doc_elements(positionals) \[ args... \]"
- } else {
+ } else {
set args $doc_elements(positionals)
- }
+ }
if { $doc_elements(deprecated_p) } {
lappend deprecated_matches [list $proc $score $args]
} else {
- if { $doc_elements(protection) eq "public" } {
+ if { $doc_elements(protection) eq "public" } {
lappend matches [list $proc $score $args]
} else {
lappend private_matches [list $proc $score $args]
Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 17 Jul 2018 11:42:26 -0000 1.30
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 17 Jul 2018 13:32:18 -0000 1.31
@@ -41,15 +41,15 @@
HTML formatting) that represents the details.
} {
if {$days_of_week eq ""} {
- set days_of_week "[_ acs-datetime.days_of_week]"
+ set days_of_week "[_ acs-datetime.days_of_week]"
}
dt_get_info $date
set today_date [dt_sysdate]
if {$calendar_details eq ""} {
- set calendar_details [ns_set create calendar_details]
+ set calendar_details [ns_set create calendar_details]
}
set day_of_week $first_day_of_month
@@ -60,13 +60,13 @@
set prev_month_url ""
if {$prev_month_template ne ""} {
- set ansi_date [ns_urlencode $prev_month]
- set prev_month_url [subst $prev_month_template]
+ set ansi_date [ns_urlencode $prev_month]
+ set prev_month_url [subst $prev_month_template]
}
if {$next_month_template ne ""} {
- set ansi_date [ns_urlencode $next_month]
- set next_month_url [subst $next_month_template]
+ set ansi_date [ns_urlencode $next_month]
+ set next_month_url [subst $next_month_template]
}
# We offer an option to put the links to next and previous months
@@ -228,26 +228,26 @@
@return a small calendar for a specific month. Defaults to this month.
} {
if {$days_of_week eq ""} {
- set days_of_week [_ acs-datetime.short_days_of_week]
+ set days_of_week [_ acs-datetime.short_days_of_week]
}
return [dt_widget_month \
- -calendar_details $calendar_details \
- -date $date \
- -days_of_week $days_of_week \
- -large_calendar_p $large_calendar_p \
- -master_bgcolor $master_bgcolor \
- -header_bgcolor $header_bgcolor \
- -header_text_color $header_text_color \
- -header_text_size $header_text_size \
- -day_number_template $day_number_template \
- -day_header_size $day_header_size \
- -day_header_bgcolor $day_header_bgcolor \
- -calendar_width $calendar_width \
- -day_bgcolor $day_bgcolor \
- -day_text_color $day_text_color \
- -empty_bgcolor $empty_bgcolor \
- -next_month_template $next_month_template \
- -prev_month_template $prev_month_template ]
+ -calendar_details $calendar_details \
+ -date $date \
+ -days_of_week $days_of_week \
+ -large_calendar_p $large_calendar_p \
+ -master_bgcolor $master_bgcolor \
+ -header_bgcolor $header_bgcolor \
+ -header_text_color $header_text_color \
+ -header_text_size $header_text_size \
+ -day_number_template $day_number_template \
+ -day_header_size $day_header_size \
+ -day_header_bgcolor $day_header_bgcolor \
+ -calendar_width $calendar_width \
+ -day_bgcolor $day_bgcolor \
+ -day_text_color $day_text_color \
+ -empty_bgcolor $empty_bgcolor \
+ -next_month_template $next_month_template \
+ -prev_month_template $prev_month_template ]
}
ad_proc dt_widget_month_centered {
@@ -274,7 +274,7 @@
} {
if {$days_of_week eq ""} {
- set days_of_week [_ acs-datetime.short_days_of_week]
+ set days_of_week [_ acs-datetime.short_days_of_week]
}
set output ""
@@ -325,32 +325,32 @@
ignored.
} {
if { $width < 1 || $width > 12 } {
- return "[_ acs-datetime.lt_Width_must_be_]"
+ return "[_ acs-datetime.lt_Width_must_be_]"
}
if {$days_of_week eq ""} {
- set days_of_week "[_ acs-datetime.short_days_of_week]"
+ set days_of_week "[_ acs-datetime.short_days_of_week]"
}
set output "<table><tr valign=top>\n"
set current_width 0
for { set n 1 } { $n <= 12 } { incr n } {
- dt_get_info $date
+ dt_get_info $date
- append output "
- <td>
- [dt_widget_month_small -calendar_details $calendar_details -date $date -days_of_week $days_of_week -large_calendar_p $large_calendar_p -master_bgcolor $master_bgcolor -header_bgcolor $header_bgcolor -header_text_color $header_text_color -header_text_size $header_text_size -day_number_template $day_number_template -day_header_size $day_header_size -day_header_bgcolor $day_header_bgcolor -calendar_width $calendar_width -day_bgcolor $day_bgcolor -day_text_color $day_text_color -empty_bgcolor $empty_bgcolor -next_month_template $next_month_template -prev_month_template $prev_month_template ]
- </td>\n"
+ append output "
+ <td>
+ [dt_widget_month_small -calendar_details $calendar_details -date $date -days_of_week $days_of_week -large_calendar_p $large_calendar_p -master_bgcolor $master_bgcolor -header_bgcolor $header_bgcolor -header_text_color $header_text_color -header_text_size $header_text_size -day_number_template $day_number_template -day_header_size $day_header_size -day_header_bgcolor $day_header_bgcolor -calendar_width $calendar_width -day_bgcolor $day_bgcolor -day_text_color $day_text_color -empty_bgcolor $empty_bgcolor -next_month_template $next_month_template -prev_month_template $prev_month_template ]
+ </td>\n"
- incr current_width
+ incr current_width
- if { $current_width == $width && $n != 12} {
- set current_width 0
- append output "</tr><tr valign=top>\n"
- }
+ if { $current_width == $width && $n != 12} {
+ set current_width 0
+ append output "</tr><tr valign=top>\n"
+ }
- set date $next_month
+ set date $next_month
}
return [concat $output "</tr></table>\n"]
@@ -380,30 +380,30 @@
passed in date. Defaults to this year.
} {
if {$days_of_week eq ""} {
- set days_of_week "[_ acs-datetime.short_days_of_week]"
+ set days_of_week "[_ acs-datetime.short_days_of_week]"
}
dt_get_info $date
return [dt_widget_year \
- -calendar_details $calendar_details \
- -date $beginning_of_year \
- -days_of_week $days_of_week \
- -large_calendar_p $large_calendar_p \
- -master_bgcolor $master_bgcolor \
- -header_bgcolor $header_bgcolor \
- -header_text_color $header_text_color \
- -header_text_size $header_text_size \
- -day_number_template $day_number_template \
- -day_header_size $day_header_size \
- -day_header_bgcolor $day_header_bgcolor \
- -calendar_width $calendar_width \
- -day_bgcolor $day_bgcolor \
- -day_text_color $day_text_color \
- -empty_bgcolor $empty_bgcolor \
- -next_month_template $next_month_template \
- -prev_month_template $prev_month_template \
- -width $width]
+ -calendar_details $calendar_details \
+ -date $beginning_of_year \
+ -days_of_week $days_of_week \
+ -large_calendar_p $large_calendar_p \
+ -master_bgcolor $master_bgcolor \
+ -header_bgcolor $header_bgcolor \
+ -header_text_color $header_text_color \
+ -header_text_size $header_text_size \
+ -day_number_template $day_number_template \
+ -day_header_size $day_header_size \
+ -day_header_bgcolor $day_header_bgcolor \
+ -calendar_width $calendar_width \
+ -day_bgcolor $day_bgcolor \
+ -day_text_color $day_text_color \
+ -empty_bgcolor $empty_bgcolor \
+ -next_month_template $next_month_template \
+ -prev_month_template $prev_month_template \
+ -width $width]
}
# A couple of helper procs to return the location of navigation icons.
@@ -443,15 +443,15 @@
if { $viewname == $view } {
# current view
append result [subst {<td class="selected">
- <span style="font-size: smaller; font-weight: bold">$text</span>
- </td>
- }]
+ <span style="font-size: smaller; font-weight: bold">$text</span>
+ </td>
+ }]
} else {
append result [subst {<td class="no-border">
- <a href="[ns_quotehtml ${base_url}view=$viewname&date=$date]" title="$viewdesc">
- <span style="font-size: smaller; font-weight: bold">$text</span></a>
- </td>
- }]
+ <a href="[ns_quotehtml ${base_url}view=$viewname&date=$date]" title="$viewdesc">
+ <span style="font-size: smaller; font-weight: bold">$text</span></a>
+ </td>
+ }]
}
}
@@ -473,7 +473,7 @@
} {
# Return immediately of the current view isn't month or year
if {$view ni [list month year]} {
- return ""
+ return ""
}
# Convert the given data into current calendar time
@@ -483,23 +483,23 @@
# Check that links to prev/next year don't lead to illegal dates that would bomb
if {[catch {set prev_year [clock format [clock scan "1 year ago" -base $now] -format "%Y-%m-%d"]} err]} {
- set prev_year_legal_p 0
+ set prev_year_legal_p 0
} else {
- if {[catch {clock scan $prev_year}]} {
- set prev_year_legal_p 0
- } else {
- set prev_year_legal_p 1
- }
+ if {[catch {clock scan $prev_year}]} {
+ set prev_year_legal_p 0
+ } else {
+ set prev_year_legal_p 1
+ }
}
if {[catch {set next_year [clock format [clock scan "1 year" -base $now] -format "%Y-%m-%d"]} err]} {
- set next_year_legal_p 0
+ set next_year_legal_p 0
} else {
- if {[catch {clock scan $next_year}]} {
- set next_year_legal_p 0
- } else {
- set next_year_legal_p 1
- }
+ if {[catch {clock scan $next_year}]} {
+ set next_year_legal_p 0
+ } else {
+ set next_year_legal_p 1
+ }
}
set curr_year [clock format $now -format "%Y"]
@@ -513,29 +513,29 @@
# Serve arrow link to prev year if it leads to legal date
if {$prev_year_legal_p != 0} {
- append result [subst {
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $prev_year]]">
- <img alt="left arrow" src="[dt_left_arrow]"></a>
- }]
+ append result [subst {
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $prev_year]]">
+ <img alt="left arrow" src="[dt_left_arrow]"></a>
+ }]
}
append result "
<b>$curr_year</b>"
# Serve arrow to next year if it leads to a legal date
if {$next_year_legal_p != 0} {
- append result [subst {
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $next_year]]">
- <img alt="right arrow" src="[dt_right_arrow]"></a>
- }]
+ append result [subst {
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $next_year]]">
+ <img alt="right arrow" src="[dt_right_arrow]"></a>
+ }]
}
append result "
- </td>
- </tr>
- </table>
- </td>
- </tr>\n"
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>\n"
return $result
}
@@ -552,48 +552,48 @@
# Check that the arrows to prev/next months don't go to illegal dates and bomb
if {[catch {set prev_month [clock format [clock scan "1 month ago" -base $now] -format "%Y-%m-%d"]} err ]} {
- set prev_month_legal_p 0
+ set prev_month_legal_p 0
} else {
- if {[catch {clock scan $prev_month}]} {
- set prev_month_legal_p 0
- } else {
- set prev_month_legal_p 1
- }
+ if {[catch {clock scan $prev_month}]} {
+ set prev_month_legal_p 0
+ } else {
+ set prev_month_legal_p 1
+ }
}
if {[catch {set next_month [clock format [clock scan "1 month" -base $now] -format "%Y-%m-%d"]} err]} {
- set next_month_legal_p 0
+ set next_month_legal_p 0
} else {
- if {[catch {clock scan $next_month}]} {
- set next_month_legal_p 0
- } else {
- set next_month_legal_p 1
- }
+ if {[catch {clock scan $next_month}]} {
+ set next_month_legal_p 0
+ } else {
+ set next_month_legal_p 1
+ }
}
append results [subst {
- <tr><td class="bottom-border" nowrap align="center" colspan="5">
- <table cellspacing="0" cellpadding="1" border="0">
- <tr><td nowrap valign="middle">
+ <tr><td class="bottom-border" nowrap align="center" colspan="5">
+ <table cellspacing="0" cellpadding="1" border="0">
+ <tr><td nowrap valign="middle">
}]
# Output link to previous month only if it's legal
if {$prev_month_legal_p != 0} {
- append results [subst {
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $prev_month]]">
- <img alt="left arrow" src="[dt_left_arrow]"></a>
- }]
+ append results [subst {
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $prev_month]]">
+ <img alt="left arrow" src="[dt_left_arrow]"></a>
+ }]
}
append results "
<span style=\"font-size: smaller; font-weight: bold\">$curr_month</span>"
# Output link to next month only if it's a legal month
if {$next_month_legal_p != 0} {
- append results [subst {
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $next_month]]">
- <img border="0" src="[dt_right_arrow]"></a>
- }]
+ append results [subst {
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $next_month]]">
+ <img border="0" src="[dt_right_arrow]"></a>
+ }]
}
append results "
@@ -626,17 +626,17 @@
# valid views are "list" "day" "week" "month" "year"
if {$base_url eq ""} {
- set base_url [ns_conn url]
+ set base_url [ns_conn url]
}
if {$pass_in_vars ne ""} {
- append base_url "?$pass_in_vars&"
+ append base_url "?$pass_in_vars&"
} else {
- append base_url "?"
+ append base_url "?"
}
if {$date eq ""} {
- set date [dt_sysdate]
+ set date [dt_sysdate]
}
set list_of_vars [list]
@@ -662,182 +662,182 @@
[dt_navbar_year $view $base_url $date]\n"
if {$view eq "month"} {
- # month view
- append output [subst {
- <tr>
- <td class="no-borders" colspan="5">
- <table bgcolor="ffffff" cellspacing="3" cellpadding="1" border="0">
- <tr>
- }]
+ # month view
+ append output [subst {
+ <tr>
+ <td class="no-borders" colspan="5">
+ <table bgcolor="ffffff" cellspacing="3" cellpadding="1" border="0">
+ <tr>
+ }]
- set months_list [dt_month_names]
- set now [clock scan $date]
- set curr_month [expr {[util::trim_leading_zeros [clock format $now -format "%m"]] - 1}]
+ set months_list [dt_month_names]
+ set now [clock scan $date]
+ set curr_month [expr {[util::trim_leading_zeros [clock format $now -format "%m"]] - 1}]
- for {set i 0} {$i < 12} {incr i} {
+ for {set i 0} {$i < 12} {incr i} {
- set month [lindex $months_list $i]
+ set month [lindex $months_list $i]
- # show 3 months in a row
+ # show 3 months in a row
- if {$i != 0 && $i % 3 == 0} {
- append output "</tr><tr>"
- }
+ if {$i != 0 && $i % 3 == 0} {
+ append output "</tr><tr>"
+ }
- if {$i == $curr_month} {
- append output "
- <td>
- <span style=\"font-size: smaller; color: red\">$month</span>
- </td>\n"
- } else {
- set target_date [clock format \
- [clock scan "[expr {$i-$curr_month}] month" -base $now] \
- -format "%Y-%m-%d"]
+ if {$i == $curr_month} {
+ append output "
+ <td>
+ <span style=\"font-size: smaller; color: red\">$month</span>
+ </td>\n"
+ } else {
+ set target_date [clock format \
+ [clock scan "[expr {$i-$curr_month}] month" -base $now] \
+ -format "%Y-%m-%d"]
- append output [subst {
- <td>
- <a href="[ns_quotehtml ${base_url}view=month&date=[ns_urlencode $target_date]]">
- <span style="font-size: smaller; color: blue;">$month</span></a>
- </td>
- }]
- }
- }
+ append output [subst {
+ <td>
+ <a href="[ns_quotehtml ${base_url}view=month&date=[ns_urlencode $target_date]]">
+ <span style="font-size: smaller; color: blue;">$month</span></a>
+ </td>
+ }]
+ }
+ }
- append output "</tr>"
+ append output "</tr>"
} elseif {$view eq "year"} {
- # year view
+ # year view
- append output "
- <tr>
- <td colspan='5'>
- <table bgcolor='ffffff' cellspacing='3' cellpadding='1' border='0'>
- <tr>\n"
+ append output "
+ <tr>
+ <td colspan='5'>
+ <table bgcolor='ffffff' cellspacing='3' cellpadding='1' border='0'>
+ <tr>\n"
- set now [clock scan $date]
- set curr_year $year
- set end_year [expr {$year + 2}]
- set monthday [clock format $now -format "%m-%d"]
+ set now [clock scan $date]
+ set curr_year $year
+ set end_year [expr {$year + 2}]
+ set monthday [clock format $now -format "%m-%d"]
- for {set year [expr {$curr_year - 2}]} {$year <= $end_year} {incr year} {
- if {$year == $curr_year} {
- append output "
- <td><span style=\"font-size: smaller; color: red\">$year</span></td>\n"
- } else {
- append output [subst {
- <td>
- <a href="[ns_quotehtml ${base_url}view=year&date=[ns_urlencode $year-$monthday]]">
- <span style="font-size: smaller; color: blue;">$year</span></a>
- </td>
- }]
- }
- }
+ for {set year [expr {$curr_year - 2}]} {$year <= $end_year} {incr year} {
+ if {$year == $curr_year} {
+ append output "
+ <td><span style=\"font-size: smaller; color: red\">$year</span></td>\n"
+ } else {
+ append output [subst {
+ <td>
+ <a href="[ns_quotehtml ${base_url}view=year&date=[ns_urlencode $year-$monthday]]">
+ <span style="font-size: smaller; color: blue;">$year</span></a>
+ </td>
+ }]
+ }
+ }
- append output "</tr>"
+ append output "</tr>"
} else {
- append output "
- [dt_navbar_month $view $base_url $date]
- </table>
- </td>
- </tr>
+ append output "
+ [dt_navbar_month $view $base_url $date]
+ </table>
+ </td>
+ </tr>
- <tr><td class='bottom-border' colspan='5'>
- <table cellspacing='3' cellpadding='1'>
- <tr>
- "
+ <tr><td class='bottom-border' colspan='5'>
+ <table cellspacing='3' cellpadding='1'>
+ <tr>
+ "
- set days_of_week [list S M T W T F S]
+ set days_of_week [list S M T W T F S]
- foreach day_of_week $days_of_week {
- append output [subst {
- <td align="right"><span style="font-size: smaller; font-weight: bold;">$day_of_week</span>
- </td>
- }]
- }
- append output "</tr><tr><td colspan='7'><hr></td></tr>"
+ foreach day_of_week $days_of_week {
+ append output [subst {
+ <td align="right"><span style="font-size: smaller; font-weight: bold;">$day_of_week</span>
+ </td>
+ }]
+ }
+ append output "</tr><tr><td colspan='7'><hr></td></tr>"
- set day_of_week 1
- set julian_date $first_julian_date
- set day_number $first_day
+ set day_of_week 1
+ set julian_date $first_julian_date
+ set day_number $first_day
- while {1} {
+ while {1} {
- if {$julian_date < $first_julian_date_of_month} {
- set before_month_p 1
- set after_month_p 0
- } elseif {$julian_date > $last_julian_date_in_month} {
- set before_month_p 0
- set after_month_p 1
- } else {
- set before_month_p 0
- set after_month_p 0
- }
+ if {$julian_date < $first_julian_date_of_month} {
+ set before_month_p 1
+ set after_month_p 0
+ } elseif {$julian_date > $last_julian_date_in_month} {
+ set before_month_p 0
+ set after_month_p 1
+ } else {
+ set before_month_p 0
+ set after_month_p 0
+ }
- set ansi_date [dt_julian_to_ansi $julian_date]
+ set ansi_date [dt_julian_to_ansi $julian_date]
- if {$julian_date == $first_julian_date_of_month} {
- set day_number 1
- } elseif {$julian_date > $last_julian_date} {
- break
- } elseif {$julian_date == $last_julian_date_in_month + 1} {
- set day_number 1
- }
+ if {$julian_date == $first_julian_date_of_month} {
+ set day_number 1
+ } elseif {$julian_date > $last_julian_date} {
+ break
+ } elseif {$julian_date == $last_julian_date_in_month + 1} {
+ set day_number 1
+ }
- if { $day_of_week == 1} {
- append output "<tr>\n"
- }
+ if { $day_of_week == 1} {
+ append output "<tr>\n"
+ }
- if {$before_month_p || $after_month_p} {
- append output [subst {
- <td align="right">
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $ansi_date]]">
- <span style="color: gray">$day_number</span></a>
- </td>
- }]
- } elseif {$julian_date == $julian_date_today} {
- append output "
- <td align='right'>
- <strong>$day_number</strong>
- </td>"
- } else {
- append output [subst {
- <td align="right">
- <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $ansi_date]]">
- <span style="color: blue">$day_number</span></a>
- </td>
- }]
- }
+ if {$before_month_p || $after_month_p} {
+ append output [subst {
+ <td align="right">
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $ansi_date]]">
+ <span style="color: gray">$day_number</span></a>
+ </td>
+ }]
+ } elseif {$julian_date == $julian_date_today} {
+ append output "
+ <td align='right'>
+ <strong>$day_number</strong>
+ </td>"
+ } else {
+ append output [subst {
+ <td align="right">
+ <a href="[ns_quotehtml ${base_url}view=$view&date=[ns_urlencode $ansi_date]]">
+ <span style="color: blue">$day_number</span></a>
+ </td>
+ }]
+ }
- incr day_of_week
- incr julian_date
- incr day_number
+ incr day_of_week
+ incr julian_date
+ incr day_number
- if { $day_of_week > 7 } {
- set day_of_week 1
- append output "</tr>\n"
- }
- }
+ if { $day_of_week > 7 } {
+ set day_of_week 1
+ append output "</tr>\n"
+ }
+ }
}
append today_url "$base_url" "view=day&date=[ns_urlencode [dt_sysdate]]"
append output "
- <tr><td align='center' colspan='7'>
- <table cellspacing='0' cellpadding='1' border='0'>
- <tr><td></td></tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr class=\"table-header\"><td align='center' colspan='5'>
- <table cellspacing='0' cellpadding='0' border='0'>
- <tr><td nowrap>
- <span style=\"font-size: smaller\">"
+ <tr><td align='center' colspan='7'>
+ <table cellspacing='0' cellpadding='1' border='0'>
+ <tr><td></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr class=\"table-header\"><td align='center' colspan='5'>
+ <table cellspacing='0' cellpadding='0' border='0'>
+ <tr><td nowrap>
+ <span style=\"font-size: smaller\">"
if { $view eq "day" && [dt_sysdate] == $date } {
append output "<strong>Today</strong>"
@@ -846,29 +846,29 @@
}
append output [subst {
- is [dt_ansi_to_pretty]</span></td></tr>
- <tr><td align="center"><br>
- <form method='get' action="[ns_quotehtml $base_url]">
- <div>
- <input type="text" name="date" size="10">
- <input type="image" src="/resources/acs-subsite/go.gif" alt="Go" border="0"><br>
- <span style="font-size:smaller">Date as YYYYMMDD</span>
- <input type="hidden" name="view" value="day">
- </div>
+ is [dt_ansi_to_pretty]</span></td></tr>
+ <tr><td align="center"><br>
+ <form method='get' action="[ns_quotehtml $base_url]">
+ <div>
+ <input type="text" name="date" size="10">
+ <input type="image" src="/resources/acs-subsite/go.gif" alt="Go" border="0"><br>
+ <span style="font-size:smaller">Date as YYYYMMDD</span>
+ <input type="hidden" name="view" value="day">
+ </div>
}]
foreach var $list_of_vars {
append output "<input type='hidden' name='[lindex $var 0]' value='[lindex $var 1]'>"
}
append output "
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>\n"
+ </form>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>\n"
return $output
}
Index: openacs-4/packages/acs-lang/lib/change-locale-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/Attic/change-locale-bar.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/lib/change-locale-bar.tcl 17 Jul 2018 11:42:26 -0000 1.7
+++ openacs-4/packages/acs-lang/lib/change-locale-bar.tcl 17 Jul 2018 13:32:18 -0000 1.8
@@ -29,11 +29,11 @@
db_multirow -extend {l10n_label switch_url} locale_list get_locale_list "
select el.label,
el.locale,
- (select count(*)
+ (select count(*)
from user_preferences
where locale = el.locale) as user_count
from enabled_locales el
- where (select count(*)
+ where (select count(*)
from lang_messages
where message_key = :avail_key
and locale = el.locale) > 0
@@ -49,9 +49,9 @@
#######################################################################
# The text to change locales, in decreasing order of desirability
-# 1) "Change Locale" in the browser's requested locale.
+# 1) "Change Locale" in the browser's requested locale.
# 2) If there is a list of locales, "..."
-# (NOT to the system default for "Change Locale". The reason is that, after a list of
+# (NOT to the system default for "Change Locale". The reason is that, after a list of
# language names, "..." should be more recognizable than a foreign word)
# 3) Fall back on the standard defaults for Change Locale
@@ -63,7 +63,7 @@
set change_locale_text "[_ acs-lang.change-locale]"
}
-if {$enabled_locale_count > 1 && $enabled_locale_count > $switchable_count} {
+if {$enabled_locale_count > 1 && $enabled_locale_count > $switchable_count} {
set change_locale_url [export_vars -base ${base_lang_url} {return_url}]
}
@@ -84,7 +84,7 @@
set lang_admin_text "Administer Locales"
} else {
set lang_admin_text "Add Locales"
-}
+}
# Local variables:
# mode: tcl
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.62 -r1.63
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 17 Jul 2018 11:42:26 -0000 1.62
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 17 Jul 2018 13:32:18 -0000 1.63
@@ -1,5 +1,5 @@
#/packages/acs-lang/tcl/lang-message-procs.tcl
-ad_library {
+ad_library {
Routines for displaying web pages in multiple languages
<p>
@@ -17,17 +17,17 @@
namespace eval lang::message {}
-ad_proc -public lang::message::check {
+ad_proc -public lang::message::check {
locale
package_key
message_key
message
-} {
+} {
<p>
Check a message for semantic and sanity correctness (usually called just before a message is registered).
Throws an error when one of the checks fails.
</p>
-} {
+} {
# Qualify the locale variable value with a country code if it is
# just a language
if { [string length $locale] == 2 } {
@@ -36,7 +36,7 @@
# invoked by users.
# let's get the default locale for that language
set locale [lang::util::default_locale_from_lang $locale]
- }
+ }
# Create a globally (across packages) unique key for the cache
set key "${package_key}.${message_key}"
@@ -52,47 +52,47 @@
if { [llength $missing_vars] > 0 } {
set msg "Message key '$key' in locale '$locale' has these embedded variables not present in the en_US locale:\
- [join $missing_vars ","]."
+ [join $missing_vars ","]."
ad_log error $msg
error $msg
}
}
-
+
# If a localization key from acs-lang...
if {[regexp {^acs-lang\.localization-(.*)$} $key match lc_key]} {
- #
- # ...number separators for decimal and thousands must be
- # checked to ensure they are not equal, otherwise the
- # localized number parsing will fail.
- #
- if {$lc_key in {decimal_point thousands_sep mon_thousands_sep}} {
- #
- # Fetch values in case there were already loaded.
- #
- foreach k {decimal_point thousands_sep mon_thousands_sep} {
- set $k [expr {[lang::message::message_exists_p $locale acs-lang.localization-$k] ?
- [lc_get -locale $locale $k] : ""}]
- }
- #
- # Overwrite the fetched value with the provided one.
- #
- set $lc_key $message
+ #
+ # ...number separators for decimal and thousands must be
+ # checked to ensure they are not equal, otherwise the
+ # localized number parsing will fail.
+ #
+ if {$lc_key in {decimal_point thousands_sep mon_thousands_sep}} {
+ #
+ # Fetch values in case there were already loaded.
+ #
+ foreach k {decimal_point thousands_sep mon_thousands_sep} {
+ set $k [expr {[lang::message::message_exists_p $locale acs-lang.localization-$k] ?
+ [lc_get -locale $locale $k] : ""}]
+ }
+ #
+ # Overwrite the fetched value with the provided one.
+ #
+ set $lc_key $message
- #
- # We require, that the decimal_point was either provided
- # or loaded before to be able to compare it with the
- # thousands points.
- #
- if {$decimal_point ne "" &&
- [string first $decimal_point "$thousands_sep$mon_thousands_sep"] > -1} {
- error "locale $locale, key: $key: Message keys for thousands and decimal separators must be different."
- }
- }
+ #
+ # We require, that the decimal_point was either provided
+ # or loaded before to be able to compare it with the
+ # thousands points.
+ #
+ if {$decimal_point ne "" &&
+ [string first $decimal_point "$thousands_sep$mon_thousands_sep"] > -1} {
+ error "locale $locale, key: $key: Message keys for thousands and decimal separators must be different."
+ }
+ }
}
}
-ad_proc -public lang::message::register {
+ad_proc -public lang::message::register {
{-update_sync:boolean}
{-upgrade_status "no_upgrade"}
{-conflict:boolean}
@@ -101,7 +101,7 @@
package_key
message_key
message
-} {
+} {
<p>
Registers a message for a given locale and package.
Inserts the message key into the database if it
@@ -117,9 +117,9 @@
@author Christian Hvid
@see _mr
-
+
@param locale Locale or language of the message. If a language is supplied,
- the default locale for the language is looked up.
+ the default locale for the language is looked up.
@param package_key The package key of the package that the message belongs to.
@@ -132,17 +132,17 @@
a message should only be not null when we know that message in
catalog file and db are identical (in sync). This message is then
used as a merge base for message catalog upgrades. For more info,
- see the lang::catalog::upgrade proc.
+ see the lang::catalog::upgrade proc.
- @param upgrade_status Set the upgrade status of the new message to "added", "updated", "deleted".
+ @param upgrade_status Set the upgrade status of the new message to "added", "updated", "deleted".
Defaults to "no_upgrade".
-
- @param conflict Set this switch if the upgrade represents a conflict between
+
+ @param conflict Set this switch if the upgrade represents a conflict between
changes made in the database and in catalog files.
@see lang::message::lookup
@see _
-} {
+} {
# Qualify the locale variable value with a country code if it is
# just a language
if { [string length $locale] == 2 } {
@@ -151,7 +151,7 @@
# invoked by users.
# let's get the default locale for that language
set locale [lang::util::default_locale_from_lang $locale]
- }
+ }
# Create a globally (across packages) unique key for the cache
set key "${package_key}.${message_key}"
@@ -173,17 +173,17 @@
error $error_message
}
}
-
+
# Call semantic and sanity checks on the key before registering.
lang::message::check $locale $package_key $message_key $message
-
+
# Build up an array of columns to set
array set cols [list]
if { $update_sync_p } {
set cols(sync_time) [db_map sync_time]
} else {
set cols(sync_time) "null"
- }
+ }
if { [string trim $message] eq "" } {
set cols(message) "null"
} else {
@@ -195,7 +195,7 @@
set cols(conflict_p) :conflict_db_p
# Different logic for update and insert
- if { [nsv_exists lang_message_$locale $key] } {
+ if { [nsv_exists lang_message_$locale $key] } {
# Update existing message if the message has changed
# For use in audit log call
@@ -218,7 +218,7 @@
}
db_transaction {
-
+
# Update audit log
lang::audit::changed_message \
$old_message \
@@ -230,16 +230,16 @@
$old_message_array(sync_time) \
$old_message_array(conflict_p) \
$old_message_array(upgrade_status)
-
- # Trying to avoid hitting Oracle bug#2011927
+
+ # Trying to avoid hitting Oracle bug#2011927
if { [string trim $message] eq "" } {
db_dml lang_message_update {}
- } else {
+ } else {
set cols(message) [db_map message]
db_dml lang_message_update {} -clobs [list $message]
}
}
- } else {
+ } else {
# Insert new message
set cols(package_key) :package_key
@@ -249,17 +249,17 @@
# We wrap this in a catch, so that it still works in the bootstrap-installer where ad_conn user_id will fail.
# LARS NOTE: Why not make ad_conn user_id return 0 in the bootstrap-installer?
catch {
- set creation_user [ad_conn user_id]
+ set creation_user [ad_conn user_id]
set cols(creation_user) :creation_user
}
-
+
set col_clauses [list]
set val_clauses [list]
foreach col [array names cols] {
lappend col_clauses $col
lappend val_clauses $cols($col)
}
-
+
# avoiding bug#2011927 from Oracle.
if { [string trim $message] eq "" } {
db_dml lang_message_insert_null_msg {}
@@ -272,7 +272,7 @@
nsv_set lang_message_$locale $key $message
}
-ad_proc -public lang::message::delete {
+ad_proc -public lang::message::delete {
-package_key:required
-message_key:required
-locale:required
@@ -312,9 +312,9 @@
where lma2.package_key = lma1.package_key
and lma2.message_key = lma1.message_key
and lma2.locale = lma1.locale
- )
+ )
}]
-
+
lang::message::register \
$locale \
$package_key \
@@ -326,7 +326,7 @@
-package_key:required
-message_key:required
-locale:required
- -element:required
+ -element:required
} {
Get value of a single attribute of a message.
@@ -345,18 +345,18 @@
return $message_array($element)
}
-ad_proc -public lang::message::get {
+ad_proc -public lang::message::get {
-package_key:required
-message_key:required
-locale:required
-array:required
} {
Get all properties of a message in a particular locale.
-
- @param array Name of an array in the caller's namespace into
+
+ @param array Name of an array in the caller's namespace into
which you want the message properties delivered.
- @return The array will contain the following entries:
+ @return The array will contain the following entries:
message_key,
package_key,
locale,
@@ -395,15 +395,15 @@
} -column_array row
}
-ad_proc -public lang::message::unregister {
+ad_proc -public lang::message::unregister {
package_key
message_key
} {
Unregisters a message key, i.e. deletes it along with all its messages
from the database and deleted entries in the cache. This proc is
useful when installing a package.
- To delete an individual message, as opposed to the entire key,
+ To delete an individual message, as opposed to the entire key,
use lang::message::delete.
@see lang::message::delete
@@ -444,7 +444,7 @@
@param edit_array_list An array list holding names of columns and
the values to set them to. Valid keys
in this array list are any column names in the
- lang_messages table.
+ lang_messages table.
@param update_sync If this switch is provided the sync_time
of the message will be updated to current time. If not
@@ -482,7 +482,7 @@
$old_message_array(deleted_p) \
$old_message_array(sync_time) \
$old_message_array(conflict_p) \
- $old_message_array(upgrade_status)
+ $old_message_array(upgrade_status)
# If we are deleting an en_US message we need to mark the message deleted in all locales
if {$locale eq "en_US"} {
@@ -515,7 +515,7 @@
}
if { [llength $set_clauses] > 0 } {
-
+
set sql "
update lang_messages
set [join $set_clauses ", "]
@@ -533,7 +533,7 @@
} {
Return the number of messages with conflicts (conflict_p=t) resulting
from catalog imports.
-
+
@param package_key Restrict count to package with this key
@param locale Restrict count to messages of this locale
@@ -584,7 +584,7 @@
message
} {
Returns a list of embedded substitution variables on the form %varname% in a message.
- This is useful if you want to check that the variables used in a translated message also
+ This is useful if you want to check that the variables used in a translated message also
appear in the en_US message. If not, there's likely to be a typo.
@param message A message with embedded %varname% notation
@@ -620,19 +620,19 @@
with array_key (what's between the percentage sings). If value_array_list is not
provided then attempt to fetch variable values the number of levels up given by
upvar_level (defaults to 3 because this proc is typically invoked from the underscore
- lookup proc).
+ lookup proc).
Here is an example:
set localized_message "The %animal% jumped across the %barrier%. About 50% of the time, he stumbled, or maybe it was %%20 %times%."
set value_list { animal "frog" barrier "fence" }
ns_log notice formatted=[format $localized_message $value_list]
-
+
The output from the example is:
The frog jumped across the fence. About 50% of the time, he stumbled, or maybe it was %20 %times%.
-} {
+} {
array set value_array $value_array_list
set value_array_keys [array names value_array]
set remaining_message $localized_message
@@ -649,10 +649,10 @@
if { [llength $value_array_list] > 0 } {
# A substitution list is provided, the key should be in there
-
+
if {$variable_string ni $value_array_keys} {
ns_log Warning "lang::message::format: The value_array_list \"$value_array_list\" does not contain the variable name $variable_string found in the message: $localized_message"
-
+
# There is no value available to do the substitution with
# so don't substitute at all
append formatted_message $percent_match
@@ -677,7 +677,7 @@
}
} else {
ns_log warning "Message contains a variable named '$variable_name' which doesn't exist in the caller's environment: message $localized_message"
- append formatted_message "MISSING: variable '$variable_name' is not available"
+ append formatted_message "MISSING: variable '$variable_name' is not available"
}
}
}
@@ -690,7 +690,7 @@
}
ad_proc -private lang::message::embedded_vars_regexp {} {
- The regexp pattern used to loop over variables embedded in
+ The regexp pattern used to loop over variables embedded in
message catalog texts.
@author Peter Marklund (peter@collaboraid.biz)
@@ -707,7 +707,7 @@
# Make sure messages are in the cache
lang::message::cache
- return [nsv_exists lang_message_$locale $key]
+ return [nsv_exists lang_message_$locale $key]
}
ad_proc -public lang::message::lookup {
@@ -723,32 +723,32 @@
Returns a translated string for the given locale and message key.
If the user is a translator, inserts tags to link to the translator
interface. This allows a translator to work from the context of a web page.
-
- Messages will have %name% replaced with variables either from substitution_list,
+
+ Messages will have %name% replaced with variables either from substitution_list,
if present, or from the caller's namespace (or upvar_level's namespace).
Set upvar_level to 0 and substitution_list empty to prevent substitution from happening
- Note that this proc does not use named parameters, because named parameters are
+ Note that this proc does not use named parameters, because named parameters are
relatively slow, and this is going to get called a whole lot on each request.
@param locale Locale (e.g., "en_US") or language (e.g., "en") string.
If locale is the empty string ad_conn locale will be used
if we are in an HTTP connection, otherwise the system locale
(SiteWideLocale) will be used.
- @param key Unique identifier for this message. Will be the same
- identifier for each locale. All keys belong to a certain
- package and should be prefixed with the package key of that package
- on the format package_key.message_key (the dot is reserved for separating
+ @param key Unique identifier for this message. Will be the same
+ identifier for each locale. All keys belong to a certain
+ package and should be prefixed with the package key of that package
+ on the format package_key.message_key (the dot is reserved for separating
the package key, the rest of the key should contain only alpha-numeric
- characters and underscores). If the key does not belong to
+ characters and underscores). If the key does not belong to
any particular package it should not contain a dot. A lookup
is always attempted with the exact key given to this proc.
@param default Text to return if there is no message in the message catalog for
the given locale. This argument is optional. If this argument is
not provided or is the empty string then the text returned will
- be TRANSLATION MISSING - $key.
+ be TRANSLATION MISSING - $key.
@param substitution_list A list of values to substitute into the message. This argument should
only be given for certain messages that contain place holders (on the syntax
@@ -760,8 +760,8 @@
@param upvar_level If there are embedded variables and no substitution list provided, this
parameter specifies how many levels up to fetch the values of the variables
in the message. The default is 1.
-
- @param translator_mode_p Set to 0 if you do not want this call to honor translator mode.
+
+ @param translator_mode_p Set to 0 if you do not want this call to honor translator mode.
Useful if you're not using this message in the page itself, but e.g.
for localization data or for the list of messages on the page.
@@ -771,18 +771,18 @@
@see _
@see lang::message::register
-
+
@return A localized piece of text.
-} {
+} {
# Make sure messages are in the cache
lang::message::cache
# Make sure that a default of "" is transformed into Translation Missing
# As per discussion on IRC on 2008-03-06
if { $default eq ""} {
- set default "TRANSLATION MISSING"
+ set default "TRANSLATION MISSING"
}
-
+
if { $locale eq "" } {
# No locale provided
@@ -801,9 +801,9 @@
} else {
set locale $default_locale
}
- }
+ }
- # We remember the passed-in locale, because we want the translator mode to show which
+ # We remember the passed-in locale, because we want the translator mode to show which
# messages have been translated, and which have not.
set org_locale $locale
@@ -832,18 +832,18 @@
if { [message_exists_p $locale $key] } {
set message [nsv_get lang_message_$locale $key]
} else {
- if {"TRANSLATION MISSING" ne $default} {
- set message $default
- } else {
+ if {"TRANSLATION MISSING" ne $default} {
+ set message $default
+ } else {
ad_log Error "lang::message::lookup: Key '$key' does not exist in en_US"
set message "MESSAGE KEY MISSING: '$key'"
- }
- }
+ }
+ }
}
}
}
}
-
+
# Do any variable substitutions (interpolation of variables)
# Set upvar_level to 0 and substitution_list empty to prevent substitution from happening
if { [llength $substitution_list] > 0 || ($upvar_level >= 1 && [string first "%" $message] != -1) } {
@@ -853,15 +853,15 @@
if { [lang::util::translator_mode_p] } {
# Translator mode - record the message lookup
lang::util::record_message_lookup $key
-
+
if { $translator_mode_p } {
global message_key_num
if { ![info exists message_key_num] } {
set message_key_num 1
} else {
incr message_key_num
}
-
+
# encode the key in the page
set message "$message\x02(\x01$key\x01)\x02"
}
@@ -870,17 +870,17 @@
return $message
}
-ad_proc -private lang::message::translate {
+ad_proc -private lang::message::translate {
msg
locale
} {
Translates an English string into a different language
using Babelfish.
Warning - october 2002: This is broken.
-
+
@author Henry Minsky (hqm@mit.edu)
-
+
@param msg String to translate
@param lang Abbreviation for lang in which to translate string
@return Translated string
@@ -898,7 +898,7 @@
} else {
error "Babelfish translation error"
}
-}
+}
ad_proc -private lang::message::cache {
@@ -910,23 +910,23 @@
# if we segregage instead by package. Check for problems with ns_info locks.
# LARS TODO: Use a mutex
- if { ![nsv_exists lang_message_cache executed_p] } {
+ if { ![nsv_exists lang_message_cache executed_p] } {
nsv_set lang_message_cache executed_p 1
if { $package_key eq "" } {
set package_where_clause ""
} else {
set package_where_clause "where package_key = :package_key"
}
-
- set i 0
+
+ set i 0
db_foreach select_locale_keys {} {
nsv_set lang_message_$locale "${package_key}.${message_key}" $message
incr i
}
-
+
db_release_unused_handles
-
+
ns_log Notice "lang::message::cache - Initialized message cache with $i rows from database"
}
}
@@ -945,14 +945,14 @@
Inserts the message into the table lang_messages
if it does not exist and updates if it does.
- For backward compatibility - it assumes that the key
+ For backward compatibility - it assumes that the key
is the concatenation of message and package key
like this:
package_key.message_key
@author Jeff Davis (davis@xarg.net)
-
+
@param locale Abbreviation for language of the message or the locale.
@param key Unique identifier for this message. Will be the same identifier
for each language
@@ -968,13 +968,13 @@
key
{substitution_list {}}
} {
- Short hand proc that invokes the lang::message::lookup proc.
+ Short hand proc that invokes the lang::message::lookup proc.
Returns a localized text from the message catalog with the locale ad_conn locale
if invoked within a request, or the system locale otherwise.
<p>
- Example:
+ Example:
<pre>
set the_url [export_vars -base "[ad_conn package_url]view" { item_id }]
set body [_ my-package.lt_To_view_this_item [list item_url $the_url]]
@@ -985,15 +985,15 @@
@param key Unique identifier for this message. Will be the same identifier
for each locale. The key is on the format package_key.message_key
- @param substitution_list
- A list of values to substitute into the message on the form { name value name value ... }.
+ @param substitution_list
+ A list of values to substitute into the message on the form { name value name value ... }.
This argument should only be given for certain messages that contain place holders (on the syntax
%1:pretty_name%, %2:another_pretty_name% etc) for embedding variable values.
If the message contains variables that should be interpolated and this argument
is not provided then upvar will be used to fetch the variable values.
@return A localized message
-
+
@author Jeff Davis (davis@xarg.net)
@author Peter Marklund (peter@collaboraid.biz)
@author Christian Hvid (chvid@collaboraid.biz)
Index: openacs-4/packages/acs-tcl/lib/static-progress-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/static-progress-bar.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/lib/static-progress-bar.tcl 17 Jul 2018 11:42:26 -0000 1.4
+++ openacs-4/packages/acs-tcl/lib/static-progress-bar.tcl 17 Jul 2018 13:32:18 -0000 1.5
@@ -47,13 +47,12 @@
set percentage_done 100
} elseif {[info exists finished_page] && $finished_page == $current} {
# subtract 1 from current, since we haven't completed this page yet
- set percentage_done [expr {round($current * 100.0 / $total)}]
+ set percentage_done [expr {round($current * 100.0 / $total)}]
} else {
# subtract 1 from current, since we haven't completed this page yet
set percentage_done [expr {round(($current - 1) * 100.0 / $total)}]
}
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 17 Jul 2018 11:42:26 -0000 1.44
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl 17 Jul 2018 13:32:18 -0000 1.45
@@ -108,7 +108,7 @@
@see ad_context_bar_html
} {
if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
- return ""
+ return ""
}
if { $node_id eq "" } {
@@ -129,7 +129,7 @@
template::multirow create $multirow url label
foreach elm [ad_context_node_list -from_node $from_node $node_id] {
- lassign $elm elm_0 elm_1
+ lassign $elm elm_0 elm_1
if { $node_id_url_end > 0 && [string match -nocase $node_id_url [string range $elm_0 0 ${node_id_url_end}-1] ] } {
set elm_0 [string range $elm_0 $node_id_url_end end]
}
@@ -169,7 +169,7 @@
@see ad_context_bar_html
} {
if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
- return ""
+ return ""
}
if { $node_id eq "" } {
@@ -187,10 +187,10 @@
# fix last element to just be literal string
lset context end [lindex $context end 1]
} else {
- if {![string match "\{*" $args]} {
- # args is not a list, transform it into one.
- set args [list $args]
- }
+ if {![string match "\{*" $args]} {
+ # args is not a list, transform it into one.
+ set args [list $args]
+ }
}
lappend context {*}$args
if { [info exists separator] } {
@@ -218,12 +218,12 @@
set counter 0
foreach arg $args {
lappend link_list [subst {<a href="[ns_quotehtml [lindex $element 0]]">[ns_quotehtml [lindex $element 1]]</a>}]
- incr counter
+ incr counter
}
if { $counter } {
- return "\[[join $link_list " | "]\]"
+ return "\[[join $link_list " | "]\]"
} else {
- return ""
+ return ""
}
}
@@ -237,19 +237,19 @@
set return_list [list]
foreach value $values {
- if { $default eq $value } {
- lappend return_list "<strong>[lindex $items $count]</strong>"
- } else {
- lappend return_list [subst {<a href="[ns_quotehtml [lindex $links $count]]">[ns_quotehtml [lindex $items $count]]</a>}]
- }
+ if { $default eq $value } {
+ lappend return_list "<strong>[lindex $items $count]</strong>"
+ } else {
+ lappend return_list [subst {<a href="[ns_quotehtml [lindex $links $count]]">[ns_quotehtml [lindex $items $count]]</a>}]
+ }
- incr count
+ incr count
}
if { [llength $return_list] > 0 } {
return "\[[join $return_list " | "]\]"
} else {
- return ""
+ return ""
}
}
@@ -299,13 +299,13 @@
# Netscape browser just have Mozilla in their user-agent header
if {$internet_explorer_p == 0} {
- set netscape_p [regexp -nocase "mozilla" $user_agent match]
+ set netscape_p [regexp -nocase "mozilla" $user_agent match]
}
set java_script_p 0
if { ($netscape_p && ($version >= 3)) || ($internet_explorer_p && ($version >= 4)) } {
- set java_script_p 1
+ set java_script_p 1
}
return $java_script_p
@@ -328,13 +328,13 @@
# Netscape browser just have Mozilla in their user-agent header
if {$internet_explorer_p == 0} {
- set netscape_p [regexp -nocase "mozilla" $user_agent match]
+ set netscape_p [regexp -nocase "mozilla" $user_agent match]
}
set netscape3_p 0
if { $netscape_p && $version == 3 } {
- set netscape3_p 1
+ set netscape3_p 1
}
return $netscape3_p
@@ -358,25 +358,25 @@
-script {go_to_url(this.options[this.selectedIndex].value);}
foreach item $items {
- set url_stub [ad_conn url]
+ set url_stub [ad_conn url]
- # if the url matches the url you would redirect to, as determined
- # either by highlight_url, or if highlight_url is not set,
- # the current url then select it
- if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
- append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
- } elseif {$highlight_url eq "" && [string match "*$url_stub*" [lindex $urls $counter]]} {
- append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
- } else {
- append return_string [subst {<option value="[lindex $urls $counter]">$item}]
- }
- incr counter
+ # if the url matches the url you would redirect to, as determined
+ # either by highlight_url, or if highlight_url is not set,
+ # the current url then select it
+ if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
+ append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
+ } elseif {$highlight_url eq "" && [string match "*$url_stub*" [lindex $urls $counter]]} {
+ append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
+ } else {
+ append return_string [subst {<option value="[lindex $urls $counter]">$item}]
+ }
+ incr counter
}
append return_string "</select><br>
- <noscript><input type='submit' value='GO'>
- </noscript>
- </form>\n"
+ <noscript><input type='submit' value='GO'>
+ </noscript>
+ </form>\n"
}
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl 17 Jul 2018 11:42:26 -0000 1.88
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 17 Jul 2018 13:32:18 -0000 1.89
@@ -3067,19 +3067,12 @@
}
}
-
-
-
-
-
#####
#
# Templating system ADP tags
#
#####
-
-
template_tag listtemplate { chunk params } {
set level [template::adp_level]
Index: openacs-4/packages/acs-templating/tcl/wizard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/wizard-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-templating/tcl/wizard-procs.tcl 17 Jul 2018 11:42:26 -0000 1.18
+++ openacs-4/packages/acs-templating/tcl/wizard-procs.tcl 17 Jul 2018 13:32:18 -0000 1.19
@@ -53,14 +53,14 @@
# create a wizard from a set of steps
-ad_proc -public template::wizard::create { args } {
+ad_proc -public template::wizard::create { args } {
<pre>example:
template::wizard create -action "wizard" -name my_wizard -params {
- my_param1 my_param2
+ my_param1 my_param2
} -steps {
- 1 -label "Step 1" -url "step1"
- 2 -label "Step 2" -url "step2"
- 3 -label "Step 3" -url "step3"
+ 1 -label "Step 1" -url "step1"
+ 2 -label "Step 2" -url "step2"
+ 3 -label "Step 3" -url "step3"
}
</pre>
<ul>
@@ -85,7 +85,7 @@
set parse_level $level
# keep wizard properties and a list of the steps
- upvar #$level wizard:steps steps wizard:properties opts
+ upvar #$level wizard:steps steps wizard:properties opts
upvar #$level wizard:rowcount rowcount
upvar #$level wizard:columns columns
upvar #$level wizard:name wizard_name
@@ -96,9 +96,9 @@
set steps [list]
set rowcount 0
if { [info exists opts(name)] } {
- set wizard_name $opts(name)
+ set wizard_name $opts(name)
} else {
- set wizard_name "wizard${level}"
+ set wizard_name "wizard${level}"
}
set wizards [get_wizards]
@@ -110,16 +110,16 @@
# add steps specified at the time the wizard is created
if { [info exists opts(steps)] } {
- # strip carriage returns
- regsub -all {\r} $opts(steps) {} step_data
+ # strip carriage returns
+ regsub -all {\r} $opts(steps) {} step_data
- foreach step [split $step_data "\n"] {
+ foreach step [split $step_data "\n"] {
- set step [string trim $step]
- if {$step eq {}} { continue }
+ set step [string trim $step]
+ if {$step eq {}} { continue }
- add {*}$step
- }
+ add {*}$step
+ }
}
}
@@ -152,14 +152,14 @@
}
-ad_proc -public template::wizard::set_param { name value } {
+ad_proc -public template::wizard::set_param { name value } {
<p>Set a wizard's param for passthrough</p>
- <p>Normally you place this in the steps of the wizard where the
+ <p>Normally you place this in the steps of the wizard where the
form has been processed. A param
is normally used when you want to reuse a value across the steps.</p>
- <p>Note: if you are to use "template::wizard set_param" on a wizard file ex.
+ <p>Note: if you are to use "template::wizard set_param" on a wizard file ex.
(wizard.tcl). Make sure to do it before "template::wizard get_current_step".
So when "template::wizard get_current_step" redirects it will properly set
the correct values of the param to the new value.</p>
@@ -175,7 +175,7 @@
}
-ad_proc -public template::wizard::set_finish_url { finish_url } {
+ad_proc -public template::wizard::set_finish_url { finish_url } {
<p>if the finish url is set, when a the finish button is pressed
it will redirect to this url</p>
@@ -219,16 +219,16 @@
determined by the wizard_step parameter. If not set, the first step
is used.</p>
- <p>Make sure that you call any "template::wizard set_param" if needed before
+ <p>Make sure that you call any "template::wizard set_param" if needed before
calling get_current_step. get_current_step will redirect to the wizard -action
properly setting all -params value and its other needed http state vars</p>
<p>The wizard will rewrite the url always. Only self submitting forms
are preserved. Once the form is finished processing the wizard will take
over and rewrite the url.</p>
- @param start Optionally specify
-
+ @param start Optionally specify
+
@see template::wizard
} {
get_reference
@@ -249,47 +249,47 @@
# if there is no step state, we are likely in the first step.
# lets redirect with the proper state vars
if {[ns_queryget wizard_step${wizard_name}] eq ""} {
- template::forward [get_forward_url $current_id]
+ template::forward [get_forward_url $current_id]
}
# get a reference to the step
- upvar #$level wizard:$current_id step
+ upvar #$level wizard:$current_id step
upvar #$level wizard:current_url current_url
# lets see if this step exists, if not we are finished with wizard and pass the steps
if {[info exists step(url)]} {
- set current_url $step(url)
+ set current_url $step(url)
} else {
- # if we have set_finish_url then we redirect to that url when we are finished
- # otherwise increment the parent wizard step
- if {[info exists wizard_finish_url]} {
- template::forward $wizard_finish_url
- } else {
+ # if we have set_finish_url then we redirect to that url when we are finished
+ # otherwise increment the parent wizard step
+ if {[info exists wizard_finish_url]} {
+ template::forward $wizard_finish_url
+ } else {
- # lets set the current wizard name to the parent wizard
- set parent_wizard [lindex $wizards 0]
- set wizard_name $parent_wizard
+ # lets set the current wizard name to the parent wizard
+ set parent_wizard [lindex $wizards 0]
+ set wizard_name $parent_wizard
- # lets now increment step of the parent wizard
- set parent_step [expr {[ns_queryget wizard_step${parent_wizard}] + 1}]
- template::forward [get_forward_url $parent_step]
- }
-
+ # lets now increment step of the parent wizard
+ set parent_step [expr {[ns_queryget wizard_step${parent_wizard}] + 1}]
+ template::forward [get_forward_url $parent_step]
+ }
+
}
# check for a "back" submission and forward immediately if so
# also check if we are backing up the current wizard or another wizard
-
+
if { [ns_queryexists wizard_submit_back] && $wizard_name eq [ns_queryget wizard_name]} {
- set last_index [expr {[lsearch -exact $steps $current_id] - 1}]
- set last_id [lindex $steps $last_index]
+ set last_index [expr {[lsearch -exact $steps $current_id] - 1}]
+ set last_id [lindex $steps $last_index]
# LARS: I removed this, because it causes forms to not save their changes when you hit the back button
- # If you construct your form, so it calls 'wizard forward' in the -after_submit block, things will
+ # If you construct your form, so it calls 'wizard forward' in the -after_submit block, things will
# work the way you expect them to
- #template::forward [get_forward_url $last_id]
+ #template::forward [get_forward_url $last_id]
}
}
@@ -324,15 +324,14 @@
} else {
return $last_visitedstep
}
-
}
-ad_proc -public template::wizard::set_visited_step {step_id} {
+ad_proc -public template::wizard::set_visited_step {step_id} {
set the last visited step
@see template::wizard
} {
-
+
get_reference
set_param wizard_visitedstep${wizard_name} $step_id
}
@@ -422,22 +421,22 @@
upvar #$param_level wizard:params params
template::util::get_opts $args
-
+
# Handle the -buttons parameter
if { ![info exists opts(buttons)] } {
- # jkyamog - is this really correct? when no buttons is present we put all of the buttons?
- upvar 0 default_button_labels button_labels
+ # jkyamog - is this really correct? when no buttons is present we put all of the buttons?
+ upvar 0 default_button_labels button_labels
} else {
- foreach pair $opts(buttons) {
- # If provided with just a name, use default label
- if { [llength $pair] == 1 } {
- set button_labels($pair) $default_button_labels($pair)
- } else {
- set button_labels([lindex $pair 0]) [lindex $pair 1]
- }
- }
+ foreach pair $opts(buttons) {
+ # If provided with just a name, use default label
+ if { [llength $pair] == 1 } {
+ set button_labels($pair) $default_button_labels($pair)
+ } else {
+ set button_labels([lindex $pair 0]) [lindex $pair 1]
+ }
+ }
}
-
+
# Add a hidden element for the current wizard name
template::element create $form_id wizard_name -widget hidden -value $wizard_name -datatype keyword
@@ -451,32 +450,32 @@
# If not the first one and it is allowed than add a "Back" button
if { $step_index > 1 && [info exists button_labels(back)] } {
- template::element create $form_id wizard_submit_back -widget submit \
- -label $button_labels(back) -optional -datatype text
+ template::element create $form_id wizard_submit_back -widget submit \
+ -label $button_labels(back) -optional -datatype text
- lappend buttons wizard_submit_back
+ lappend buttons wizard_submit_back
}
# If iteration is allowed than add a "Repeat" button
upvar #$level wizard:$current_id step
if { [info exists step(repeat)] && [info exists button_labels(repeat)]} {
- template::element create $form_id wizard_submit_repeat -widget submit \
- -label $button_labels(repeat) -optional -datatype text
- lappend buttons wizard_submit_repeat
- }
+ template::element create $form_id wizard_submit_repeat -widget submit \
+ -label $button_labels(repeat) -optional -datatype text
+ lappend buttons wizard_submit_repeat
+ }
# If not the last one than add a "Next" button
if { $step_index < [llength $steps] && [info exists button_labels(next)] } {
- template::element create $form_id wizard_submit_next -widget submit \
- -label $button_labels(next) -optional -datatype text
- lappend buttons wizard_submit_next
- }
+ template::element create $form_id wizard_submit_next -widget submit \
+ -label $button_labels(next) -optional -datatype text
+ lappend buttons wizard_submit_next
+ }
# Always finish
if { [info exists button_labels(finish) ] } {
- template::element create $form_id wizard_submit_finish -widget submit \
- -label $button_labels(finish) -optional -datatype text
- lappend buttons wizard_submit_finish
+ template::element create $form_id wizard_submit_finish -widget submit \
+ -label $button_labels(finish) -optional -datatype text
+ lappend buttons wizard_submit_finish
}
@@ -485,31 +484,30 @@
lappend levels $level
foreach onelevel $levels {
- upvar #$onelevel wizard:properties properties
- foreach param $properties(params) {
- if { ![template::element::exists $form_id $param] } {
- if { [info exists params($param)] } {
- template::element create $form_id $param -widget hidden -datatype text -optional -param -value $params($param)
- } else {
- template::element create $form_id $param -widget hidden -datatype text -optional -param
- }
- }
- }
+ upvar #$onelevel wizard:properties properties
+ foreach param $properties(params) {
+ if { ![template::element::exists $form_id $param] } {
+ if { [info exists params($param)] } {
+ template::element create $form_id $param -widget hidden -datatype text -optional -param -value $params($param)
+ } else {
+ template::element create $form_id $param -widget hidden -datatype text -optional -param
+ }
+ }
+ }
}
# Create hidden variables for the other wizard steps and visited steps
foreach one_wizard $wizards {
- if { ![template::element::exists $form_id wizard_step${one_wizard}] } {
- template::element create $form_id wizard_step${one_wizard} -widget hidden \
- -datatype keyword -value [ns_queryget wizard_step${one_wizard}]
- }
- if { ![template::element::exists $form_id wizard_visitedstep${one_wizard}] } {
- template::element create $form_id wizard_visitedstep${one_wizard} -widget hidden \
- -datatype keyword -value [ns_queryget wizard_visitedstep${one_wizard}]
- }
+ if { ![template::element::exists $form_id wizard_step${one_wizard}] } {
+ template::element create $form_id wizard_step${one_wizard} -widget hidden \
+ -datatype keyword -value [ns_queryget wizard_step${one_wizard}]
+ }
+ if { ![template::element::exists $form_id wizard_visitedstep${one_wizard}] } {
+ template::element create $form_id wizard_visitedstep${one_wizard} -widget hidden \
+ -datatype keyword -value [ns_queryget wizard_visitedstep${one_wizard}]
+ }
}
-
}
@@ -518,16 +516,16 @@
@see template::wizard
} {
-
+
uplevel {
- variable parse_level
- set level $parse_level
+ variable parse_level
+ set level $parse_level
- upvar #$level wizard:steps steps wizard:properties properties wizard:name wizard_name wizard:wizards wizards wizard:finish_url wizard_finish_url
- if { ! [info exists steps] } {
- error "Wizard does not exist"
- }
+ upvar #$level wizard:steps steps wizard:properties properties wizard:name wizard_name wizard:wizards wizards wizard:finish_url wizard_finish_url
+ if { ! [info exists steps] } {
+ error "Wizard does not exist"
+ }
}
}
@@ -537,13 +535,13 @@
@see template::wizard
} {
- variable parse_level
+ variable parse_level
if { ![info exists parse_level] } {
- return 0
+ return 0
}
- upvar #$parse_level wizard:steps steps
+ upvar #$parse_level wizard:steps steps
return [info exists steps]
}
@@ -566,27 +564,27 @@
if { [ns_queryexists wizard_submit_next] } {
- # figure out the next step and go there
+ # figure out the next step and go there
- set next_id [lindex $steps $current_index]
- template::forward [get_forward_url $next_id] $cache_p $persistent_p $excluded_vars
+ set next_id [lindex $steps $current_index]
+ template::forward [get_forward_url $next_id] $cache_p $persistent_p $excluded_vars
} elseif { [ns_queryexists wizard_submit_back] } {
- set last_id [lindex $steps $current_index-2]
- template::forward [get_forward_url $last_id] $cache_p $persistent_p $excluded_vars
+ set last_id [lindex $steps $current_index-2]
+ template::forward [get_forward_url $last_id] $cache_p $persistent_p $excluded_vars
} elseif { [ns_queryexists wizard_submit_repeat] } {
-
- template::forward "[get_forward_url $current_id]&wizard_submit_repeat=t" $cache_p $persistent_p $excluded_vars
+ template::forward "[get_forward_url $current_id]&wizard_submit_repeat=t" $cache_p $persistent_p $excluded_vars
+
} elseif { [ns_queryexists wizard_submit_finish] } {
- # template::forward $properties(action)
- # NOTE : we are changing the behaviour of wizard, when its finish it will not reset and go back
- # to step 1, it will blindly go forward and we will catch this on get_current_step
- set next_id [expr {$current_index + 1}]
- template::forward [get_forward_url $next_id] $cache_p $persistent_p $excluded_vars
+ # template::forward $properties(action)
+ # NOTE : we are changing the behaviour of wizard, when its finish it will not reset and go back
+ # to step 1, it will blindly go forward and we will catch this on get_current_step
+ set next_id [expr {$current_index + 1}]
+ template::forward [get_forward_url $next_id] $cache_p $persistent_p $excluded_vars
}
}
@@ -604,7 +602,7 @@
upvar #$level wizard:params params
set url [ns_conn url]?wizard_step${wizard_name}=$step_id&wizard_name=$wizard_name
-
+
# create the wizards and keep track of their steps too
foreach one_wizard $wizards {
append url "&wizard_step${one_wizard}=[ns_queryget wizard_step${one_wizard}]"
@@ -616,44 +614,44 @@
# check for passthrough parameters
if { [info exists properties(params)] } {
- foreach param $properties(params) {
- upvar #$level $param value
- set flags [split [lindex [split $param ":"] 1] ","]
- if { [lsearch -exact [split [lindex [split $param ":"] 1] ","] "array"] != -1 || [array exists value] } {
- # Array
- foreach {index array_value} [array get value] {
- if { [info exists array_value] && $array_value ne "" } {
- append url "&$param.$index=[ns_urlencode $array_value]"
- } else {
- append url "&$param.$index="
- }
- }
- } else {
- # Normal Variable
- if { [lsearch -exact [split [lindex [split $param ":"] 1] ","] "multiple"] != -1 } {
- # Multiple
- set param [lindex [split $param ":"] 0]
- if {$param ni $multiple_listed} {
- foreach check_param $properties(params) {
- if { [lindex [split $check_param ":"] 0] eq $param } {
- set value_list [ns_querygetall $param]
- for { set i 0 } { $i < [llength $value_list] } { incr i } {
- append url "&$param=[ns_urlencode [lindex $value_list $i]]"
- }
- }
- }
- lappend multiple_listed $param
- }
- } else {
- # Normal Var
- if { [info exists params($param)] } {
- append url "&$param=[ns_urlencode $params($param)]"
- } else {
- append url "&$param=[ns_urlencode [ns_queryget $param]]"
- }
- }
- }
- }
+ foreach param $properties(params) {
+ upvar #$level $param value
+ set flags [split [lindex [split $param ":"] 1] ","]
+ if { [lsearch -exact [split [lindex [split $param ":"] 1] ","] "array"] != -1 || [array exists value] } {
+ # Array
+ foreach {index array_value} [array get value] {
+ if { [info exists array_value] && $array_value ne "" } {
+ append url "&$param.$index=[ns_urlencode $array_value]"
+ } else {
+ append url "&$param.$index="
+ }
+ }
+ } else {
+ # Normal Variable
+ if { [lsearch -exact [split [lindex [split $param ":"] 1] ","] "multiple"] != -1 } {
+ # Multiple
+ set param [lindex [split $param ":"] 0]
+ if {$param ni $multiple_listed} {
+ foreach check_param $properties(params) {
+ if { [lindex [split $check_param ":"] 0] eq $param } {
+ set value_list [ns_querygetall $param]
+ for { set i 0 } { $i < [llength $value_list] } { incr i } {
+ append url "&$param=[ns_urlencode [lindex $value_list $i]]"
+ }
+ }
+ }
+ lappend multiple_listed $param
+ }
+ } else {
+ # Normal Var
+ if { [info exists params($param)] } {
+ append url "&$param=[ns_urlencode $params($param)]"
+ } else {
+ append url "&$param=[ns_urlencode [ns_queryget $param]]"
+ }
+ }
+ }
+ }
}
return $url
@@ -688,13 +686,12 @@
} {
get_reference
-
+
# check the old visited step on the state manager
set visited_step [ad_get_client_property -default "" $key ${wizard_name}visited]
if {$visited_step ne "" } {
template::wizard::set_visited_step $visited_step
}
-
}
@@ -720,7 +717,6 @@
if { $key ne "" } {
ad_set_client_property $key ${wizard_name}visited [template::wizard::get_visited_step]
}
-
}
Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/assessment/lib/assessment.tcl 17 Jul 2018 11:42:26 -0000 1.32
+++ openacs-4/packages/assessment/lib/assessment.tcl 17 Jul 2018 13:32:18 -0000 1.33
@@ -32,9 +32,9 @@
set url ""
if { [info exists return_url] } {
-
+
set url $return_url
-}
+}
set return_url "$url"
@@ -71,181 +71,180 @@
db_transaction {
if {$session_id eq ""} {
- # Check if there is an unfinished session lying around
- set session_id [db_string unfinished_session_id {}]
+ # Check if there is an unfinished session lying around
+ set session_id [db_string unfinished_session_id {}]
}
- if {$session_id eq ""} {
- # start new session
- set session_id [as::session::new -assessment_id $assessment_rev_id -subject_id $user_id -package_id $assessment_package_id]
- if {$assessment_data(consent_page) eq ""} {
- # 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 single_section_id}]
- }
- } else {
- # pick up old session
- if {$section_order eq ""} {
- db_1row unfinished_section_order {}
- if {$section_order eq ""} {
- # set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm single_section_id}]
- } else {
- db_1row unfinished_section_id {}
- db_1row unfinished_item_order {}
- if {$item_order ne ""} {
- incr section_order -1
- if {$item_order eq ""} {
- set item_order 0
- } else {
- incr item_order -1
- }
- }
- }
+ if {$session_id eq ""} {
+ # start new session
+ set session_id [as::session::new -assessment_id $assessment_rev_id -subject_id $user_id -package_id $assessment_package_id]
+ if {$assessment_data(consent_page) eq ""} {
+ # 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 single_section_id}]
+ }
+ } else {
+ # pick up old session
+ if {$section_order eq ""} {
+ db_1row unfinished_section_order {}
+ if {$section_order eq ""} {
+ # set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm single_section_id}]
+ } else {
+ db_1row unfinished_section_id {}
+ db_1row unfinished_item_order {}
+ if {$item_order ne ""} {
+ incr section_order -1
+ if {$item_order eq ""} {
+ set item_order 0
+ } else {
+ incr item_order -1
+ }
+ }
+ }
+ }
+ }
- }
- }
-
if {![info exists consent_url]} {
- db_1row session_time {}
- set assessment_data(elapsed_time) $elapsed_time
- if {$assessment_data(time_for_response) ne ""} {
- set assessment_data(time_for_response) [expr {60 * $assessment_data(time_for_response)}]
- set assessment_data(pretty_remaining_time) [as::assessment::pretty_time -seconds [expr {$assessment_data(time_for_response) - $assessment_data(elapsed_time)}]]
- }
+ db_1row session_time {}
+ set assessment_data(elapsed_time) $elapsed_time
+ if {$assessment_data(time_for_response) ne ""} {
+ set assessment_data(time_for_response) [expr {60 * $assessment_data(time_for_response)}]
+ set assessment_data(pretty_remaining_time) [as::assessment::pretty_time -seconds [expr {$assessment_data(time_for_response) - $assessment_data(elapsed_time)}]]
+ }
- # get all sections of assessment in correct order
- set section_list [as::assessment::sections -assessment_id $assessment_rev_id -session_id $session_id -sort_order_type $assessment_data(section_navigation) -random_p $assessment_data(random_p)]
- if {$single_section_id eq ""} {
- if {$section_order eq ""} {
- # start at the first section
- set section_order 0
- set section_id [lindex $section_list 0]
- } else {
- # continue with given section
- set section_id [lindex $section_list $section_order]
- # hang onto the section_id since we only want to do this one
- # otherwise it'll go back to the first section.
- }
+ # get all sections of assessment in correct order
+ set section_list [as::assessment::sections -assessment_id $assessment_rev_id -session_id $session_id -sort_order_type $assessment_data(section_navigation) -random_p $assessment_data(random_p)]
+ if {$single_section_id eq ""} {
+ if {$section_order eq ""} {
+ # start at the first section
+ set section_order 0
+ set section_id [lindex $section_list 0]
+ } else {
+ # continue with given section
+ set section_id [lindex $section_list $section_order]
+ # hang onto the section_id since we only want to do this one
+ # otherwise it'll go back to the first section.
+ }
- } else {
- set section_id $single_section_id
- # we check if the section order is greater than the current section, just in case we are presenting sections out of order
- if {$section_order ne "" && $section_order > [lsearch $section_list $section_id]} {
- # we had more than one section in the whole assessment
- # but we are only doing one right now, so go to the next_url
- # we need to funnel through feedback page, in case there is per page feedback.
- ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url next_url {return_p 1} item_id_list:multiple }]
- ad_script_abort
- }
- set section_list $single_section_id
- set section_order 0
- }
+ } else {
+ set section_id $single_section_id
+ # we check if the section order is greater than the current section, just in case we are presenting sections out of order
+ if {$section_order ne "" && $section_order > [lsearch $section_list $section_id]} {
+ # we had more than one section in the whole assessment
+ # but we are only doing one right now, so go to the next_url
+ # we need to funnel through feedback page, in case there is per page feedback.
+ ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url next_url {return_p 1} item_id_list:multiple }]
+ ad_script_abort
+ }
+ set section_list $single_section_id
+ set section_order 0
+ }
- # check if we just wanted to do one section, if so go to the
- # next_url
- if {$section_id eq ""} {
- # we had more than one section in the whole assessment
- # but we are only doing one right now, so go to the next_url
- ad_returnredirect $next_url
- ad_script_abort
- }
+ # check if we just wanted to do one section, if so go to the
+ # next_url
+ if {$section_id eq ""} {
+ # we had more than one section in the whole assessment
+ # but we are only doing one right now, so go to the next_url
+ ad_returnredirect $next_url
+ ad_script_abort
+ }
- as::section_data::new -section_id $section_id -session_id $session_id -subject_id $user_id -package_id $assessment_package_id
- db_1row section_data {} -column_array section
- set display_type_id $section(display_type_id)
- if {$display_type_id ne ""} {
- db_1row display_data {} -column_array display
- } else {
- array set display [list num_items "" adp_chunk "" branched_p f back_button_p t submit_answer_p f sort_order_type order_of_entry]
- }
+ as::section_data::new -section_id $section_id -session_id $session_id -subject_id $user_id -package_id $assessment_package_id
+ db_1row section_data {} -column_array section
+ set display_type_id $section(display_type_id)
+ if {$display_type_id ne ""} {
+ db_1row display_data {} -column_array display
+ } else {
+ array set display [list num_items "" adp_chunk "" branched_p f back_button_p t submit_answer_p f sort_order_type order_of_entry]
+ }
- # get all items of section in correct order
- set item_list [as::section::items -section_id $section_id -session_id $session_id -sort_order_type $display(sort_order_type) -num_items $section(num_items) -random_p $assessment_data(random_p)]
- set item_id_list [list]
+ # get all items of section in correct order
+ set item_list [as::section::items -section_id $section_id -session_id $session_id -sort_order_type $display(sort_order_type) -num_items $section(num_items) -random_p $assessment_data(random_p)]
+ set item_id_list [list]
- # get total number of items
- set page_total_items [llength $item_list]
- # get preference for number of display items per page
- # since we are dividing here, we need to set per_page to the
- # total number of questions if its an empty string or 0
- set page_display_per_page [expr {[string equal "" $display(num_items)] ? $page_total_items : $display(num_items)}]
- # determine the total number of pages
- set page_total [expr {$page_total_items == 0 ? 0 : $page_total_items / $page_display_per_page}]
+ # get total number of items
+ set page_total_items [llength $item_list]
+ # get preference for number of display items per page
+ # since we are dividing here, we need to set per_page to the
+ # total number of questions if its an empty string or 0
+ set page_display_per_page [expr {[string equal "" $display(num_items)] ? $page_total_items : $display(num_items)}]
+ # determine the total number of pages
+ set page_total [expr {$page_total_items == 0 ? 0 : $page_total_items / $page_display_per_page}]
- set section(num_sections) [llength $section_list]
- set section(num_items) [llength $item_list]
- if {$section(max_time_to_complete) ne ""} {
- set section(pretty_remaining_time) [as::assessment::pretty_time -seconds [expr {$section(max_time_to_complete) - $section(elapsed_time)}]]
- }
+ set section(num_sections) [llength $section_list]
+ set section(num_items) [llength $item_list]
+ if {$section(max_time_to_complete) ne ""} {
+ set section(pretty_remaining_time) [as::assessment::pretty_time -seconds [expr {$section(max_time_to_complete) - $section(elapsed_time)}]]
+ }
- if {$item_order ne ""} {
- # show next items on section page
- if {$display(num_items) ne ""} {
- # make sure to display correct section page
- set item_order [expr {$item_order - ($item_order % $display(num_items))}]
- } elseif {$display(submit_answer_p) == "t"} {
- # show whole section when picking up a separate submit section
- set item_order 0
- }
- }
+ if {$item_order ne ""} {
+ # show next items on section page
+ if {$display(num_items) ne ""} {
+ # make sure to display correct section page
+ set item_order [expr {$item_order - ($item_order % $display(num_items))}]
+ } elseif {$display(submit_answer_p) == "t"} {
+ # show whole section when picking up a separate submit section
+ set item_order 0
+ }
+ }
- # determine on which page we are right now based on item_order
- if { ![info exists item_order] || $item_order eq "" } { set item_order 0 }
- # add 1 because we want to compare the 1 indexed display number
- # to the current page
- set current_page [expr {$item_order == 0 ? 0 : $item_order / $page_display_per_page + 1}]
+ # determine on which page we are right now based on item_order
+ if { ![info exists item_order] || $item_order eq "" } { set item_order 0 }
+ # add 1 because we want to compare the 1 indexed display number
+ # to the current page
+ set current_page [expr {$item_order == 0 ? 0 : $item_order / $page_display_per_page + 1}]
- # strip away items on previous section pages
- set item_list [lreplace $item_list 0 [expr {$item_order-1}]]
+ # strip away items on previous section pages
+ set item_list [lreplace $item_list 0 [expr {$item_order-1}]]
- if {$display(num_items) ne ""} {
- if {[llength $item_list] > $display(num_items)} {
- # show only a few items per page
- set item_list [lreplace $item_list $display(num_items) end]
- # next page: more items of this section
- set new_item_order $item_order
- set new_section_order $section_order
- if {$item_order eq ""} {
- set new_item_order 0
- }
- set new_item_order [expr {$new_item_order + $display(num_items)}]
- } else {
- # next page: next section
- set new_item_order ""
- set new_section_order [expr {$section_order + 1}]
- }
- } else {
- # next page: next section
- set new_section_order [expr {$section_order + 1}]
- set new_item_order ""
- }
+ if {$display(num_items) ne ""} {
+ if {[llength $item_list] > $display(num_items)} {
+ # show only a few items per page
+ set item_list [lreplace $item_list $display(num_items) end]
+ # next page: more items of this section
+ set new_item_order $item_order
+ set new_section_order $section_order
+ if {$item_order eq ""} {
+ set new_item_order 0
+ }
+ set new_item_order [expr {$new_item_order + $display(num_items)}]
+ } else {
+ # next page: next section
+ set new_item_order ""
+ set new_section_order [expr {$section_order + 1}]
+ }
+ } else {
+ # next page: next section
+ set new_section_order [expr {$section_order + 1}]
+ set new_item_order ""
+ }
- if {$new_section_order == [llength $section_list]} {
- # last section
- set new_section_order ""
- }
+ if {$new_section_order == [llength $section_list]} {
+ # last section
+ set new_section_order ""
+ }
- foreach one_item $item_list {
- lappend item_id_list [lindex $one_item 0]
- }
+ foreach one_item $item_list {
+ lappend item_id_list [lindex $one_item 0]
+ }
- # let's generate the list of page numbers
- # for sections with a limited number of items per page
- if {$display(num_items) ne "" && $page_total > 1} {
- set progress_bar_list [template::util::number_list $page_total 1]
- set total_pages [llength $progress_bar_list]
- }
- if {![info exists show_progress]} {
- set show_progress 0
- }
- # if we have multiple sections
- if {![info exists progress_bar_list] && [llength $section_list] > 1} {
- set progress_bar_list [template::util::number_list [llength $section_list] 1]
- set current_page [expr {[lsearch $section_list $section_id] +1 }]
- set total_pages [llength $progress_bar_list]
- }
+ # let's generate the list of page numbers
+ # for sections with a limited number of items per page
+ if {$display(num_items) ne "" && $page_total > 1} {
+ set progress_bar_list [template::util::number_list $page_total 1]
+ set total_pages [llength $progress_bar_list]
+ }
+ if {![info exists show_progress]} {
+ set show_progress 0
+ }
+ # if we have multiple sections
+ if {![info exists progress_bar_list] && [llength $section_list] > 1} {
+ set progress_bar_list [template::util::number_list [llength $section_list] 1]
+ set current_page [expr {[lsearch $section_list $section_id] +1 }]
+ set total_pages [llength $progress_bar_list]
+ }
}
}
@@ -261,71 +260,69 @@
# check if section or session time ran out
if {($assessment_data(time_for_response) ne "" && $assessment_data(time_for_response) < $assessment_data(elapsed_time)) || ($section(max_time_to_complete) ne "" && $section(max_time_to_complete) < $section(elapsed_time))} {
if {$assessment_data(time_for_response) eq "" || $assessment_data(time_for_response) >= $assessment_data(elapsed_time)} {
- # skip to next section
- set new_section_order [expr {$section_order + 1}]
- set new_item_order ""
- if {$new_section_order == [llength $section_list]} {
- # last section
- set new_section_order ""
- }
- # answer all remaining section items with empty string
- db_transaction {
- as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_id
- #immediate checks execution
- as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
- set section_to_tmp [as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id -section_id $section_id]
- if { $section_to_tmp != "f" && $section_to_tmp != "f"} {
- set section_to $section_to_tmp
- }
- }
-
-
+ # skip to next section
+ set new_section_order [expr {$section_order + 1}]
+ set new_item_order ""
+ if {$new_section_order == [llength $section_list]} {
+ # last section
+ set new_section_order ""
+ }
+ # answer all remaining section items with empty string
+ db_transaction {
+ as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_id
+ #immediate checks execution
+ as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
+ set section_to_tmp [as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id -section_id $section_id]
+ if { $section_to_tmp != "f" && $section_to_tmp != "f"} {
+ set section_to $section_to_tmp
+ }
+ }
} else {
- # skip entire session
- set new_section_order ""
- set new_item_order ""
-
- db_transaction {
- # answer all remaining section items with empty string
- as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_id
- # immediate checks execution
- as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
- set section_to_tmp [as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id -section_id $section_id]
- if { $section_to_tmp != "f" && $section_to_tmp != "f"} {
- set section_to $section_to_tmp
- }
+ # skip entire session
+ set new_section_order ""
+ set new_item_order ""
+ db_transaction {
+ # answer all remaining section items with empty string
+ as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_id
+ # immediate checks execution
+ as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
+ set section_to_tmp [as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id -section_id $section_id]
+ if { $section_to_tmp != "f" && $section_to_tmp != "f"} {
+ set section_to $section_to_tmp
+ }
- set section_list [lreplace $section_list 0 [expr {$section_order}]]
- foreach section_id $section_list {
- # skip remaining sections
- as::section::skip -section_id $section_id -session_id $session_id -subject_id $user_id
- }
- }
+
+ set section_list [lreplace $section_list 0 [expr {$section_order}]]
+ foreach section_id $section_list {
+ # skip remaining sections
+ as::section::skip -section_id $section_id -session_id $session_id -subject_id $user_id
+ }
+ }
}
if {$new_section_order ne ""} {
- # 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 section_id item_id_list:multiple single_section_id}]
- ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple total_pages current_page}]
- ad_script_abort
+ # 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 section_id item_id_list:multiple single_section_id}]
+ ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple total_pages current_page}]
+ ad_script_abort
} else {
- # calculate session points at end of session
- as::assessment::calculate -session_id $session_id -assessment_id $assessment_rev_id
- db_dml session_finished {}
- as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
- # section based aa checks
- as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
+ # calculate session points at end of session
+ as::assessment::calculate -session_id $session_id -assessment_id $assessment_rev_id
+ db_dml session_finished {}
+ as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
+ # section based aa checks
+ as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
- if {$assessment_data(return_url) eq ""} {
- set return_url [export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}]
- } else {
- set return_url $assessment_data(return_url)
- }
- ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}]
- ad_script_abort
+ if {$assessment_data(return_url) eq ""} {
+ set return_url [export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}]
+ } else {
+ set return_url $assessment_data(return_url)
+ }
+ ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}]
+ ad_script_abort
}
}
@@ -345,120 +342,119 @@
lassign $one_item as_item_id name title description subtext required_p max_time_to_complete content_rev_id content_filename content_type as_item_type_id validate_block question_text
foreach {check_expr check_message} [split $validate_block \n] {
- regsub -all {%answer%} $check_expr \$response_to_item($as_item_id) check_expr
- regsub -all {%answer%} [lang::util::localize $check_message] \$response_to_item($as_item_id) check_message
- lappend validate_list "response_to_item.$as_item_id { $check_expr } { $check_message }"
+ regsub -all {%answer%} $check_expr \$response_to_item($as_item_id) check_expr
+ regsub -all {%answer%} [lang::util::localize $check_message] \$response_to_item($as_item_id) check_message
+ lappend validate_list "response_to_item.$as_item_id { $check_expr } { $check_message }"
}
set default_value ""
set submitted_p f
if {$display(submit_answer_p) != "t"} {
- # no separate submit of each item
- if {$assessment_data(reuse_responses_p) == "t"} {
- set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -section_id $section_id]
- }
- set presentation_type [as::item_form::add_item_to_form -name show_item_form -session_id $session_id -section_id $section_id -item_id $as_item_id -default_value $default_value -required_p $required_p -random_p $assessment_data(random_p)]
+ # no separate submit of each item
+ if {$assessment_data(reuse_responses_p) == "t"} {
+ set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -section_id $section_id]
+ }
+ set presentation_type [as::item_form::add_item_to_form -name show_item_form -session_id $session_id -section_id $section_id -item_id $as_item_id -default_value $default_value -required_p $required_p -random_p $assessment_data(random_p)]
if {$required_p == "t"} {
# make sure that mandatory items are answered
if {$presentation_type in {rbo sbo cbo}} {
- lappend validate_list "response_to_item.$as_item_id {\$\{response_to_item.$as_item_id\} ne \"\" || \[ns_queryget response_to_item.${as_item_id}\.text\] ne \"\"} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\$\{response_to_item.$as_item_id\} ne \"\" || \[ns_queryget response_to_item.${as_item_id}\.text\] ne \"\"} \"\[_ assessment.form_element_required\]\""
} else {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
}
incr required_count
}
-
} else {
- # submit each item separately
- set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -session_id $session_id -section_id $section_id]
- if {$default_value ne ""} {
- # value already submitted
- set submitted_p t
- set mode display
- if {$required_p == "t"} {
- # correct count of mandatory items not yet answered (to display next-button)
- incr required_count -1
- }
- } else {
- # value not submitted yet. get older submitted value if necessary
- set mode edit
- if {$assessment_data(reuse_responses_p) == "t"} {
- set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -section_id $section_id]
- }
- lappend unsubmitted_list $as_item_id
- }
-
- # create separate 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 {
- {session_id:text(hidden) {value $session_id}}
- {item_id:text(hidden) {value $as_item_id}}
- }
- set presentation_type [as::item_form::add_item_to_form -name show_item_form_$as_item_id -session_id $session_id -section_id $section_id -item_id $as_item_id -default_value $default_value -required_p $required_p]
+ # submit each item separately
+ set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -session_id $session_id -section_id $section_id]
+ if {$default_value ne ""} {
+ # value already submitted
+ set submitted_p t
+ set mode display
+ if {$required_p == "t"} {
+ # correct count of mandatory items not yet answered (to display next-button)
+ incr required_count -1
+ }
+ } else {
+ # value not submitted yet. get older submitted value if necessary
+ set mode edit
+ if {$assessment_data(reuse_responses_p) == "t"} {
+ set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -section_id $section_id]
+ }
+ lappend unsubmitted_list $as_item_id
+ }
+
+ # create separate 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 {
+ {session_id:text(hidden) {value $session_id}}
+ {item_id:text(hidden) {value $as_item_id}}
+ }
+ set presentation_type [as::item_form::add_item_to_form -name show_item_form_$as_item_id -session_id $session_id -section_id $section_id -item_id $as_item_id -default_value $default_value -required_p $required_p]
if {$required_p == "t"} {
# make sure that mandatory items are answered
if {$presentation_type in {rbo sbo cbo}} {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\] || \[exists_and_not_null response_to_item($as_item_id)\.text\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\] || \[exists_and_not_null response_to_item($as_item_id)\.text\]} \"\[_ assessment.form_element_required\]\""
} else {
- lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
+ lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
}
incr required_count
}
-
- # process single submit
- set on_submit "{
- db_transaction {
- db_dml session_updated {}
- # save answer
- set response_item_id \$item_id
-
- db_1row process_item_type {}
- set item_type \[string range \$item_type end-1 end\]
- if {!\[info exists response_to_item(\$response_item_id)\]} {
- set response_to_item(\$response_item_id) \"\"
- } else {
- set section_to_tmp \[as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id\ -section_id $section_id]
- if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
- set section_to \$section_to_tmp
+ # process single submit
+ set on_submit "{
+ db_transaction {
+ db_dml session_updated {}
+ # save answer
+ set response_item_id \$item_id
+
+ db_1row process_item_type {}
+ set item_type \[string range \$item_type end-1 end\]
+ if {!\[info exists response_to_item(\$response_item_id)\]} {
+ set response_to_item(\$response_item_id) \"\"
+ } else {
+
+ set section_to_tmp \[as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id\ -section_id $section_id]
+ if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
+ set section_to \$section_to_tmp
}
}
-
- set points \[ad_decode \$points \"\" 0 \$points\]
+ set points \[ad_decode \$points \"\" 0 \$points\]
+
set response \$response_to_item(\$response_item_id)
if { \$item_type == \"fu\" } {
set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\]
}
- as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
- }
- }"
- set after_submit "{
-
-\# ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
- ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id total_pages current_page}\]
- ad_script_abort
- }"
-
- eval ad_form -extend -name show_item_form_$as_item_id -validate "{$validate_list}" -on_submit $on_submit -after_submit $after_submit
- set validate_list [list]
+ as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
+ }
+ }"
+ set after_submit "{
+
+ \# ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
+ ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id total_pages current_page}\]
+ ad_script_abort
+ }"
+
+ eval ad_form -extend -name show_item_form_$as_item_id -validate "{$validate_list}" -on_submit $on_submit -after_submit $after_submit
+ set validate_list [list]
}
-
+
# Fill in the blank item. Replace all <textbox> that appear in the title by an <input> of type="text"
if {$presentation_type == {tb}} {
- regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
+ regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
}
set max_time_to_complete [as::assessment::pretty_time -seconds $max_time_to_complete]
if {$presentation_type eq "rb" || $presentation_type eq "cb"} {
- array set item [as::item::item_data -as_item_id $as_item_id]
- array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
- set choice_orientation $type(choice_orientation)
- array unset item
- array unset type
+ array set item [as::item::item_data -as_item_id $as_item_id]
+ array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
+ set choice_orientation $type(choice_orientation)
+ array unset item
+ array unset type
} else {
- set choice_orientation ""
+ set choice_orientation ""
}
multirow append items $as_item_id $name $title $description $subtext $required_p $max_time_to_complete $presentation_type "" $submitted_p [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type] $as_item_type_id $choice_orientation "" "" "" $question_text
@@ -468,105 +464,105 @@
for {set i 1; set j 2} {$i <= ${items:rowcount}} {incr i; incr j} {
upvar 0 items:$i this
if {$i < ${items:rowcount}} {
- upvar 0 items:$j next
- set this(next_as_item_id) $next(as_item_id)
- set this(next_pr_type) $next(presentation_type)
+ upvar 0 items:$j next
+ set this(next_as_item_id) $next(as_item_id)
+ set this(next_pr_type) $next(presentation_type)
} else {
- set this(next_as_item_id) ""
- set this(next_pr_type) ""
+ set this(next_as_item_id) ""
+ set this(next_pr_type) ""
}
}
ad_form -extend -name show_item_form -on_request {
- as::assessment::check::eval_or_checks -session_id $session_id -section_id $section_id
+ as::assessment::check::eval_or_checks -session_id $session_id -section_id $section_id
}
if {$display(submit_answer_p) != "t"} {
# process multiple submit
set template "/packages/assessment/www/assessment-section-submit"
set on_submit "{
- db_transaction {
+ db_transaction {
\# check if we already submitted this section!
if {\[db_string count_submitted_session \"select count(*) from as_section_data where session_id = :session_id and section_id = :section_id and completed_datetime is not null\" -default 0\] == 0} {
- db_dml session_updated {}
- # save answers
- foreach one_response \$item_list {
- lassign \$one_response response_item_id
- db_1row process_item_type {}
- set item_type \[string range \$item_type end-1 end\]
- if {!\[info exists response_to_item(\$response_item_id)\]} {
- set response_to_item(\$response_item_id) \"\"
- } else {
+ db_dml session_updated {}
+ # save answers
+ foreach one_response \$item_list {
+ lassign \$one_response response_item_id
+ db_1row process_item_type {}
+ set item_type \[string range \$item_type end-1 end\]
+ if {!\[info exists response_to_item(\$response_item_id)\]} {
+ set response_to_item(\$response_item_id) \"\"
+ } else {
- set item_to \$response_item_id
- set section_to_tmp \[as::assessment::check::branch_checks -session_id \$session_id -assessment_id \$assessment_id -section_id \$section_id\]
- if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
- set section_to \$section_to_tmp
+ set item_to \$response_item_id
+ set section_to_tmp \[as::assessment::check::branch_checks -session_id \$session_id -assessment_id \$assessment_id -section_id \$section_id\]
+ if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
+ set section_to \$section_to_tmp
+ }
}
- }
- set points \[ad_decode \$points \"\" 0 \$points\]
- set response \$response_to_item(\$response_item_id)
+ set points \[ad_decode \$points \"\" 0 \$points\]
+ set response \$response_to_item(\$response_item_id)
- if { \$item_type == \"fu\" } {
- set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\]
- }
+ if { \$item_type == \"fu\" } {
+ set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\]
+ }
- as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
- }
- as::session::update_elapsed_time -session_id $session_id -section_id $section_id
- set message \"\"
- } else {
- set message \"\#assessment.Section_previously_submitted\#\"
- }
- if {\$section_order != \$new_section_order} {
- # calculate section points at end of section
- as::section::calculate -section_id \$section_id -assessment_id \$assessment_rev_id -session_id \$session_id
- # immediate checks execution
- as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
+ as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
+ }
+ as::session::update_elapsed_time -session_id $session_id -section_id $section_id
+ set message \"\"
+ } else {
+ set message \"\#assessment.Section_previously_submitted\#\"
+ }
+ if {\$section_order != \$new_section_order} {
+ # calculate section points at end of section
+ as::section::calculate -section_id \$section_id -assessment_id \$assessment_rev_id -session_id \$session_id
+ # immediate checks execution
+ as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
set section_to_tmp \[as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id\ -section_id $section_id]
- if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
- set section_to \$section_to_tmp
- }
+ if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} {
+ set section_to \$section_to_tmp
+ }
- }
- }
+ }
+ }
}"
set after_submit "{
-\# NOTE the code just incrementes section order so when the section order
-\# is greate than the number of items in the list of sections
-\# we know we are done and should finish the assessment
- if { \$new_section_order ne \"\" && \$new_section_order <= \[llength \$section_list\]} {
- # go to next section
+ \# NOTE the code just incrementes section order so when the section order
+ \# is greate than the number of items in the list of sections
+ \# we know we are done and should finish the assessment
+ if { \$new_section_order ne \"\" && \$new_section_order <= \[llength \$section_list\]} {
+ # go to next section
if { \$section_to != \"\"} {
set section_order \$section_to
- } else {
- set section_order \$new_section_order
+ } else {
+ 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 section_id item_id_list:multiple single_section_id}\]
- ad_returnredirect -message \$message \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}\]
- ad_script_abort
- } else {
- # calculate session points at end of session
- as::assessment::calculate -session_id \$session_id -assessment_id \$assessment_rev_id
- db_dml session_finished {}
+ 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 section_id item_id_list:multiple single_section_id}\]
+ ad_returnredirect -message \$message \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}\]
+ ad_script_abort
+ } else {
+ # calculate session points at end of session
+ as::assessment::calculate -session_id \$session_id -assessment_id \$assessment_rev_id
+ db_dml session_finished {}
as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
# section based aa checks
- as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
+ as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
- if {\$assessment_data(return_url) eq \"\"} {
- set return_url \[export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}\]
- } else {
- set return_url \$assessment_data(return_url)
- }
- ad_returnredirect -message \$message \[export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}\]
- ad_script_abort
- }
+ if {\$assessment_data(return_url) eq \"\"} {
+ set return_url \[export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}\]
+ } else {
+ set return_url \$assessment_data(return_url)
+ }
+ ad_returnredirect -message \$message \[export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}\]
+ ad_script_abort
+ }
}"
eval ad_form -extend -name show_item_form -validate "{$validate_list}" -on_submit $on_submit -after_submit $after_submit
@@ -576,59 +572,59 @@
# process next button in separate submit mode
set template "assessment-single-submit"
ad_form -extend -name show_item_form -on_submit {
- db_transaction {
- # save empty answer for unanswered optional items
- foreach response_item_id $unsubmitted_list {
- db_1row process_item_type {}
- set item_type [string range $item_type end-1 end]
+ db_transaction {
+ # save empty answer for unanswered optional items
+ foreach response_item_id $unsubmitted_list {
+ db_1row process_item_type {}
+ set item_type [string range $item_type end-1 end]
- set points [ad_decode $points "" 0 $points]
- set response \$response_to_item(\$response_item_id)\
-
- if { \$item_type == \"fu\" } {
- set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\]
- }
+ set points [ad_decode $points "" 0 $points]
+ set response \$response_to_item(\$response_item_id)\
- as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
+ if { \$item_type == \"fu\" } {
+ set response \[list \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile) \$response_to_item(\${response_item_id}.content-type)\]
+ }
- }
+ as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id
- if {$section_order != $new_section_order} {
- # calculate section points at end of section
- as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id
- # immediate checks execution
- as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
- }
- }
+ }
+
+ if {$section_order != $new_section_order} {
+ # calculate section points at end of section
+ as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id
+ # immediate checks execution
+ as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id
+ }
+ }
} -after_submit {
- if {$next_url ne ""} {
- ad_returnredirect $next_url
- ad_script_abort
- }
- if {$new_section_order ne ""} {
- # 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 section_id item_id_list:multiple single_section_id}]
- ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}]
- ad_script_abort
- } else {
- # calculate session points at end of session
- as::assessment::calculate -session_id $session_id -assessment_id $assessment_rev_id
- db_dml session_finished {}
- as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
- # section based aa checks
- as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
+ if {$next_url ne ""} {
+ ad_returnredirect $next_url
+ ad_script_abort
+ }
+ if {$new_section_order ne ""} {
+ # 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 section_id item_id_list:multiple single_section_id}]
+ ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}]
+ ad_script_abort
+ } else {
+ # calculate session points at end of session
+ as::assessment::calculate -session_id $session_id -assessment_id $assessment_rev_id
+ db_dml session_finished {}
+ as::assessment::check::eval_aa_checks -session_id $session_id -assessment_id $assessment_id
+ # section based aa checks
+ as::assessment::check::eval_sa_checks -session_id $session_id -assessment_id $assessment_id
as::assessment::check::eval_m_checks -session_id $session_id -assessment_id $assessment_id
- if {$assessment_data(return_url) eq ""} {
- set return_url [export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}]
- } else {
- set return_url $assessment_data(return_url)
- }
-# ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}]
- ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple next_url total_pages current_page}]
- ad_script_abort
- }
+ if {$assessment_data(return_url) eq ""} {
+ set return_url [export_vars -base finish {session_id assessment_id return_url next_asm total_pages current_page}]
+ } else {
+ set return_url $assessment_data(return_url)
+ }
+ # ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}]
+ ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple next_url total_pages current_page}]
+ ad_script_abort
+ }
}
}
Index: openacs-4/packages/assessment/lib/progress-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/Attic/progress-bar.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/progress-bar.tcl 17 Jul 2018 11:42:26 -0000 1.4
+++ openacs-4/packages/assessment/lib/progress-bar.tcl 17 Jul 2018 13:32:18 -0000 1.5
@@ -42,13 +42,12 @@
set percentage_done 100
} elseif {[info exists finished_page] && $finished_page == $current} {
# subtract 1 from current, since we haven't completed this page yet
- set percentage_done [expr {round($current * 100.0 / $total)}]
+ set percentage_done [expr {round($current * 100.0 / $total)}]
} else {
# subtract 1 from current, since we haven't completed this page yet
set percentage_done [expr {round(($current - 1) * 100.0 / $total)}]
}
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/assessment/www/asm-admin/add-edit-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/add-edit-check.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/assessment/www/asm-admin/add-edit-check.tcl 17 Jul 2018 11:42:26 -0000 1.13
+++ openacs-4/packages/assessment/www/asm-admin/add-edit-check.tcl 17 Jul 2018 13:32:18 -0000 1.14
@@ -1,8 +1,8 @@
ad_page_contract {
-
+
@author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
@creation-date 2005-01-07
- This page allows to add branches or actions to the question and its choices.
+ This page allows to add branches or actions to the question and its choices.
} {
assessment_id:naturalnum,notnull
@@ -36,7 +36,7 @@
set context [list [list index [_ assessment.admin]] [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"]
if {![info exists as_item_id] || $as_item_id eq ""} {
- set condition_sql [db_string get_item_id {}]
+ set condition_sql [db_string get_item_id {}]
#parse condition_sql to get item_id
set cond_list [split $condition_sql "="]
set item_id [lindex [split [lindex $cond_list 2] ")"] 0]
@@ -55,67 +55,66 @@
set as_item_id $item_id
set as_item_type_id [db_string item_type_id {}]
-set choices [db_list_of_lists get_choices {} ]
+set choices [db_list_of_lists get_choices {} ]
set question_text [db_string get_question {}]
if {[info exists edit_check] && $edit_check ne ""} {
if { ![info exists type] || $type eq "" } {
set return_url "&check_id=$inter_item_check_id&edit_check=t"
}
-
+
}
if {[info exists by_item_p] && $by_item_p ne ""} {
if {$by_item_p==1} {
- append return_url "&item_id=$item_id&by_item_p=$by_item_p"
- } else {
- append return_url "&by_item_p=$by_item_p"
- }
+ append return_url "&item_id=$item_id&by_item_p=$by_item_p"
+ } else {
+ append return_url "&by_item_p=$by_item_p"
+ }
}
ad_form -name new_check -export {assessment_id return_url} -form {
-
+
inter_item_check_id:key
-
+
{as_item_id:integer(hidden)
- {value $as_item_id}
-
+ {value $as_item_id}
}
{section_id_from:integer(hidden)
- {value $section_id_from}
- }
+ {value $section_id_from}
+ }
{name:text(text)
- {label "[_ assessment.Name]"}
- {help_text "[_ assessment.name_of_trigger]"}
+ {label "[_ assessment.Name]"}
+ {help_text "[_ assessment.name_of_trigger]"}
}
{postcheck_p:boolean(radio)
- {label "[_ assessment.post_check]"}
- {options { {"[_ assessment.yes]" t} {"[_ assessment.no]" f}}}
- {help_text "[_ assessment.help_postcheck_p]"}
+ {label "[_ assessment.post_check]"}
+ {options { {"[_ assessment.yes]" t} {"[_ assessment.no]" f}}}
+ {help_text "[_ assessment.help_postcheck_p]"}
}
{description:text(textarea)
- {label "[_ assessment.action_description]"}
- {html {cols 40 rows 20}}
- {help_text "[_ assessment.description_trigger]"}
+ {label "[_ assessment.action_description]"}
+ {html {cols 40 rows 20}}
+ {help_text "[_ assessment.description_trigger]"}
}
{condition:text(radio)
- {label "[_ assessment.condition]"}
- {options $choices}
- {after_html $question_text}
- {help_text "[_ assessment.the_condition_to]"}
+ {label "[_ assessment.condition]"}
+ {options $choices}
+ {after_html $question_text}
+ {help_text "[_ assessment.the_condition_to]"}
}
}
if {![info exists inter_item_check_id] || $inter_item_check_id eq ""} {
ad_form -extend -name new_check -form {
- {action_p:boolean(radio)
- {label "[_ assessment.parameter_type]"}
- {options [as::assessment::check::get_types]}
- {help_text "[_ assessment.type_of_trigger]"}
- }
- }
+ {action_p:boolean(radio)
+ {label "[_ assessment.parameter_type]"}
+ {options [as::assessment::check::get_types]}
+ {help_text "[_ assessment.type_of_trigger]"}
+ }
+ }
} else {
ad_form -extend -name new_check -form {
- {action_p:text(hidden)}
+ {action_p:text(hidden)}
}
}
@@ -124,29 +123,28 @@
set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
# set check_sql "check_sql"
db_transaction {
- set date [db_string get_date {select sysdate from dual}]
- db_exec_plsql new_check {}
- }
-
+ set date [db_string get_date {select sysdate from dual}]
+ db_exec_plsql new_check {}
+ }
+
} -edit_request {
db_1row get_check_properties {}
set condition_sql $check_sql
#parse condition_sql to get choice_id
set cond_list [split $condition_sql "="]
set condition [lindex [split [lindex $cond_list 1] ")"] 0]
#ad_return_complaint 1 "${condition} $choices"
-
+
} -edit_data {
set check_sql [as::assessment::check::get_sql -condition $condition -item_id $item_id]
db_dml update_check {}
+
} -after_submit {
-
-
set url [as::assessment::check::add_check_return_url $action_p]
ad_returnredirect "${url}?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id§ion_id=$section_id_from$return_url"
ad_script_abort
-
}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/assessment/www/asm-admin/item-stats.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-stats.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/item-stats.tcl 17 Jul 2018 11:42:26 -0000 1.11
+++ openacs-4/packages/assessment/www/asm-admin/item-stats.tcl 17 Jul 2018 13:32:18 -0000 1.12
@@ -1,9 +1,9 @@
# packages/assessment/www/asm-admin/item-stats.tcl
ad_page_contract {
-
+
Item statistics
-
+
@author Roel Canicula (roel@solutiongrove.com)
@creation-date 2006-06-06
@arch-tag: 5b26edbe-3bed-464a-b76c-3bf4d0b6ab3c
@@ -23,21 +23,21 @@
set package_id [ad_conn package_id]
-# HAM :
+# HAM :
# if we get a dotlrn_ecommerce_section_id (catalog_section_id),
# let's create a clause to query all the rel_ids with type membership_rels
set limit_to_section_clause ""
if { [info exists catalog_section_id] && $catalog_section_id ne "" } {
- set limit_to_section_clause "(select session_id from dotlrn_ecommerce_application_assessment_map where rel_id in (select rel_id from acs_rels where rel_type='dotlrn_member_rel' and object_id_one = (select community_id from dotlrn_ecommerce_section where section_id=:catalog_section_id)))"
+ set limit_to_section_clause "(select session_id from dotlrn_ecommerce_application_assessment_map where rel_id in (select rel_id from acs_rels where rel_type='dotlrn_member_rel' and object_id_one = (select community_id from dotlrn_ecommerce_section where section_id=:catalog_section_id)))"
}
if {[info exists session_id_list]} {
set session_ids $session_id_list
set session_id_list [list]
foreach elm [split $session_id_list] {
- if {$elm ne ""} {
- lappend session_id_list $elm
- }
+ if {$elm ne ""} {
+ lappend session_id_list $elm
+ }
}
}
#if {[info exists session_id_list]} {
@@ -57,202 +57,204 @@
as::assessment::data -assessment_id $assessment_id
db_multirow sections get_sections "
- select distinct s.section_id, asm.sort_order, cr.title as section_title
+ select distinct s.section_id, asm.sort_order, cr.title as section_title
from as_sections s, cr_revisions cr, cr_items ci, as_assessment_section_map asm, cr_items ai
where ci.item_id = cr.item_id
and cr.revision_id = s.section_id
and s.section_id = asm.section_id
and asm.assessment_id = ai.latest_revision
and ai.item_id in ([template::util::tcl_to_sql_list $assessment_id_list])
order by asm.sort_order
- "
+ "
template::multirow foreach sections {
db_foreach items {
-select i.as_item_id, i.subtext, ci.item_id, cr.title, cr.revision_id, cr.content as
- question_text, cr.description, i.field_name,asr.item_id as as_item_id_i,
- ism.required_p, ism.section_id, ism.sort_order,
- ism.max_time_to_complete, ism.points, i.data_type
-from as_items i, cr_revisions cr, cr_items ci, as_item_section_map ism, cr_revisions asr
-where ci.item_id = cr.item_id
-and cr.revision_id = i.as_item_id
-and i.as_item_id = ism.as_item_id
-and ism.section_id = :section_id
-and asr.revision_id = i.as_item_id
-order by ism.sort_order
+ select i.as_item_id, i.subtext, ci.item_id, cr.title, cr.revision_id,
+ cr.content as question_text, cr.description, i.field_name,
+ asr.item_id as as_item_id_i, ism.required_p, ism.section_id,
+ ism.sort_order, ism.max_time_to_complete, ism.points, i.data_type
+ from as_items i, cr_revisions cr, cr_items ci, as_item_section_map ism,
+ cr_revisions asr
+ where ci.item_id = cr.item_id
+ and cr.revision_id = i.as_item_id
+ and i.as_item_id = ism.as_item_id
+ and ism.section_id = :section_id
+ and asr.revision_id = i.as_item_id
+ order by ism.sort_order
} {
- set display_type [string range [db_string get_display_type {
- select o.object_type
- from acs_objects o, as_item_rels r
- where r.item_rev_id = :revision_id
- and r.rel_type = 'as_item_display_rel'
- and o.object_id = r.target_rev_id
- }] end-1 end]
+ set display_type [string range [db_string get_display_type {
+ select o.object_type
+ from acs_objects o, as_item_rels r
+ where r.item_rev_id = :revision_id
+ and r.rel_type = 'as_item_display_rel'
+ and o.object_id = r.target_rev_id
+ }] end-1 end]
- set stats ""
+ set stats ""
- if { $display_type eq "rb" || $display_type eq "cb" || $display_type eq "sb" } {
- set total_responses 0
- set total_correct 0
- set total_choices 0
+ if { $display_type eq "rb" || $display_type eq "cb" || $display_type eq "sb" } {
+ set total_responses 0
+ set total_correct 0
+ set total_choices 0
- set choices [list]
- set visited_session_ids [list]
+ set choices [list]
+ set visited_session_ids [list]
- set item_choices_limit_session ""
- if { [info exists limit_to_section_clause] && $limit_to_section_clause ne "" } { set item_choices_limit_session "and d.session_id in $limit_to_section_clause" }
-if {([info exists session_id_list] && $session_id_list ne "")} {set item_choices_limit_session " and d.session_id in ([template::util::tcl_to_sql_list $session_id_list]) " }
- set item_choices_query "select r.title as choice_title, c.choice_id, c.correct_answer_p,
- (select count(*)
- from as_item_data_choices
- where choice_id = c.choice_id
- and item_data_id in (select item_data_id
- from as_item_data d, as_sessions s, cr_revisions a
- where d.session_id = s.session_id
- and s.assessment_id = a.revision_id
- and s.completed_datetime is not null
- and a.item_id = :assessment_id
- $item_choices_limit_session)) as choice_responses
-
- from cr_revisions r, as_item_choices c
- left outer join cr_revisions r2 on (c.content_value = r2.revision_id)
- where r.revision_id = c.choice_id
- and c.mc_id = (select max(t.as_item_type_id)
- from as_item_type_mc t, cr_revisions c, as_item_rels r
- where t.as_item_type_id = r.target_rev_id
- and r.item_rev_id = :revision_id
- and r.rel_type = 'as_item_type_rel'
- and c.revision_id = t.as_item_type_id
- group by c.title, t.increasing_p, t.allow_negative_p,
- t.num_correct_answers, t.num_answers)
- order by c.sort_order"
-
- db_foreach item_choices $item_choices_query {
- incr total_choices
- lappend choices [list choice_title $choice_title \
- choice_responses $choice_responses \
- correct_answer_p [template::util::is_true $correct_answer_p]]
- incr total_responses $choice_responses
- # Review the computation of correct percentage
- if { [template::util::is_true $correct_answer_p] } {
- incr total_correct $choice_responses
- }
- }
-
- set total_responses_limit_session ""
- if { [info exists limit_to_section_clause] && $limit_to_section_clause ne "" } { set total_responses_limit_session "and s.session_id in $limit_to_section_clause" }
+ set item_choices_limit_session ""
+ if { [info exists limit_to_section_clause] && $limit_to_section_clause ne "" } { set item_choices_limit_session "and d.session_id in $limit_to_section_clause" }
+ if {([info exists session_id_list] && $session_id_list ne "")} {set item_choices_limit_session " and d.session_id in ([template::util::tcl_to_sql_list $session_id_list]) " }
+ set item_choices_query "select r.title as choice_title, c.choice_id, c.correct_answer_p,
+ (select count(*)
+ from as_item_data_choices
+ where choice_id = c.choice_id
+ and item_data_id in (select item_data_id
+ from as_item_data d, as_sessions s, cr_revisions a
+ where d.session_id = s.session_id
+ and s.assessment_id = a.revision_id
+ and s.completed_datetime is not null
+ and a.item_id = :assessment_id
+ $item_choices_limit_session)) as choice_responses
-if {([info exists session_id_list] && $session_id_list ne "")} {
- set total_responses_limit_session " and s.session_id in ([template::util::tcl_to_sql_list $session_id_list]) "
-}
- set total_responses [db_string count_responses "select count(*) from (select distinct s.session_id from as_sessions s, as_item_data, cr_revisions cr1, cr_revisions cr2 where cr1.revision_id=:revision_id and cr1.item_id=cr2.item_id and as_item_id = cr2.revision_id and s.session_id = as_item_data.session_id and s.completed_datetime is not null $total_responses_limit_session ) d"]
+ from cr_revisions r, as_item_choices c
+ left outer join cr_revisions r2 on (c.content_value = r2.revision_id)
+ where r.revision_id = c.choice_id
+ and c.mc_id = (select max(t.as_item_type_id)
+ from as_item_type_mc t, cr_revisions c, as_item_rels r
+ where t.as_item_type_id = r.target_rev_id
+ and r.item_rev_id = :revision_id
+ and r.rel_type = 'as_item_type_rel'
+ and c.revision_id = t.as_item_type_id
+ group by c.title, t.increasing_p, t.allow_negative_p,
+ t.num_correct_answers, t.num_answers)
+ order by c.sort_order"
- if { $total_responses } {
- append stats "<table>\n"
- set first_p 1
- foreach choice $choices {
- array set r $choice
+ db_foreach item_choices $item_choices_query {
+ incr total_choices
+ lappend choices [list choice_title $choice_title \
+ choice_responses $choice_responses \
+ correct_answer_p [template::util::is_true $correct_answer_p]]
+ incr total_responses $choice_responses
+ # Review the computation of correct percentage
+ if { [template::util::is_true $correct_answer_p] } {
+ incr total_correct $choice_responses
+ }
+ }
- append stats "<tr>"
- if { $r(correct_answer_p) && $assessment_data(type) ne "survey"} {
- append stats "<td><img src=\"/resources/assessment/correct.gif\"></td>"
- } else {
- append stats "<td> </td>"
- }
- append stats "<td width=250>$r(choice_title):</td><td style='text-align: right; padding-right: 10px'>$r(choice_responses)</td><td style='text-align: right; padding-right: 20px'>[format "%.2f" [expr {double($r(choice_responses)) / $total_responses * 100}]]%</td>\n"
+ set total_responses_limit_session ""
+ if { [info exists limit_to_section_clause] && $limit_to_section_clause ne "" } { set total_responses_limit_session "and s.session_id in $limit_to_section_clause" }
- if { $first_p } {
- append stats "
-<td rowspan=$total_choices>
-<b>[_ assessment.Total_Responses]</b> $total_responses<br>"
- if {$assessment_data(type) ne "survey"} {
- append stats "
-<b>[_ assessment.Total_Correct]</b> $total_correct"
-
- if { $total_correct > 0 } {
- append stats ", [format "%.2f" [expr {double($total_correct) / $total_responses * 100}]]%"
- }
- }
- append stats "</td></tr>\n"
+ if {([info exists session_id_list] && $session_id_list ne "")} {
+ set total_responses_limit_session " and s.session_id in ([template::util::tcl_to_sql_list $session_id_list]) "
+ }
+ set total_responses [db_string count_responses "select count(*) from (select distinct s.session_id from as_sessions s, as_item_data, cr_revisions cr1, cr_revisions cr2 where cr1.revision_id=:revision_id and cr1.item_id=cr2.item_id and as_item_id = cr2.revision_id and s.session_id = as_item_data.session_id and s.completed_datetime is not null $total_responses_limit_session ) d"]
- set first_p 0
- } else {
- append stats "</tr>\n"
- }
- }
- append stats "</table>\n"
- } else {
- append stats "[_ assessment.No_responses]"
- }
- } else {
- switch $data_type {
+ if { $total_responses } {
+ append stats "<table>\n"
+ set first_p 1
+ foreach choice $choices {
+ array set r $choice
+
+ append stats "<tr>"
+ if { $r(correct_answer_p) && $assessment_data(type) ne "survey"} {
+ append stats "<td><img src=\"/resources/assessment/correct.gif\"></td>"
+ } else {
+ append stats "<td> </td>"
+ }
+ append stats "<td width=250>$r(choice_title):</td><td style='text-align: right; padding-right: 10px'>$r(choice_responses)</td><td style='text-align: right; padding-right: 20px'>[format "%.2f" [expr {double($r(choice_responses)) / $total_responses * 100}]]%</td>\n"
+
+ if { $first_p } {
+ append stats "
+ <td rowspan=$total_choices>
+ <b>[_ assessment.Total_Responses]</b> $total_responses<br>"
+ if {$assessment_data(type) ne "survey"} {
+ append stats "
+ <b>[_ assessment.Total_Correct]</b> $total_correct"
+
+ if { $total_correct > 0 } {
+ append stats ", [format "%.2f" [expr {double($total_correct) / $total_responses * 100}]]%"
+ }
+ }
+ append stats "</td></tr>\n"
+
+ set first_p 0
+ } else {
+ append stats "</tr>\n"
+ }
+ }
+ append stats "</table>\n"
+ } else {
+ append stats "[_ assessment.No_responses]"
+ }
+ } else {
+ switch $data_type {
"content_type" -
- "file" -
- "date" -
- "timestamp" -
- "text" -
- "varchar" {
- set stats "<a href=\"[export_vars -base view-item-responses { item_id {return_url [ad_return_url]} section_id }]\">[_ assessment.View_Responses_1]</a>"
- }
- "boolean" {
- append stats "<table>\n"
- db_foreach get_boolean_answers {
- select boolean_answer, count(*) as n_responses
- from as_item_data
- where as_item_id = :revision_id
- group by boolean_answer
- order by boolean_answer
- } {
- append stats "<tr><td>$boolean_answer: </td><td>$n_responses</td></tr>\n"
- }
- append stats "</table>\n"
- }
- "integer" -
- "float" {
- set stats "<table>\n"
+ "file" -
+ "date" -
+ "timestamp" -
+ "text" -
+ "varchar" {
+ set stats "<a href=\"[export_vars -base view-item-responses { item_id {return_url [ad_return_url]} section_id }]\">[_ assessment.View_Responses_1]</a>"
+ }
+ "boolean" {
+ append stats "<table>\n"
+ db_foreach get_boolean_answers {
+ select boolean_answer, count(*) as n_responses
+ from as_item_data
+ where as_item_id = :revision_id
+ group by boolean_answer
+ order by boolean_answer
+ } {
+ append stats "<tr><td>$boolean_answer: </td><td>$n_responses</td></tr>\n"
+ }
+ append stats "</table>\n"
+ }
+ "integer" -
+ "float" {
+ set stats "<table>\n"
- set number_answers [list]
- set total_responses 0
- db_foreach get_number_answers {
- select count(*) as n_responses, numeric_answer
- from as_item_data
- where as_item_id = :revision_id
- group by numeric_answer
- order by numeric_answer
- } {
- lappend number_answers [list numeric_answer $numeric_answer n_responses $n_responses]
- incr total_responses
- }
+ set number_answers [list]
+ set total_responses 0
+ db_foreach get_number_answers {
+ select count(*) as n_responses, numeric_answer
+ from as_item_data
+ where as_item_id = :revision_id
+ group by numeric_answer
+ order by numeric_answer
+ } {
+ lappend number_answers [list numeric_answer $numeric_answer n_responses $n_responses]
+ incr total_responses
+ }
- set first_p 0
- foreach number_answer $number_answers {
- array set r $number_answer
+ set first_p 0
+ foreach number_answer $number_answers {
+ array set r $number_answer
- append stats "<tr><td>$r(number_answer):</td><td>$r(n_responses)</td></tr>\n"
+ append stats "<tr><td>$r(number_answer):</td><td>$r(n_responses)</td></tr>\n"
- if { $first_p } {
- db_1row get_number_average {
- select avg(numeric_answers) as mean, stddev(numeric_answers) as standard_deviation
- from as_item_data
- where as_item_id = :revision_id
- group by numeric_answers
- }
+ if { $first_p } {
+ db_1row get_number_average {
+ select avg(numeric_answers) as mean, stddev(numeric_answers) as standard_deviation
+ from as_item_data
+ where as_item_id = :revision_id
+ group by numeric_answers
+ }
- append stats "
-<td rowspan=$total_responses valign=\"middle\">
-[_ assessment.Mean] $mean<br>
-[_ assessment.Standard_Deviation] $standard_deviation
-</td>
-"
- set first_p 0
- }
- }
- }
- }
- }
-
- template::multirow append items $item_id $revision_id $title $data_type $display_type $stats $section_id $section_title
+ append stats "
+ <td rowspan=$total_responses valign=\"middle\">
+ [_ assessment.Mean] $mean<br>
+ [_ assessment.Standard_Deviation] $standard_deviation
+ </td>
+ "
+ set first_p 0
+ }
+ }
+ }
+ }
+ }
+
+ template::multirow append items $item_id $revision_id $title $data_type $display_type $stats $section_id $section_title
}
}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/assessment/www/asm-admin/one-a.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/assessment/www/asm-admin/one-a.tcl 17 Jul 2018 11:42:26 -0000 1.18
+++ openacs-4/packages/assessment/www/asm-admin/one-a.tcl 17 Jul 2018 13:32:18 -0000 1.19
@@ -6,7 +6,7 @@
@author timo@timohentschel.de
@creation-date September 28, 2004
- @cvs-id $Id$
+ @cvs-id $Id$
} {
assessment_id:naturalnum,notnull
{context ""}
@@ -53,7 +53,7 @@
set reg_url "[apm_package_url_from_id $asm_instance]admin"
} else {
set reg_url "../admin"
-}
+}
if { $assessment_id eq $registration_id } {
# This is the user-registration assessment
@@ -78,14 +78,14 @@
set target "[export_vars -base one-a {assessment_id reg_p}]"
set notification_chunk [notification::display::request_widget \
- -type assessment_response_notif \
- -object_id $assessment_id \
- -pretty_name $title \
- -url [ad_return_url] ]
+ -type assessment_response_notif \
+ -object_id $assessment_id \
+ -pretty_name $title \
+ -url [ad_return_url] ]
db_multirow -extend { section_url } sections assessment_sections {} {
if {$points eq ""} {
- set points 0
+ set points 0
}
set max_time_to_complete [as::assessment::pretty_time -seconds $max_time_to_complete]
set section_url [export_vars -base one-section {assessment_id section_id}]
Index: openacs-4/packages/assessment/www/asm-admin/section-select.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/section-select.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment/www/asm-admin/section-select.tcl 17 Jul 2018 11:42:26 -0000 1.10
+++ openacs-4/packages/assessment/www/asm-admin/section-select.tcl 17 Jul 2018 13:32:18 -0000 1.11
@@ -1,9 +1,9 @@
ad_page_contract {
-
+
@author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net)
@creation-date 2005-01-07
-
- This page allows to add branches or actions to the question and its choices.
+
+ This page allows to add branches or actions to the question and its choices.
} {
assessment_id:naturalnum,notnull
inter_item_check_id:naturalnum,notnull
@@ -29,9 +29,9 @@
if { [info exists by_item_p] && $by_item_p ne "" } {
if { $by_item_p == 1} {
- set return_url "checks-admin?assessment_id=$assessment_id§ion_id=$section_id&item_id=$item_id"
+ set return_url "checks-admin?assessment_id=$assessment_id§ion_id=$section_id&item_id=$item_id"
} else {
- set return_url "checks-admin?assessment_id=$assessment_id§ion_id=$section_id"
+ set return_url "checks-admin?assessment_id=$assessment_id§ion_id=$section_id"
}
}
@@ -47,29 +47,30 @@
ad_form -name get_section -export {by_item_p item_id} -form {
inter_item_check_id:key
{assessment_id:text(hidden)
- {value $assessment_id}}
+ {value $assessment_id}}
{section_id:text(hidden)
- {value $section_id}}
-
+ {value $section_id}}
+
{section_id_to:text(select)
- {label "[_ assessment.section_to_branch]"}
- {options $sections_list}
- {help_text "[_ assessment.lead_you]"}
+ {label "[_ assessment.section_to_branch]"}
+ {options $sections_list}
+ {help_text "[_ assessment.lead_you]"}
}
-
+
} -new_data {
db_transaction {
- db_dml update_check {}
+ db_dml update_check {}
}
} -edit_request {
db_1row get_section {}
} -edit_data {
db_dml update_check {}
-
+
} -on_submit {
- ad_returnredirect $return_url
+ ad_returnredirect $return_url
ad_script_abort
}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/assessment/www/asm-admin/sessions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/sessions.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/assessment/www/asm-admin/sessions.tcl 17 Jul 2018 11:42:26 -0000 1.11
+++ openacs-4/packages/assessment/www/asm-admin/sessions.tcl 17 Jul 2018 13:32:18 -0000 1.12
@@ -1,9 +1,9 @@
# packages/assessment/www/asm-admin/sessions.tcl
ad_page_contract {
-
+
List subjects who completed assessment
-
+
@author Roel Canicula (roel@solutiongrove.com)
@creation-date 2006-06-05
@@ -37,7 +37,7 @@
set actions [list]
if { [info exists subject_id] } {
- set actions [list "[_ assessment.All_Users]" ? "[_ assessment.All_Users]"]
+ set actions [list "[_ assessment.All_Users]" ? "[_ assessment.All_Users]"]
set person_name [person::name -person_id $subject_id]
}
@@ -73,69 +73,69 @@
-actions $actions \
-no_data "[_ assessment.No_sessions_found]" \
-elements {
- name {
- label "[_ assessment.Name]"
- display_template {
- <a href="?subject_id=@sessions.user_id@">@sessions.last_name@, @sessions.first_names@</a>
- }
- hide_p {[info exists subject_id]}
- }
- title {
- label "[_ assessment.Assessment]"
- display_template {
- <a href="?assessment_id=@sessions.item_id@">@sessions.title@</a>
- }
- hide_p {[info exists assessment_id]}
- }
- status {
- label "[_ assessment.Status]"
- display_template {
- <if @sessions.session_id@ nil>
- [_ assessment.Not_Taken]
- </if>
- <elseif @sessions.completed_datetime@ nil>
- [_ assessment.Incomplete]
- </elseif>
- <else>
- [_ assessment.Complete]
- </else>
- }
- }
- last_mod_datetime {
- label "[_ assessment.Last_Updated]"
- }
- percent_score {
- label {[_ assessment.Percent_Score]}
- html {align right}
- display_template {
- <if @sessions.session_id@ not nil>
- <a href="../session?session_id=@sessions.session_id@">
- <if @sessions.percent_score@ not nil>
- @sessions.percent_score@%
- </if>
- <img src="/resources/right.gif" style="border:0"></a>
- </if>
- }
- hide_p {[expr {[info exists assessment_data(type)] && $assessment_data(type) ne "test"}]}
- }
+ name {
+ label "[_ assessment.Name]"
+ display_template {
+ <a href="?subject_id=@sessions.user_id@">@sessions.last_name@, @sessions.first_names@</a>
+ }
+ hide_p {[info exists subject_id]}
+ }
+ title {
+ label "[_ assessment.Assessment]"
+ display_template {
+ <a href="?assessment_id=@sessions.item_id@">@sessions.title@</a>
+ }
+ hide_p {[info exists assessment_id]}
+ }
+ status {
+ label "[_ assessment.Status]"
+ display_template {
+ <if @sessions.session_id@ nil>
+ [_ assessment.Not_Taken]
+ </if>
+ <elseif @sessions.completed_datetime@ nil>
+ [_ assessment.Incomplete]
+ </elseif>
+ <else>
+ [_ assessment.Complete]
+ </else>
+ }
+ }
+ last_mod_datetime {
+ label "[_ assessment.Last_Updated]"
+ }
+ percent_score {
+ label {[_ assessment.Percent_Score]}
+ html {align right}
+ display_template {
+ <if @sessions.session_id@ not nil>
+ <a href="../session?session_id=@sessions.session_id@">
+ <if @sessions.percent_score@ not nil>
+ @sessions.percent_score@%
+ </if>
+ <img src="/resources/right.gif" style="border:0"></a>
+ </if>
+ }
+ hide_p {[expr {[info exists assessment_data(type)] && $assessment_data(type) ne "test"}]}
+ }
} \
-filters {
- assessment_id {
- where_clause {
- a.item_id = :assessment_id
- }
- }
- subject_id {
- where_clause {
- cs.subject_id = :subject_id
- }
- }
- status {
- values {{"[_ assessment.Complete]" complete} {"[_ assessment.Incomplete]" incomplete} {"[_ assessment.Not_Taken]" nottaken}}
- where_clause {
- $whereclause
- }
- }
+ assessment_id {
+ where_clause {
+ a.item_id = :assessment_id
+ }
+ }
+ subject_id {
+ where_clause {
+ cs.subject_id = :subject_id
+ }
+ }
+ status {
+ values {{"[_ assessment.Complete]" complete} {"[_ assessment.Incomplete]" incomplete} {"[_ assessment.Not_Taken]" nottaken}}
+ where_clause {
+ $whereclause
+ }
+ }
}
db_multirow sessions get_sessions ""
Index: openacs-4/packages/bug-tracker/tcl/bug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs.tcl,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/bug-tracker/tcl/bug-procs.tcl 17 Jul 2018 11:42:26 -0000 1.46
+++ openacs-4/packages/bug-tracker/tcl/bug-procs.tcl 17 Jul 2018 13:32:18 -0000 1.47
@@ -1122,3 +1122,9 @@
return $filter_bug_numbers
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -r1.62 -r1.63
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl 17 Jul 2018 11:42:26 -0000 1.62
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl 17 Jul 2018 13:32:18 -0000 1.63
@@ -1580,7 +1580,6 @@
}
}
}
-
}
ad_proc -private bug_tracker::grant_direct_read_permission {
@@ -1623,3 +1622,9 @@
return [db_map user_bugs_only]
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 17 Jul 2018 11:42:26 -0000 1.16
+++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl 17 Jul 2018 13:32:18 -0000 1.17
@@ -6,7 +6,7 @@
@cvs-id $Id$
} {
patch_number:integer,notnull
- bug_number:integer,optional,multiple
+ bug_number:integer,optional,multiple
component_id:naturalnum,optional
{show_all_components_p:boolean "0"}
{show_only_open_p:boolean "1"}
@@ -16,10 +16,10 @@
{return_url:trim,notnull ""}
} -validate {
valid_return_url -requires return_url {
- # actually, one should use the page filter localurl from OpenACS 5.9
- if {[util::external_url_p $return_url]} {
- ad_complain "invalid return_url"
- }
+ # actually, one should use the page filter localurl from OpenACS 5.9
+ if {[util::external_url_p $return_url]} {
+ ad_complain "invalid return_url"
+ }
}
}
@@ -39,8 +39,8 @@
set write_p [permission::permission_p -object_id $package_id -privilege write]
set user_is_submitter_p [expr {$user_id == [bug_tracker::get_patch_submitter -patch_number $patch_number]}]
-if { !($user_is_submitter_p || $write_p) } {
- ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_1]"
+if { !($user_is_submitter_p || $write_p) } {
+ ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_1]"
ad_script_abort
}
@@ -77,14 +77,14 @@
set component_filter_url [export_vars -base map-patch-to-bugs {patch_number component_id return_url offset show_only_open_p interval_size}]
if { $show_all_components_p } {
set component_filter [subst {\[
- <a href="[ns_quotehtml $component_filter_url&show_all_components_p=0]">[_ bug-tracker.Only]</a> |
- [_ bug-tracker.All_1] \]}]
+ <a href="[ns_quotehtml $component_filter_url&show_all_components_p=0]">[_ bug-tracker.Only]</a> |
+ [_ bug-tracker.All_1] \]}]
} else {
set component_where_clause "\n and bt_bugs.component_id = :component_id"
-
+
set component_filter [subst {\[
- [_ bug-tracker.Only_1] |
- <a href="[ns_quotehtml $component_filter_url&show_all_components_p=1]">[_ bug-tracker.All_1]</a> \]}]
+ [_ bug-tracker.Only_1] |
+ <a href="[ns_quotehtml $component_filter_url&show_all_components_p=1]">[_ bug-tracker.All_1]</a> \]}]
}
}
@@ -100,13 +100,13 @@
if { $show_only_open_p } {
set open_where_clause "and cfsm.current_state = :initial_state_id"
set open_filter [subst {$only_open_label |
- <a href="[ns_quotehtml $open_filter_url&show_only_open_p=0]">$any_status_label</a>
+ <a href="[ns_quotehtml $open_filter_url&show_only_open_p=0]">$any_status_label</a>
}]
} else {
set open_where_clause ""
set open_filter [subst {
- <a href="[ns_quotehtml $open_filter_url&show_only_open_p=1]">$only_open_label</a> |
- $any_status_label
+ <a href="[ns_quotehtml $open_filter_url&show_only_open_p=1]">$only_open_label</a> |
+ $any_status_label
}]
}
@@ -126,8 +126,14 @@
# Build the pagination filter
set bug_count [db_string bug_count_for_mapping {}]
-set pagination_export_var_set [ad_tcl_vars_to_ns_set patch_number component_id return_url show_all_components_p show_only_open_p]
+set pagination_export_var_set [ad_tcl_vars_to_ns_set patch_number component_id return_url show_all_components_p show_only_open_p]
db_multirow open_bugs select_open_bugs {}
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/bug-tracker/www/notifications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/notifications.tcl 17 Jul 2018 11:42:26 -0000 1.6
+++ openacs-4/packages/bug-tracker/www/notifications.tcl 17 Jul 2018 13:32:18 -0000 1.7
@@ -66,8 +66,8 @@
-object_id $object_id \
-user_id $user_id]
- set subscribed_p [expr {$request_id ne ""}]
-
+ set subscribed_p [expr {$request_id ne ""}]
+
if { $subscribed_p } {
set url [notification::display::unsubscribe_url -request_id $request_id -url $return_url]
} else {
@@ -90,3 +90,9 @@
}
set manage_url "[apm_package_url_from_key [notification::package_key]]manage"
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/bug-tracker/www/patch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/bug-tracker/www/patch-add.tcl 17 Jul 2018 11:42:26 -0000 1.21
+++ openacs-4/packages/bug-tracker/www/patch-add.tcl 17 Jul 2018 13:32:18 -0000 1.22
@@ -13,10 +13,10 @@
{return_url:notnull,trim ""}
} -validate {
valid_return_url -requires return_url {
- # actually, one should use the page filter localurl from OpenACS 5.9
- if {[util::external_url_p $return_url]} {
- ad_complain "invalid return_url"
- }
+ # actually, one should use the page filter localurl from OpenACS 5.9
+ if {[util::external_url_p $return_url]} {
+ ad_complain "invalid return_url"
+ }
}
}
@@ -81,7 +81,7 @@
-label "[_ bug-tracker.Generated]" \
-options [bug_tracker::version_get_options -include_unknown] \
-optional
-
+
element create patch patch_file \
-datatype file \
-widget file \
@@ -124,7 +124,7 @@
if { [info exists component_id] } {
element set_properties patch component_id -value $component_id
- }
+ }
}
if { [form is_valid patch] } {
@@ -138,7 +138,7 @@
set content [bug_tracker::get_uploaded_patch_file_content]
set ip_address [ns_conn peeraddr]
-
+
db_exec_plsql new_patch {}
set patch_number [db_string patch_number_for_id {}]
@@ -149,7 +149,7 @@
} else {
set redirect_url $return_url
}
-
+
# Fetch any provided bug id to map the patch to
catch {set bug_number [element get_value patch bug_number]}
if { [info exists bug_number] } {
@@ -161,7 +161,7 @@
# No bug id provided so redirect to page for selecting bugs if the
# user wishes to go there
set select_bugs_p [element get_value patch select_bugs_p]
-
+
if { $select_bugs_p } {
set redirect_url [export_vars -base map-patch-to-bugs { return_url patch_number component_id }]
}
@@ -173,3 +173,9 @@
}
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/bug-tracker/www/admin/category-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/admin/category-edit.tcl 17 Jul 2018 11:42:26 -0000 1.9
+++ openacs-4/packages/bug-tracker/www/admin/category-edit.tcl 17 Jul 2018 13:32:18 -0000 1.10
@@ -33,7 +33,7 @@
set parent_id [bug_tracker::conn project_root_keyword_id]
}
} -select_query {
- select child.parent_id,
+ select child.parent_id,
child.heading
from cr_keywords child
where child.keyword_id = :keyword_id
@@ -51,3 +51,9 @@
ad_returnredirect categories
ad_script_abort
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 17 Jul 2018 11:42:26 -0000 1.45
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 17 Jul 2018 13:32:18 -0000 1.46
@@ -27,7 +27,7 @@
{period_days:naturalnum,optional}
{julian_date ""}
} -properties {
-
+
} -validate {
valid_date -requires { date } {
if {$date ne "" } {
@@ -138,7 +138,7 @@
}
ad_script_abort
} else {
- ad_return_template
+ ad_return_template
}
# Local variables:
Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/chat/www/search-2.tcl 17 Jul 2018 11:42:26 -0000 1.10
+++ openacs-4/packages/chat/www/search-2.tcl 17 Jul 2018 13:32:18 -0000 1.11
@@ -144,3 +144,9 @@
set export_authorize [export_ns_set_vars {url} {only_authorized_p}]
ad_return_template
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/faq/lib/faq-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/lib/faq-add-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/lib/faq-add-edit.tcl 17 Jul 2018 11:42:26 -0000 1.6
+++ openacs-4/packages/faq/lib/faq-add-edit.tcl 17 Jul 2018 13:32:18 -0000 1.7
@@ -9,14 +9,14 @@
{separate_p:text(select) {label "#faq.QA_on_Separate_Pages#"} { options {{[_ faq.No] f} {[_ faq.Yes] t}} } }
} -select_query_name get_faq -new_data {
set user_id [ad_conn user_id]
- set creation_ip [ad_conn host]
- set package_id [ad_conn package_id]
+ set creation_ip [ad_conn host]
+ set package_id [ad_conn package_id]
set faq_id [db_exec_plsql create_faq {}]
} -edit_data {
db_dml edit_faq {}
} -after_submit {
if { ![info exists return_url] || $return_url eq "" } {
- set return_url [export_vars -base one-faq { faq_id }]
+ set return_url [export_vars -base one-faq { faq_id }]
}
ad_returnredirect $return_url
ad_script_abort
Index: openacs-4/packages/static-portlet/www/element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/static-portlet/www/element.tcl 17 Jul 2018 11:42:27 -0000 1.25
+++ openacs-4/packages/static-portlet/www/element.tcl 17 Jul 2018 13:32:18 -0000 1.26
@@ -80,59 +80,59 @@
-package_id $package_id \
-content [template::util::richtext::get_property contents $content] \
-format [template::util::richtext::get_property format $content] \
- -pretty_name $pretty_name]
-
+ -pretty_name $pretty_name]
+
set old_element_id [static_portal_content::add_to_portal \
- -portal_id $portal_id \
- -package_id $package_id \
- -content_id $item_id]
+ -portal_id $portal_id \
+ -package_id $package_id \
+ -content_id $item_id]
}
# support for templates & already created portals for users,
# classes, etc. (roc)
switch $type {
- user {
- set query "select portal_id as target_portal_id from dotlrn_users"
- set community_id $package_id
- set new_content_id $item_id
- }
- dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
- dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
- dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
- default {
- ad_returnredirect $referer
- ad_script_abort
- }
+ user {
+ set query "select portal_id as target_portal_id from dotlrn_users"
+ set community_id $package_id
+ set new_content_id $item_id
+ }
+ dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
+ dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
+ dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
+ default {
+ ad_returnredirect $referer
+ ad_script_abort
+ }
}
-
+
db_foreach dotlrn_type_portals "$query" {
- if {$type ne "user" } {
- # clone the template's content
- set new_content_id [static_portal_content::new \
- -package_id $community_id \
- -content [template::util::richtext::get_property contents $content] \
- -format [template::util::richtext::get_property format $content] \
- -pretty_name $pretty_name ]
- }
-
+ if {$type ne "user" } {
+ # clone the template's content
+ set new_content_id [static_portal_content::new \
+ -package_id $community_id \
+ -content [template::util::richtext::get_property contents $content] \
+ -format [template::util::richtext::get_property format $content] \
+ -pretty_name $pretty_name ]
+ }
- set new_element_id [ static_portal_content::add_to_portal \
- -portal_id $target_portal_id \
- -package_id $community_id \
- -content_id $new_content_id]
-
+ set new_element_id [ static_portal_content::add_to_portal \
+ -portal_id $target_portal_id \
+ -package_id $community_id \
+ -content_id $new_content_id]
- portal::set_element_param $new_element_id "package_id" $community_id
- portal::set_element_param $new_element_id "content_id" $new_content_id
- if {$enforce_portlet == 0} {
- db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :new_element_id }
- }
+ portal::set_element_param $new_element_id "package_id" $community_id
+ portal::set_element_param $new_element_id "content_id" $new_content_id
+
+ if {$enforce_portlet == 0} {
+ db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :new_element_id }
+ }
+
}
# redirect and abort
@@ -145,84 +145,82 @@
static_portal_content::update \
-portal_id $portal_id \
-content_id $element_content_id \
- -pretty_name $pretty_name \
- -content [template::util::richtext::get_property contents $content] \
- -format [template::util::richtext::get_property format $content]
+ -pretty_name $pretty_name \
+ -content [template::util::richtext::get_property contents $content] \
+ -format [template::util::richtext::get_property format $content]
}
switch $type {
- user {
- set query "select portal_id as target_portal_id from dotlrn_users"
+ user {
+ set query "select portal_id as target_portal_id from dotlrn_users"
set community_id $package_id
- }
- dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
- dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
- dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
- default {
- ad_returnredirect $referer
- ad_script_abort
- }
+ }
+ dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
+ dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
+ dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
+ default {
+ ad_returnredirect $referer
+ ad_script_abort
+ }
}
db_foreach dotlrn_type_portals "$query" {
- if { $type ne "user" } {
- catch {
- set element_content_id [db_string get_content_id {
- select content_id
- from static_portal_content
- where package_id = :community_id
- and pretty_name = :pretty_name
- }]
- } errmsg2
- }
+ if { $type ne "user" } {
+ catch {
+ set element_content_id [db_string get_content_id {
+ select content_id
+ from static_portal_content
+ where package_id = :community_id
+ and pretty_name = :pretty_name
+ }]
+ } errmsg2
+ }
- set no_portlet [catch {set element_id [portal::get_element_id_from_unique_param -portal_id $target_portal_id -key content_id -value $element_content_id]} errmsg]
+ set no_portlet [catch {set element_id [portal::get_element_id_from_unique_param -portal_id $target_portal_id -key content_id -value $element_content_id]} errmsg]
- if { $no_portlet } {
+ if { $no_portlet } {
- # if we are here, means that the portlet do not exists
- # for given portal_id, then instead of update, we'll
- # create it
+ # if we are here, means that the portlet do not exists
+ # for given portal_id, then instead of update, we'll
+ # create it
- if {$type ne "user" } {
- # clone the template's content
- set element_content_id [static_portal_content::new \
- -package_id $community_id \
- -content [template::util::richtext::get_property contents $content] \
- -format [template::util::richtext::get_property format $content] \
- -pretty_name $pretty_name ]
- }
+ if {$type ne "user" } {
+ # clone the template's content
+ set element_content_id [static_portal_content::new \
+ -package_id $community_id \
+ -content [template::util::richtext::get_property contents $content] \
+ -format [template::util::richtext::get_property format $content] \
+ -pretty_name $pretty_name ]
+ }
- set new_element_id [ static_portal_content::add_to_portal \
- -portal_id $target_portal_id \
- -package_id $community_id \
- -content_id $element_content_id]
+ set new_element_id [ static_portal_content::add_to_portal \
+ -portal_id $target_portal_id \
+ -package_id $community_id \
+ -content_id $element_content_id]
- portal::set_element_param $new_element_id "package_id" $community_id
- portal::set_element_param $new_element_id "content_id" $element_content_id
- set element_id $element_content_id
+ portal::set_element_param $new_element_id "package_id" $community_id
+ portal::set_element_param $new_element_id "content_id" $element_content_id
+ set element_id $element_content_id
+ } else {
- } else {
+ static_portal_content::update \
+ -portal_id $target_portal_id \
+ -content_id $element_content_id \
+ -pretty_name $pretty_name \
+ -content [template::util::richtext::get_property contents $content] \
+ -format [template::util::richtext::get_property format $content]
+ }
- static_portal_content::update \
- -portal_id $target_portal_id \
- -content_id $element_content_id \
- -pretty_name $pretty_name \
- -content [template::util::richtext::get_property contents $content] \
- -format [template::util::richtext::get_property format $content]
- }
-
- if {$enforce_portlet == 0} {
- db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :element_id }
- } else {
- db_dml hide_portlet { update portal_element_map set state = 'full' where element_id = :element_id }
- }
-
+ if {$enforce_portlet == 0} {
+ db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :element_id }
+ } else {
+ db_dml hide_portlet { update portal_element_map set state = 'full' where element_id = :element_id }
+ }
}
-
+
# redirect and abort
ad_returnredirect $referer
ad_script_abort
@@ -238,18 +236,18 @@
{label "[_ static-portlet.File]"}
}
{content_format:text(select)
- {label "Format"}
- {options [template::util::richtext::format_options]}
+ {label "Format"}
+ {options [template::util::richtext::format_options]}
{value "text/plain"}
}
}
if {$type in $templates} {
set elements [list \
- [list {enforce_portlet:text(select)} [list label [_ static-portlet.lt_Enforce_this_applet_t]] \
- [list help_text [_ static-portlet.lt_Enforce_True_means_th]] \
- [list options [list [list [_ static-portlet.True] 1] [list [_ static-portlet.False_0] 0]]] \
- [list value 0]]]
+ [list {enforce_portlet:text(select)} [list label [_ static-portlet.lt_Enforce_this_applet_t]] \
+ [list help_text [_ static-portlet.lt_Enforce_True_means_th]] \
+ [list options [list [list [_ static-portlet.True] 1] [list [_ static-portlet.False_0] 0]]] \
+ [list value 0]]]
ad_form -extend -name static_file -form $elements
}
@@ -283,8 +281,8 @@
set item_id [static_portal_content::new \
-package_id $package_id \
-content $content \
- -format $content_format \
- -pretty_name $pretty_name
+ -format $content_format \
+ -pretty_name $pretty_name
]
static_portal_content::add_to_portal \
@@ -298,48 +296,46 @@
# classes, etc. (roc)
switch $type {
- user {
- set query "select portal_id as target_portal_id from dotlrn_users"
- set community_id $package_id
- set new_content_id $item_id
- }
- dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
- dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
- dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
- default {
- ad_returnredirect $referer
- ad_script_abort
- }
+ user {
+ set query "select portal_id as target_portal_id from dotlrn_users"
+ set community_id $package_id
+ set new_content_id $item_id
+ }
+ dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
+ dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
+ dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
+ default {
+ ad_returnredirect $referer
+ ad_script_abort
+ }
}
-
+
db_foreach dotlrn_type_portals "$query" {
- if {$type ne "user" } {
- # clone the template's content
- set new_content_id [static_portal_content::new \
- -package_id $community_id \
- -content $content \
- -format $content_format \
- -pretty_name $pretty_name ]
- }
+ if {$type ne "user" } {
+ # clone the template's content
+ set new_content_id [static_portal_content::new \
+ -package_id $community_id \
+ -content $content \
+ -format $content_format \
+ -pretty_name $pretty_name ]
+ }
- set new_element_id [ static_portal_content::add_to_portal \
- -portal_id $target_portal_id \
- -package_id $community_id \
- -content_id $new_content_id]
+ set new_element_id [ static_portal_content::add_to_portal \
+ -portal_id $target_portal_id \
+ -package_id $community_id \
+ -content_id $new_content_id]
- portal::set_element_param $new_element_id "package_id" $community_id
- portal::set_element_param $new_element_id "content_id" $new_content_id
+ portal::set_element_param $new_element_id "package_id" $community_id
+ portal::set_element_param $new_element_id "content_id" $new_content_id
- if {$enforce_portlet == 0} {
- db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :new_element_id }
- }
-
+ if {$enforce_portlet == 0} {
+ db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :new_element_id }
+ }
}
-
# redirect and abort
ad_returnredirect $referer
ad_script_abort
@@ -361,83 +357,80 @@
-portal_id $portal_id \
-content_id $file_content_id \
-pretty_name $pretty_name \
- -content $content \
- -format $content_format
+ -content $content \
+ -format $content_format
}
switch $type {
- user {
- set query "select portal_id as target_portal_id from dotlrn_users"
- set community_id $package_id
- }
- dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
- dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
- dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
- default {
- ad_returnredirect $referer
- ad_script_abort
- }
+ user {
+ set query "select portal_id as target_portal_id from dotlrn_users"
+ set community_id $package_id
+ }
+ dotlrn_class_instance { set query "select portal_id as target_portal_id, community_id from dotlrn_class_instances_full" }
+ dotlrn_club { set query "select portal_id as target_portal_id, community_id from dotlrn_clubs_full" }
+ dotlrn_community { set query "select portal_id as target_portal_id, community_id from dotlrn_communities_full" }
+ default {
+ ad_returnredirect $referer
+ ad_script_abort
+ }
}
-
+
db_foreach dotlrn_type_portals "$query" {
- if {$type ne "user" } {
- catch {
- set file_content_id [db_string get_content_id {
- select content_id
- from static_portal_content
- where package_id = :community_id
- and pretty_name = :pretty_name
- }]
- } errmsg2
- }
+ if {$type ne "user" } {
+ catch {
+ set file_content_id [db_string get_content_id {
+ select content_id
+ from static_portal_content
+ where package_id = :community_id
+ and pretty_name = :pretty_name
+ }]
+ } errmsg2
+ }
+ set no_portlet [catch {set element_id [portal::get_element_id_from_unique_param -portal_id $target_portal_id -key content_id -value $file_content_id]} errmsg]
- set no_portlet [catch {set element_id [portal::get_element_id_from_unique_param -portal_id $target_portal_id -key content_id -value $file_content_id]} errmsg]
+ if { $no_portlet } {
- if { $no_portlet } {
+ # if we are here, means that the portlet do not exists
+ # for given portal_id, then instead of update, we'll
+ # create it
- # if we are here, means that the portlet do not exists
- # for given portal_id, then instead of update, we'll
- # create it
+ if {$type ne "user" } {
+ # clone the template's content
+ set file_content_id [static_portal_content::new \
+ -package_id $community_id \
+ -content $content \
+ -format $content_format \
+ -pretty_name $pretty_name ]
+ }
- if {$type ne "user" } {
- # clone the template's content
- set file_content_id [static_portal_content::new \
- -package_id $community_id \
- -content $content \
- -format $content_format \
- -pretty_name $pretty_name ]
- }
+ set new_element_id [ static_portal_content::add_to_portal \
+ -portal_id $target_portal_id \
+ -package_id $community_id \
+ -content_id $file_content_id]
- set new_element_id [ static_portal_content::add_to_portal \
- -portal_id $target_portal_id \
- -package_id $community_id \
- -content_id $file_content_id]
+ portal::set_element_param $new_element_id "package_id" $community_id
+ portal::set_element_param $new_element_id "content_id" $file_content_id
+ set element_id $file_content_id
- portal::set_element_param $new_element_id "package_id" $community_id
- portal::set_element_param $new_element_id "content_id" $file_content_id
- set element_id $file_content_id
+ } else {
+ static_portal_content::update \
+ -portal_id $target_portal_id \
+ -content_id $file_content_id \
+ -pretty_name $pretty_name \
+ -content $content \
+ -format $content_format
+ }
- } else {
-
- static_portal_content::update \
- -portal_id $target_portal_id \
- -content_id $file_content_id \
- -pretty_name $pretty_name \
- -content $content \
- -format $content_format
- }
+ if {$enforce_portlet == 0} {
+ db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :element_id }
+ } else {
+ db_dml hide_portlet { update portal_element_map set state = 'full' where element_id = :element_id }
+ }
+ }
- if {$enforce_portlet == 0} {
- db_dml hide_portlet { update portal_element_map set state = 'hidden' where element_id = :element_id }
- } else {
- db_dml hide_portlet { update portal_element_map set state = 'full' where element_id = :element_id }
- }
-
- }
-
# redirect and abort
ad_returnredirect $referer
ad_script_abort
Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl 17 Jul 2018 11:42:27 -0000 1.20
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl 17 Jul 2018 13:32:18 -0000 1.21
@@ -268,3 +268,9 @@
append subnavbar "</ul>"
}
}
+
+# Local variables:
+# mode: tcl
+# tcl-indent-level: 4
+# indent-tabs-mode: nil
+# End: