Index: openacs-4/packages/assessment/lib/show-check-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/show-check-info.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/lib/show-check-info.adp 24 Jan 2005 21:34:15 -0000 1.1 +++ openacs-4/packages/assessment/lib/show-check-info.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -1,10 +1,11 @@
- + + - + @display_info;noquote@
Trigger Name Action Related Parameters Related
#assessment.trigger# #assessment.Name##assessment.action# #assessment.related# #assessment.parameters# #assessment.related#
Trigger Name Section to Branch
#assessment.trigger# #assessment.Name##assessment.section_to_branch#
Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/tcl/as-checks-procs.tcl 25 Jan 2005 20:43:05 -0000 1.4 +++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl 25 Jan 2005 22:03:44 -0000 1.5 @@ -10,7 +10,7 @@ } { Return the checks types } { - set types [list [list "Action" "t"] [list "Branch" "f"]] + set types [list [list "\#assessment.action\#" "t"] [list "\#assessment.branch\#" "f"]] return $types } @@ -19,7 +19,7 @@ } { set package_id [ad_conn package_id] - set assessment_list [list [list "All" "all"]] + set assessment_list [list [list "[_ assessment.all]" "all"]] db_foreach assessment {} { lappend assessment_list [list $title $assessment_id] } @@ -31,7 +31,7 @@ } { } { - set approved_options [list {"Approved" "t"} {"Approved with errors" "ae"} {"Not Approved" "f"} ] + set approved_options [list [list "[_ assessment.approved]" "t"] [list "[_ assessment.approved_with]" "ae"] [list "[_ assessment.not_approved]" "f"] ] return $approved_options } @@ -46,7 +46,7 @@ set last_week [db_string last_week {}] set last_month [db_string last_month {}] - set intervals [list [list "All" "all"] [list "Today" $today] [list "Yesterday" $yesterday] [list "Two days ago" $two_days] [list "Last Week" $last_week] [list "Last Month" $last_month]] + set intervals [list [list "[_ assessment.all]" "all"] [list "[_ assessment.today]" $today] [list "[_ assessment.yesterday]" $yesterday] [list "[_ assessment.two_days]" $two_days] [list "[_ assessment.last_week]" $last_week] [list "[_ assessment.last_month]" $last_month]] } @@ -201,7 +201,7 @@ set log_id [db_string get_next_val {}] set action_id [db_string action_id {}] db_dml insert_action {} - ns_log notice "inserta en mannually" + } } @@ -233,14 +233,14 @@ } else { set $varname $value } - ns_log notice "--------------------------parameter $varname [set $varname]" + } set tcl_code_p [db_1row select_tcl {}] set failed_p "t" set failed [catch $tcl_code] - ns_log notice "--------------------------TCL $tcl_code" + if { $failed > 0 } { set failed_p "f" } @@ -276,14 +276,14 @@ } else { set $varname $value } - ns_log notice "--------------------------parameter $varname [set $varname]" + } set tcl_code_p [db_1row select_tcl {}] set failed_p "t" set failed [catch $tcl_code] - ns_log notice "--------------------------TCL $tcl_code" + if { $failed > 0 } { set failed_p "f" } @@ -324,7 +324,7 @@ } { set order "f" set perform 0 - ns_log notice "-----------> entra a branch" + db_foreach section_checks {} { set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}] @@ -337,17 +337,17 @@ set cond_list [split $check_sql "="] set condition [lindex [split [lindex $cond_list 1] " "] 0] - ns_log notice "$condition $response $as_item_id item_id $item_id_to" + if { $condition == $response && $as_item_id == $item_id_to} { set perform 1 - ns_log notice "----------------> perform $perform rev $new_assessment_revision sec $section_id_to" + } if {$perform == 1} { set order [db_string get_order { }] } } - ns_log notice "$order" + if {$order == "f"} { return $order } { @@ -364,7 +364,7 @@ } { } { - ns_log notice "entra a eval_aa_checks" + set assessment_rev_id [db_string get_assessment_id {}] set section_list [db_list_of_lists sections {}] @@ -389,14 +389,14 @@ } { } { - ns_log notice "entra a mannually" + set assessment_rev_id [db_string get_assessment_id {}] db_foreach sections {} { db_foreach section_checks {} { if {$action_p == "t"} { set perform [db_string check_sql $check_sql] - ns_log notice "-------------manual perform $perform" + if {$perform == 1} { set failed "" Index: openacs-4/packages/assessment/www/admin/action-params.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-params.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/action-params.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/action-params.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -19,7 +19,7 @@ ad_script_abort } set title $assessment_data(title) -set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id§ion_id=$section_id" "$title Checks"] [list "action-select?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id§ion_id=$section_id" "Action Select"] "Action Parameters"] +set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id§ion_id=$section_id" "$title Checks"] [list "action-select?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id§ion_id=$section_id" "[_ assessment.action_select]"] "[_ assessment.action_params]" ] set new_assessment_revision [db_string get_assessment_id {select max(revision_id) from cr_revisions where item_id=:assessment_id}] @@ -32,7 +32,7 @@ } set action_perform [db_string get_perform {} -default " "] -set title "Action Parameters" +set title "[_ assessment.action_params]" ad_form -name get_params -export { assessment_id section_id action_perform} -form { Index: openacs-4/packages/assessment/www/admin/action-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/action-select.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/action-select.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/action-select.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -20,10 +20,10 @@ set edit_p [ db_string exist_check {}] set title $assessment_data(title) -set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id§ion_id=$section_id" "$title Triggers"] "Action Select"] +set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] [ list "add-edit-check?assessment_id=$assessment_id§ion_id=$section_id" "$title Triggers"] [_ assessment.action_select]] -set title "Action Select" -set options [list [list "Immediately" "i"] [list "At the end of this assessment" "aa"] [list "Manually" "m"]] +set title "[_ assessment.action_select]" +set options [list [list "[_ assessment.immediately]" "i"] [list "[_ assessment.at_the_end]" "aa"] [list "[_ assessment.manually]" "m"]] set actions_list [db_list_of_lists get_actions {} ] set return_url "" @@ -41,21 +41,21 @@ {section_id:text(hidden) {value $section_id}} {action_id:text(select) - {label "Choose the action to perform"} + {label "[_ assessment.choose_action]"} {options $actions_list} - {help_text "The action that will be executed."} + {help_text "[_ assessment.action_that_will]"} {$action_value} } {action_perform:text(select) - {label "When this will be executed"} + {label "[_ assessment.when_this_will]"} {options $options} - {help_text "When this action will be executed (ie. At the end of this section)"} + {help_text "[_ assessment.when_this_action]"} {$action_perform_value} } {user_message:text(textarea),optional - {label "Message"} + {label "[_ assessment.message]"} {html {cols 50} {rows 15}} - {help_text "Message to display to the user when the action is executed (ie. You have joined \"My Community\")"} + {help_text "[_ assessment.message_to_display_to]"} {$user_message} } Index: openacs-4/packages/assessment/www/admin/add-edit-check.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/add-edit-check.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/add-edit-check.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/add-edit-check.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -64,28 +64,28 @@ {value $section_id_from} } {name:text(text) - {label "Name"} - {help_text "The name of the trigger."} + {label "[_ assessment.Name]"} + {help_text "[_ assessment.name_of_trigger]"} } {postcheck_p:boolean(radio) - {label "Post Check"} - {options { {Yes t} {No f}}} + {label "[_ assessment.post_check]"} + {options { {"[_ assessment.yes]" t} {"[_ assessment.no]" f}}} } {description:text(textarea) - {label "Description"} + {label "[_ assessment.action_description]"} {html {cols 40} {rows 20}} - {help_text "Description of the trigger.(ie. What action will perform?)"} + {help_text "[_ assessment.description_trigger]"} } {action_p:boolean(radio) - {label "Type"} + {label "[_ assessment.parameter_type]"} {options [as::assessment::check::get_types]} - {help_text "Type of the trigger"} + {help_text "[_ assessment.type_of_trigger]"} } {condition:text(radio) - {label "Condition"} + {label "[_ assessment.condition]"} {options $choices} {after_html $question_text} - {help_text "The condition to branch or execute the action"} + {help_text "[_ assessment.the_condition_to]"} } } -new_data { Index: openacs-4/packages/assessment/www/admin/admin-request.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/admin/admin-request.tcl 25 Jan 2005 17:12:04 -0000 1.2 +++ openacs-4/packages/assessment/www/admin/admin-request.tcl 25 Jan 2005 22:03:44 -0000 1.3 @@ -62,18 +62,19 @@ } elseif {$d_state == "t"} { set state_query "and al.failed_p='t' and al.approved_p='t'" } - +# ad_return_complaint 1 "$approved_options" +# ad_script_abort ad_form -name assessments -form { {assessment:text(select) - {label "Assessment"} + {label "[_ assessment.Assessment]"} {options $assessment_list} {html { onChange "get_assessment()"}} {value $d_assessment} } {state:text(select) {label ""} - {options $approved_options} + {options "$approved_options"} {html { onChange "get_state()"}} {value $d_state} } @@ -83,7 +84,7 @@ ad_form -name interval -form { {date:text(select) - {label "Date request since ..."} + {label "[_ assessment.date_request]"} {options $intervals} {value $d_interval} {html { onChange "get_interval()"}} @@ -108,7 +109,7 @@ } {submit:text(submit) - {label "Specific Date"} + {label "[_ assessment.specific_date]"} } } -on_submit { ad_returnredirect "admin-request?state=$state&assessment=$assessment&date=$specific_date" @@ -123,35 +124,35 @@ -multirow actions_log \ -key action_log_id\ -bulk_actions { - "Approve" "approve-check" "Approve Actions" + "\#assessment.approve\#" "approve-check" "\#assessment.approve_actions\#" }\ -bulk_action_method post \ -bulk_action_export_vars { action_log_id }\ - -row_pretty_plural "actions log" \ + -row_pretty_plural "[_ assessment.action_log]"\ -elements { inter_item_check_id { - label "Trigger" + label "[_ assessment.trigger]" display_col name } action_id { - label "Action" + label "[_ assessment.action]" display_col action_name } description { - label "Description" + label "[_ assessment.Description]" } user_name { - label "User" + label "[_ assessment.User_ID]" } date_requested { - label "Date" + label "[_ assessment.data_type_date]" } failed_p { - label "Performed" + label "[_ assessment.performed]" } Index: openacs-4/packages/assessment/www/admin/asm-action-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-admin.adp 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-admin.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -4,5 +4,5 @@

- Add new Action +#assessment.add_new_action#
Index: openacs-4/packages/assessment/www/admin/asm-action-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-admin.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-admin.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-admin.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -13,17 +13,17 @@ -name actions \ -elements { name { - label "Name" + label "[_ assessment.Name]" } description { - label "Description" + label "[_ assessment.parameter_description]" } edit_url { label {[_ assessment.action_edit]} display_template { - Edit - | Delete + [_ assessment.Edit] + | [_ assessment.Delete] } } } Index: openacs-4/packages/assessment/www/admin/asm-action-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-new.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-new.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-new.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -16,7 +16,7 @@ set parameter_exist "n" } -set page_title "Add new Action" +set page_title "[_ assessment.add_new_action]" set context_bar [ad_context_bar [list [export_vars -base asm-action-admin ] [_ assessment.action_admin]] $page_title] ad_form -name action_admin -form { Index: openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-param-admin.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -9,4 +9,4 @@   - Return +#assessment.return# Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-param-list.adp 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-param-list.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -1,2 +1,2 @@ - Add parameter +#assessment.add_parameter# Index: openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/asm-action-param-list.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -13,23 +13,23 @@ -name parameter_list \ -elements { varname { - label "Name" + label "[_ assessment.Name]" } description { - label "Description" + label "[_ assessment.action_description]" } type { - label "Type" + label "[_ assessment.parameter_type]" } query { - label "Query" + label "[_ assessment.parameter_query]" } edit_url { label {[_ assessment.action_edit]} display_template { - Edit | Delete + [_ assessment.Edit] | [_ assessment.Delete] } } Index: openacs-4/packages/assessment/www/admin/checks-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-admin.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/checks-admin.adp 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/checks-admin.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -1,17 +1,17 @@ -@title@ Administration +@title@ #assessment.Administration#
-After this Assessment: +#assessment.after_this_asm#

-Immediately +#assessment.immediately#
-Manually +#assessment.manually#
-Branches +#assessment.branches#
Index: openacs-4/packages/assessment/www/admin/checks-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/checks-admin.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/checks-admin.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/checks-admin.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -2,7 +2,7 @@ This page allows to add branches or actions to the question and its choices. - @author Anny Flore (annyflores@viaro.net) Viaro Networks (www.viaro.net) + @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) @date 2005-01-07 } { assessment_id:integer @@ -19,8 +19,8 @@ ad_script_abort } -set title "$assessment_data(title) Triggers" -set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"] +set title "$assessment_data(title) \#assessment.triggers\#" +set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title \#assessment.triggers\#"] db_multirow aa_checks get_aa_checks {} @@ -29,7 +29,7 @@ -multirow aa_checks \ -key inter_item_check_id \ -bulk_actions { - "Delete" "confirm-delete" "Delete checked items" + "\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#" }\ -bulk_action_method post \ -bulk_action_export_vars { @@ -38,16 +38,16 @@ section_id {type_check t} }\ - -row_pretty_plural "assessment triggers" \ + -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \ -elements { name { - label "Name" + label "[_ assessment.Name]" display_template { @aa_checks.name@ } } action_name { - label "Action To Perform" + label "[_ assessment.action_to_perform]" } counter { display_template { @@ -57,7 +57,7 @@ #assessment.Move_Up# - Notify user + #assessment.notify_user# } @@ -71,7 +71,7 @@ -multirow i_checks \ -key inter_item_check_id \ -bulk_actions { - "Delete" "confirm-delete" "Delete checked items" + "\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#" }\ -bulk_action_method post \ -bulk_action_export_vars { @@ -80,16 +80,16 @@ section_id {type_check t} }\ - -row_pretty_plural "assessment triggers" \ + -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \ -elements { name { - label "Name" + label "[_ assessment.Name]" display_template { @i_checks.name@ } } action_name { - label "Action To Perform" + label "[_ assessment.action_to_perform]" } inter_item_check_id { display_template { @@ -99,7 +99,7 @@ #assessment.Move_Up# - Notify user + #assessment.notify_user# } } } @@ -112,7 +112,7 @@ -multirow m_checks \ -key inter_item_check_id \ -bulk_actions { - "Delete" "confirm-delete" "Delete checked items" + "\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#" }\ -bulk_action_method post \ -bulk_action_export_vars { @@ -121,20 +121,20 @@ section_id {type_check t} }\ - -row_pretty_plural "assessment triggers" \ + -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \ -elements { name { - label "Name" + label "[_ assessment.Name]" display_template { @m_checks.name@ } } action_name { - label "Action To Perform" + label "[_ assessment.action_to_perform]" } inter_item_check_id { display_template { - Notify user + #assessment.notify_user# } } } @@ -145,7 +145,7 @@ -multirow branches \ -key inter_item_check_id \ -bulk_actions { - "Delete" "confirm-delete" "Delete checked items" + "\#assessment.Delete\#" "confirm-delete" "\#assessment.delete_checked\#" }\ -bulk_action_method post \ -bulk_action_export_vars { @@ -154,16 +154,16 @@ section_id {type_check f} }\ - -row_pretty_plural "assessment triggers" \ + -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \ -elements { name { - label "Name" + label "[_ assessment.Name]" display_template { @branches.name@ } } section_id_to { - label "Goes to section" + label "[_ assessment.goes_to_section]" display_col sname } Index: openacs-4/packages/assessment/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/index.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/admin/index.adp 10 Jan 2005 19:04:22 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/index.adp 25 Jan 2005 22:03:44 -0000 1.6 @@ -2,7 +2,10 @@ @title;noquote@ @context;noquote@ -#assessment.admin_categories# +#assessment.admin_categories# +| #assessment.admin_actions# | #assessment.admin_requests# +

Index: openacs-4/packages/assessment/www/admin/one-a.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/one-a.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/assessment/www/admin/one-a.adp 24 Jan 2005 15:09:45 -0000 1.11 +++ openacs-4/packages/assessment/www/admin/one-a.adp 25 Jan 2005 22:03:44 -0000 1.12 @@ -82,6 +82,7 @@ #assessment.Copy_this_assess# #assessment.Lets_you_use_this_a# +
@@ -106,6 +107,9 @@ #assessment.edit_section_display# +#assessment.admin_triggers# + Index: openacs-4/packages/assessment/www/admin/request-notification.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/request-notification.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/request-notification.adp 24 Jan 2005 17:52:14 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/request-notification.adp 25 Jan 2005 22:03:44 -0000 1.2 @@ -1,3 +1,4 @@ +@title@ \ No newline at end of file Index: openacs-4/packages/assessment/www/admin/request-notification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/request-notification.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/request-notification.tcl 24 Jan 2005 17:52:14 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/request-notification.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -8,6 +8,8 @@ assessment_id section_id } +set check_name [db_string get_name {}] +set title "[_ assessment.request_notif] $check_name" form create notify set type "as_inter_item_checks_notif" @@ -63,26 +65,25 @@ -key request_id\ -bulk_actions\ { - "Unsubscribe" "unsubscribe" "Unsubscribe user to this rule" + "\#assessment.unsubscribe\#" "unsubscribe" "\#assessment.unsubscribe_user\#" }\ -bulk_action_method post -bulk_action_export_vars { inter_item_check_id type_id assessment_id section_id }\ - -no_data "There are no users to notify"\ + -no_data "\#assessment.there_are_no_users\#"\ -row_pretty_plural "notify_users"\ -elements { name { - label "UserName" + label "[_ assessment.User_ID] [_ assessment.Name]" } interval_name { - label "Interval" - + label "[_ notifications.lt_Notification_Interval]" } delivery_name { - label "Delivery Method" + label "[_ notifications.Delivery_Method]" } } db_multirow notify_users notify_users { *SQL* } Index: openacs-4/packages/assessment/www/admin/request-notification.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/request-notification.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/request-notification.xql 24 Jan 2005 17:52:14 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/request-notification.xql 25 Jan 2005 22:03:44 -0000 1.2 @@ -15,5 +15,12 @@ + + + select name from as_inter_item_checks where inter_item_check_id=:inter_item_check_id + + + + Index: openacs-4/packages/assessment/www/admin/section-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-select.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/section-select.tcl 24 Jan 2005 17:53:05 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/section-select.tcl 25 Jan 2005 22:03:44 -0000 1.2 @@ -1,5 +1,4 @@ ad_page_contract { - @author Anny Flores (annyflores@viaro.net) Viaro Networks (www.viaro.net) @date 2005-01-07 @@ -24,7 +23,7 @@ set title $assessment_data(title) set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title Triggers"] -set title "Section Select" +set title "[_ assessment.section_select]" ad_form -name get_section -form { inter_item_check_id:key {assessment_id:text(hidden) @@ -33,9 +32,9 @@ {value $section_id}} {section_id_to:text(select) - {label "Choose a section to branch"} + {label "[_ assessment.section_to_branch]"} {options $sections_list} - {help_text "The section where the condition will lead you."} + {help_text "[_ assessment.lead_you]"} } } -new_data {