Index: openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql 28 Apr 2004 11:06:40 -0000 1.1 +++ openacs-4/packages/evaluation/lib/audit-chunk-postgresql.xql 10 Jun 2004 21:08:52 -0000 1.2 @@ -6,7 +6,7 @@ - select to_char(ese.last_modified, 'MM-DD-YYYY HH24:MI:SS') as last_modified, + select to_char(ese.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi, ese.modifying_user, ese.modifying_ip, ese.description as comments, Index: openacs-4/packages/evaluation/lib/audit-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/audit-chunk.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/lib/audit-chunk.tcl 28 Apr 2004 11:06:40 -0000 1.1 +++ openacs-4/packages/evaluation/lib/audit-chunk.tcl 10 Jun 2004 21:08:52 -0000 1.2 @@ -9,37 +9,40 @@ template::list::create \ -name grade_tasks \ -multirow grade_tasks \ - -key task_name \ - -pass_properties { return_url } \ + -key task_name \ + -pass_properties { return_url } \ -elements { task_grade { - label "Name" - orderby_asc {task_grade asc} - orderby_desc {task_grade desc} + label "[_ evaluation.Name_]" + orderby_asc {task_grade asc} + orderby_desc {task_grade desc} } last_modified { - label "Last Modified" - orderby_asc {last_modified asc} - orderby_desc {last_modified desc} + display_col last_modified_pretty + label "[_ evaluation.Last_Modified_]" + + orderby_asc {last_modified asc} + orderby_desc {last_modified desc} } modifying_user { - label "Modifying User" - orderby_asc {modifying_user asc} - orderby_desc {modifying_user desc} + label "[_ evaluation.Modifying_User_]" + orderby_asc {modifying_user asc} + orderby_desc {modifying_user desc} } comments { - label "Comments" - orderby_asc {comments asc} - orderby_desc {comments desc} + label "[_ evaluation.Comments_]" + orderby_asc {comments asc} + orderby_desc {comments desc} } is_live { - label "Is live?" - orderby_asc {comments asc} - orderby_desc {comments desc} + label "[_ evaluation.Is_live_]" + orderby_asc {comments asc} + orderby_desc {comments desc} } - } + } -db_multirow grade_tasks get_task_audit_info { *SQL* } { +db_multirow -extend { last_modified_pretty } grade_tasks get_task_audit_info { *SQL* } { + set last_modified_pretty [lc_time_fmt $last_modified_ansi "%q"] } Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 7 Jun 2004 16:04:53 -0000 1.3 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 10 Jun 2004 21:08:52 -0000 1.4 @@ -13,40 +13,40 @@ db_1row get_grade_info { *SQL* } set elements [list task_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ link_url_col task_url \ orderby_asc {task_name asc} \ orderby_desc {task_name desc}] \ ] if { $admin_p } { #admin lappend elements task_weight \ - [list label "Weight" \ + [list label "[_ evaluation.Weight_]" \ display_template {
@grade_tasks_admin.task_weight@%
} \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] set multirow_name grade_tasks_admin - set actions [list "Edit grades distribution of $grade_plural_name" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] + set actions [list "[_ evaluation.lt_Edit_grades_distribut]" [export_vars -base "${base_url}admin/grades/distribution-edit" { grade_id }]] } else { #student lappend elements grade \ - [list label "Grade over 100" \ + [list label "[_ evaluation.Grade_over_100_]" \ display_template {
@grade_tasks.grade@
} \ orderby_asc {grade asc} \ orderby_desc {grade desc}] lappend elements comments \ - [list label "Comments" \ + [list label "[_ evaluation.Comments_]" \ link_url_col comments_url \ link_html { title "View evaluation comments" }] lappend elements task_weight \ - [list label "Net value" \ + [list label "[_ evaluation.Net_value_]" \ display_template {
@grade_tasks.task_weight@
} \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] lappend elements answer \ [list label "" \ link_url_col answer_url \ - link_html { title "View my answer" }] + link_html { title "[_ evaluation.View_my_answer_]" }] set multirow_name grade_tasks set actions "" } @@ -82,53 +82,53 @@ db_multirow -extend { comments comments_url answer answer_url } grade_tasks get_grade_tasks { *SQL* } { if { ![empty_string_p $comments] } { - set comments "View comments" + set comments "[_ evaluation.View_comments_]" set comments_url evaluation_view } set over_weight "" if { ![empty_string_p $show_student_p] && $show_student_p } { if { ![empty_string_p $grade] } { - set grade [format %.2f $grade] - set over_weight "[format %.2f $task_grade]/" + set grade [format %.2f [lc_numeric $grade]] + set over_weight "[format %.2f [lc_numeric $task_grade]]/" set total_grade [expr $total_grade + $task_grade] } else { - set grade "Not evaluated" + set grade "[_ evaluation.Not_evaluated_]" } set max_grade [expr $task_weight + $max_grade] } else { - set grade "Not available" + set grade "[_ evaluation.Not_available_]" } - set task_weight "${over_weight}[format %.2f $task_weight]" + set task_weight "${over_weight}[format %.2f [lc_numeric $task_weight]]" # working with answer stuff (if it has a file/url attached) if { [empty_string_p $answer_data] } { set answer_url "" set answer "" } elseif { [regexp "http://" $answer_data] } { set answer_url "[export_vars -base "$answer_data" { }]" - set answer "View my answer" + set answer "[_ evaluation.View_my_answer_]" } else { # we assume it's a file - set answer_url "[export_vars -base "${base_url}view/$answer_title" { }]" - set answer "View my answer" + set answer_url "[export_vars -base "${base_url}view/$answer_title" { {revision_id $answer_id} }]" + set answer "[_ evaluation.View_my_answer_]" } if { $number_of_members > 1 && [string eq [db_string get_group_id { *SQL* }] 0] } { set answer "" set answer_url "" - set grade "No group for task" + set grade "[_ evaluation.No_group_for_task_]" } } } + if { $admin_p } { - set bottom_line "Weight used in $grade_plural_name: ${category_weight}% (of 100% of $grade_plural_name)
- $grade_plural_name represents ${grade_weight}% of the 100% of the class" + set bottom_line "[_ evaluation.lt_Weight_used_in_grade__2]" } else { - set bottom_line "Total points in this category: $total_grade / $max_grade
- This grade category represents the ${grade_weight}% of the 100% of the class" + set bottom_line "[_ evaluation.lt_Total_points_in_this__1]" } + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/lib/grades-chunk.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/lib/grades-chunk.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/tasks-chunk-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql 7 Jun 2004 16:04:53 -0000 1.3 +++ openacs-4/packages/evaluation/lib/tasks-chunk-postgresql.xql 10 Jun 2004 21:08:52 -0000 1.4 @@ -7,7 +7,10 @@ select et.task_name, et.number_of_members, et.task_id, - to_char(et.due_date,'Month DD YYYY') as pretty_due_date, et.online_p, et.late_submit_p, et.item_id, + to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, + et.online_p, + et.late_submit_p, + et.item_id, et.requires_grade_p, et.description, et.grade_id, cr.content_length, et.data as task_data, @@ -28,9 +31,14 @@ select et.task_name, et.number_of_members, et.task_id, - to_char(et.due_date,'Month DD YYYY') as pretty_due_date, et.online_p, et.late_submit_p, et.item_id, + to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, +` et.online_p, + et.late_submit_p, + et.item_id, et.due_date, - et.requires_grade_p, et.description, et.grade_id, + et.requires_grade_p, + et.description, + et.grade_id, et.title as task_title, et.data as task_data, et.task_id as revision_id, Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/lib/tasks-chunk.tcl 7 Jun 2004 16:04:53 -0000 1.3 +++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl 10 Jun 2004 21:08:52 -0000 1.4 @@ -15,48 +15,48 @@ set return_url "[ad_conn url]?[export_vars { grade_id }]" set elements [list task_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ link_url_col task_url \ orderby_asc {task_name asc} \ orderby_desc {task_name desc}] \ - pretty_due_date \ - [list label "Due date" \ - orderby_asc {pretty_due_date asc} \ - orderby_desc {pretty_due_date desc}] \ + due_date_pretty \ + [list label "[_ evaluation.Due_date_]" \ + orderby_asc {due_date_ansi asc} \ + orderby_desc {due_date_ansi desc}] \ ] if { $admin_p } { #admin lappend elements solution \ [list label "" \ link_url_col solution_url \ - link_html { title "Add/edit solution" }] + link_html { title "[_ evaluation.Addedit_solution_]" }] lappend elements audit_info \ [list label "" \ link_url_col audit_info_url \ - link_html { title "Audit info" }] + link_html { title "[_ evaluation.Audit_info_]" }] lappend elements groups_admin \ [list label "" \ link_url_col groups_admin_url \ - link_html { title "Groups administration" }] + link_html { title "[_ evaluation.lt_Groups_administration]" }] lappend elements view \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { grade_id task_id return_url mode }]} \ - link_html { title "View task" }] + link_html { title "[_ evaluation.View_task_]" }] lappend elements edit \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { return_url item_id grade_id task_id }]} \ - link_html { title "Edit task" }] + link_html { title "[_ evaluation.Edit_task_]" }] lappend elements delete \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-delete" { grade_id task_id return_url }]} \ - link_html { title "Delete task" }] + link_html { title "[_ evaluation.Delete_task_]" }] set multirow_name tasks_admin set actions [list "Add $grade_name" [export_vars -base "${base_url}admin/tasks/task-add-edit" { return_url grade_id }] ] @@ -65,13 +65,13 @@ lappend elements answer \ [list label "" \ link_url_col answer_url \ - link_html { title "Add/edit answer" }] + link_html { title "[_ evaluation.Addedit_answer_]" }] lappend elements view \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]} \ - link_html { title "View task" }] + link_html { title "[_ evaluation.View_task_]" }] set multirow_name tasks set actions "" } @@ -95,7 +95,9 @@ if { $admin_p } { - db_multirow -extend { solution_url solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url } tasks_admin get_tasks_admin { *SQL* } { + db_multirow -extend { solution_url solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url due_date_pretty } tasks_admin get_tasks_admin { *SQL* } { + set due_date_pretty [lc_time_fmt $due_date_ansi "%q"] + # working with task stuff (if it has a file/url attached) if { [empty_string_p $task_data] } { set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]" @@ -106,63 +108,64 @@ } else { # we assume it's a file set task_url "[export_vars -base "${base_url}view/$task_title" { revision_id }]" - set task_name "$task_name ([format %.0f [expr ($content_length/1024)]] Kb)" + set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)" } if { ![empty_string_p $solution_id] } { set solution_mode display set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]" - set solution "View/Edit Solution" + set solution "[_ evaluation.ViewEdit_Solution_]" } else { set solution_mode edit set solution_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]" - set solution "Upload Solution" + set solution "[_ evaluation.Upload_Solution_]" } set audit_info_url "[export_vars -base "${base_url}admin/evaluations/audit-info" { grade_id task_id }]" - set audit_info "Audit Info." + set audit_info "[_ evaluation.Audit_Info_]" if { ![string eq $number_of_members 1] } { set groups_admin_url "[export_vars -base "${base_url}admin/groups/one-task" { grade_id task_id }]" - set groups_admin "Groups Admin." + set groups_admin "[_ evaluation.Groups_Admin_]" } } } else { - db_multirow -extend { task_url solution_url solution solution_mode answer answer_url } tasks get_tasks { *SQL* } { + db_multirow -extend { task_url solution_url solution solution_mode answer answer_url due_date_pretty } tasks get_tasks { *SQL* } { set answer_mode display + set due_date_pretty [lc_time_fmt $due_date_ansi "%q"] # working with task stuff (if it has a file/url attached) if { [empty_string_p $task_data] } { set task_url "[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]" - set task_name "$task_name (No data)" + set task_name "$task_name [_ evaluation.No_data_]" } elseif { [regexp "http://" $task_data] } { set task_url "[export_vars -base "$task_data" { }]" - set task_name "$task_name (URL)" + set task_name "$task_name [_ evaluation.URL_]" } else { # we assume it's a file set task_url "[export_vars -base "${base_url}view/$task_title" { revision_id }]" - set task_name "$task_name ([format %.0f [expr ($content_length/1024)]] Kb)" + set task_name "$task_name ([format %.0f [lc_numeric [expr ($content_length/1024)]]] Kb)" } if { [string eq $online_p "t"] } { if { ([template::util::date::compare $due_date [template::util::date::now]] > 0) } { if { [empty_string_p $answer_id] } { - set answer "submit answer" + set answer "[_ evaluation.submit_answer_]" set answer_mode edit set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" } else { - set answer "submit answer again" + set answer "[_ evaluation.submit_answer_again_]" set answer_mode display set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id answer_id return_url answer_mode }]" } } elseif { [string eq $turn_in_late_p "t"] } { if { [empty_string_p $answer_id] } { - set answer "submit answer " + set answer "submit answer " set answer_mode edit set answer_url "[export_vars -base "${base_url}answer-add-edit" { grade_id task_id return_url answer_mode }]" } else { - set answer "submit answer again" + set answer "submit answer [_ evaluation.again_]" set answer_mode display set answer_url "[export_vars -base "${base_url}admin/tasks/solution-add-edit" { grade_id task_id answer_id return_url solution_mode }]" } Index: openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql 7 Jun 2004 16:05:06 -0000 1.5 +++ openacs-4/packages/evaluation/tcl/evaluation-procs-postgresql.xql 10 Jun 2004 21:08:53 -0000 1.6 @@ -443,6 +443,44 @@ + + + + select cu.person_id as party_id, cu.last_name||' - '||cu.first_names as party_name, + ese.grade, + ese.description as comments + from cc_users cu left outer join evaluation_student_evalsi ese on (ese.party_id = cu.person_id + and ese.task_id = :task_id + and content_revision__is_live(ese.evaluation_id) = true) + + + + + + + + "select etg.group_id as party_id, + g.group_name as party_name, + ese.grade, + ese.description as comments + from groups g, + evaluation_task_groups etg left outer join evaluation_student_evalsi ese on (ese.party_id = etg.group_id + and ese.task_id = :task_id + and content_revision__is_live(ese.evaluation_id) = true) + where etg.task_id = :task_id + and etg.group_id = g.group_id + + + + + + + + $sql_query + + + + Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 7 Jun 2004 16:05:06 -0000 1.6 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 10 Jun 2004 21:08:53 -0000 1.7 @@ -36,7 +36,7 @@ return [export_vars -base "${base_url}admin/evaluations/one-evaluation-edit" { task_id evaluation_id evaluation_mode }] } default { - error "Unrecognized value for notif type: $notif_type. Possible values are one_assignment_notif and one_evaluation_notif." + error "[_ evaluation.lt_Unrecognized_value_fo]" ad_script_abort } } @@ -55,25 +55,26 @@ switch $notif_type { "one_assignment_notif" { if { [string eq $edit_p 0] } { - set notif_subject "New Assignment ($grade_name)" - set notif_text "A new assignment was uploaded, if you want to see more details \n" + set notif_subject "[_ evaluation.New_Assignment_] ($grade_name)" + set notif_text "[_ evaluation.lt_A_new_assignment_was_] \n" } else { set notif_subject "Assignment Edited ($grade_name)" - set notif_text "An assignment was modified, if you want to see more details \n" + set notif_text "[_ evaluation.lt_An_assignment_was_mod] \n" } - append notif_text "click on this link: [evaluation::notification::get_url -task_id $task_id -notif_type one_assignment_notif] \n" + append notif_text "[_ evaluation.click_on_this_link_] [evaluation::notification::get_url -task_id $task_id -notif_type one_assignment_notif] \n" set response_id $task_id } "one_evaluation_notif" { db_1row get_eval_info { *SQL* } set user_name [person::name -person_id [ad_conn user_id]] - set notif_subject "Evaluation Modified" - set notif_text "$user_name has modified the grade of ${party_name}. \n The edit reason given by $user_name was: $edit_reason \n The current grade is: $current_grade \n\n Click on this link to see the evaluation details: [evaluation::notification::get_url -task_id $task_id -evaluation_id $evaluation_id -notif_type one_evaluation_notif] \n" + set notif_subject "[_ evaluation.Evaluation_Modified_]" + set url_link [evaluation::notification::get_url -task_id $task_id -evaluation_id $evaluation_id -notif_type one_evaluation_notif] + set notif_text "[_ evaluation.lt_user_name_has_modifie]" set response_id $evaluation_id } default { - error "Unrecognized value for notif type: $notif_type. Possible values are one_assignment_notif and one_evaluation_notif." + error "[_ evaluation.lt_Unrecognized_value_fo]" ad_script_abort } } @@ -529,46 +530,33 @@ set csv_content [list] lappend csv_content "Grades sheet for assighment \"$task_name\"" - lappend csv_content "\nMax Grade:" + lappend csv_content "\n[_ evaluation.Max_Grade_]" lappend csv_content "100" - lappend csv_content "\nWill the student be able to see the grade? (Yes/No):" - lappend csv_content "Yes" + lappend csv_content "\n[_ evaluation.lt_Will_the_student_be_a]" + lappend csv_content "1" - lappend csv_content "\n\nId" - lappend csv_content "Name" - lappend csv_content "Grade" - lappend csv_content "Comments/Edit reason" + lappend csv_content "\n\n[_ evaluation.Id_]" + lappend csv_content "[_ evaluation.Name_]" + lappend csv_content "[_ evaluation.Grade_]" + lappend csv_content "[_ evaluation.CommentsEdit_reason_]" if { $number_of_members == 1 } { # the task is individual - set sql_query "select cu.person_id as party_id, cu.last_name||' - '||cu.first_names as party_name, - ese.grade, - ese.description as comments - from cc_users cu left outer join evaluation_student_evalsi ese on (ese.party_id = cu.person_id - and ese.task_id = :task_id - and content_revision__is_live(ese.evaluation_id) = true)" + set sql_query [db_map sql_query_individual] } else { # the task is in groups - set sql_query "select etg.group_id as party_id, g.group_name as party_name, - ese.grade, - ese.description as comments - from groups g, - evaluation_task_groups etg left outer join evaluation_student_evalsi ese on (ese.party_id = etg.group_id - and ese.task_id = :task_id - and content_revision__is_live(ese.evaluation_id) = true) - where etg.task_id = :task_id - and etg.group_id = g.group_id" + set sql_query [db_map sql_query_groups] } - db_foreach parties_with_to_grade $sql_query { - lappend csv_content "\n$party_id" - lappend csv_content "$party_name" - lappend csv_content "$grade" - lappend csv_content "$comments" + db_foreach parties_with_to_grade { *SQL* } { + lappend csv_content "\n$party_id" + lappend csv_content "$party_name" + lappend csv_content "[format %.2f [lc_numeric $grade]]" + lappend csv_content "$comments" } if_no_rows { - ad_return_error "No parties to grade" "In order to generate this file there must be some parties assigned to this task" + ad_return_error "[_ evaluation.No_parties_to_grade_]" "[_ evaluation.lt_In_order_to_generate_]" return } @@ -633,8 +621,8 @@ return [notification::type::new \ -sc_impl_id $impl_id \ -short_name one_assignment_notif \ - -pretty_name "One Assignment" \ - -description "Notification for assignments"] + -pretty_name "[_ evaluation.One_Assignment_]" \ + -description "[_ evaluation.lt_Notification_for_assi]"] } ad_proc -private evaluation::apm::create_one_evaluation_type { @@ -646,8 +634,8 @@ return [notification::type::new \ -sc_impl_id $impl_id \ -short_name one_evaluation_notif \ - -pretty_name "One Evaluation" \ - -description "Notification for evaluations"] + -pretty_name "[_ evaluation.One_Evaluation_]" \ + -description "[_ evaluation.lt_Notification_for_eval]"] } ad_proc -public evaluation::apm::enable_intervals_and_methods { Index: openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/answer-add-edit-postgresql.xql 10 Jun 2004 21:08:53 -0000 1.2 @@ -11,6 +11,14 @@ + + + + select late_submit_p from evaluation_tasks where task_id = :task_id + + + + Index: openacs-4/packages/evaluation/www/answer-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/answer-add-edit.tcl 7 Jun 2004 16:05:06 -0000 1.4 +++ openacs-4/packages/evaluation/www/answer-add-edit.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -16,8 +16,8 @@ return_url:notnull } -validate { late_submit { - if { ([template::util::date::compare [db_string due_date "select due_date from evaluation_tasks where task_id = :task_id"] [template::util::date::now]] < 0) } { - ad_complain "tarde manin" + if { ![db_string late_turn_in { *SQL* }] && ([template::util::date::compare [db_string due_date "select due_date from evaluation_tasks where task_id = :task_id"] [template::util::date::now]] < 0) } { + ad_complain "[_ evaluation.lt_This_task_can_not_be_]" } } } @@ -28,9 +28,9 @@ set package_id [ad_conn package_id] if { [ad_form_new_p -key answer_id] } { - set page_title "Upload Answer" + set page_title "[_ evaluation.Upload_Answer_]" } else { - set page_title "Change Answer" + set page_title "[_ evaluation.Change_Answer_]" db_1row item_data { *SQL* } } @@ -46,11 +46,11 @@ ad_form -extend -name answer -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} } } @@ -64,11 +64,11 @@ } -validate { {url { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) } - {Upload a file OR a valid url, and not both } + { [_ evaluation.lt_Upload_a_file_OR_a_va] } } {upload_file { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) } - {Upload a file OR a url, and not both} + { [_ evaluation.lt_Upload_a_file_OR_a_ur] } } } -on_submit { Index: openacs-4/packages/evaluation/www/evaluation-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/evaluation-list.tcl 19 May 2004 17:33:08 -0000 1.2 +++ openacs-4/packages/evaluation/www/evaluation-list.tcl 10 Jun 2004 21:08:53 -0000 1.3 @@ -18,13 +18,13 @@ #set admin_p 0 if { $admin_p } { - set actions "Grade Distribution" + set actions "[_ evaluation.Grade_Distribution_]" } else { - set actions "Total current grade: [format %.2f [db_string total_grade { *SQL* }]] / [format %.2f [db_string max_grade { *SQL* }]]" + set actions "[_ evaluation.Total_current_grade_] [format %.2f [lc_numeric [db_string total_grade { *SQL* }]]] / [format %.2f [lc_numeric [db_string max_grade { *SQL* }]]]" } -set page_title "Evaluations List" -set context "Evaluations List" +set page_title "[_ evaluation.Evaluations_List_]" +set context "[_ evaluation.Evaluations_List_]" db_multirow grades get_grades { *SQL* } { } Index: openacs-4/packages/evaluation/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/www/index.adp 7 Jun 2004 16:05:07 -0000 1.6 +++ openacs-4/packages/evaluation/www/index.adp 10 Jun 2004 21:08:53 -0000 1.7 @@ -3,14 +3,14 @@ @context;noquote@ - Evaluations Admin + #evaluation.Evaluations_Admin# -

Assignments


+

#evaluation.Assignments#


@notification_chunk;noquote@


-

Evaluations

+

#evaluation.Evaluations#

+ Index: openacs-4/packages/evaluation/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/index.tcl 31 May 2004 17:04:57 -0000 1.4 +++ openacs-4/packages/evaluation/www/index.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -13,7 +13,7 @@ {evaluations_orderby ""} } -set page_title "Evaluation Index" +set page_title "[_ evaluation.Evaluation_Index_]" set context {} set package_id [ad_conn package_id] set user_id [ad_conn user_id] @@ -26,12 +26,12 @@ } -set total_class_grade [format %.2f [db_string get_total_grade "select evaluation__class_total_grade(:user_id,:package_id)"]] +set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade "select evaluation__class_total_grade(:user_id,:package_id)"]]] set notification_chunk [notification::display::request_widget \ -type one_assignment_notif \ -object_id $package_id \ - -pretty_name "Assignments" \ + -pretty_name "[_ evaluation.Assignments_]" \ -url [ad_conn url] \ ] Index: openacs-4/packages/evaluation/www/task-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-list.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/task-list.tcl 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/task-list.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -19,8 +19,8 @@ } -set page_title "Tasks List" -set context "Tasks List" +set page_title "[_ evaluation.Tasks_List_]" +set context "[_ evaluation.Tasks_List_]" ad_return_template Index: openacs-4/packages/evaluation/www/task-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/task-view.adp 7 Jun 2004 16:05:07 -0000 1.3 +++ openacs-4/packages/evaluation/www/task-view.adp 10 Jun 2004 21:08:53 -0000 1.4 @@ -4,50 +4,51 @@ - - - - - - - - - -
Task Name + #evaluation.Task_Name_1# @task_name@
Description + #evaluation.Description# @description;noquote@
Due Date + #evaluation.Due_Date_1# @due_date@
File/url associated + #evaluation.Fileurl_associated# @task_url@
Number of Integrants + #evaluation.Number_of_Integrants# @number_of_members@
Weight + #evaluation.Weight# @weight@%
Grades Category + #evaluation.Grades_Category# @grade_plural_name@ - @grade_weight@%
Will this task be submitted on line? + #evaluation.lt_Will_this_task_be_sub# @online_p@
Will the students be able
to submit their answers after due date?		 + #evaluation.lt_Will_the_students_be_#
#evaluation.lt_to_submit_their_answe#		 @late_submit_p@
Task Solution + #evaluation.Task_Solution# @solution_url;noquote@
-

Go Back

+

#evaluation.Go_Back#

 + Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/task-view.tcl 22 May 2004 01:20:24 -0000 1.3 +++ openacs-4/packages/evaluation/www/task-view.tcl 10 Jun 2004 21:08:53 -0000 1.4 @@ -14,30 +14,32 @@ } set package_id [ad_conn package_id] -set page_title "View Task" +set page_title "[_ evaluation.View_Task_]" db_1row get_grade_info { *SQL* } set context [list $page_title] db_1row get_task_info { *SQL* } +set weight [format %.2f [lc_numeric $weight]] + if { [string eq $online_p "1"] || [string eq $online_p "t"] } { - set online_p "Yes" + set online_p "[_ evaluation.Yes_]" } else { - set online_p "No" + set online_p "[_ evaluation.No_]" } if { [string eq $late_submit_p "1"] || [string eq $late_submit_p "t"]} { - set late_submit_p "Yes" + set late_submit_p "[_ evaluation.Yes_]" } else { - set late_submit_p "No" + set late_submit_p "[_ evaluation.No_]" } #set description [template::util::richtext::get_property contents $description] # working with task stuff (if it has a file/url attached) if { [empty_string_p $task_data] } { - set task_url "No file/url associated with this task" + set task_url "[_ evaluation.lt_No_fileurl_associated]" } elseif { [regexp "http://" $task_data] } { set task_url "$task_data" } else { @@ -47,7 +49,7 @@ # working with task soluiton stuff (if it has a file/url attached) if { [empty_string_p $solution_data] } { - set solution_url "No file/url associated with this task solution" + set solution_url "[_ evaluation.lt_No_fileurl_associated_1]" } elseif { [regexp "http://" $solution_data] } { set solution_url "$solution_data" } else { Index: openacs-4/packages/evaluation/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/index.adp 7 Jun 2004 16:05:08 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/index.adp 10 Jun 2004 21:08:53 -0000 1.6 @@ -2,19 +2,19 @@ @page_title;noquote@ @context;noquote@ -

Assignment Types

+

#evaluation.Assignment_Types#

-

Grades Reports

+

#evaluation.Grades_Reports#

-

Assignments

+

#evaluation.Assignments#

@assignments_notification_chunk;noquote@


-

Evaluations

+

#evaluation.Evaluations#

@evaluations_notification_chunk;noquote@

+ Index: openacs-4/packages/evaluation/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/index.tcl 31 May 2004 17:04:57 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/index.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -14,7 +14,7 @@ } -set page_title "Evaluation Index" +set page_title "[_ evaluation.Evaluation_Index_]" set context {} set package_id [ad_conn package_id] @@ -28,14 +28,14 @@ set assignments_notification_chunk [notification::display::request_widget \ -type one_assignment_notif \ -object_id $package_id \ - -pretty_name "Assignments" \ + -pretty_name "[_ evaluation.Assignments_]" \ -url [ad_conn url] \ ] set evaluations_notification_chunk [notification::display::request_widget \ -type one_evaluation_notif \ -object_id $package_id \ - -pretty_name "Evaluations" \ + -pretty_name "[_ evaluation.Evaluations_]" \ -url [ad_conn url] \ ] Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp 10 Jun 2004 21:08:53 -0000 1.2 @@ -2,15 +2,19 @@ @page_title;noquote@ @context;noquote@ -

Audit info for task "@task_name@"

+

#evaluation.lt_Audit_info_for_task_t#

+
  • @parties.party_name@
+ +There is no audit info for this task because there are no students evaluated. + Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -13,12 +13,11 @@ } db_1row get_task_info { *SQL* } -set page_title "Audit info for task" -set context [list "Audit Info"] +set page_title "[_ evaluation.Audit_info_for_task_]" +set context [list "[_ evaluation.Audit_Info__1]"] db_multirow parties get_parties { *SQL* } { - - + } ad_return_template Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 22 May 2004 01:20:25 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -39,12 +39,13 @@ if { [info exists grades_gs($party_id)] && ![empty_string_p $grades_gs($party_id)] } { incr counter if { ![ad_var_type_check_number_p $grades_gs($party_id)] } { - ad_complain "The grade most be a valid number ($grades_gs($party_id))" + set wrong_grade $grades_gs($party_id) + ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" } } } if { !$counter && ([array size show_student_gs] > 0) } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_grades_wa { @@ -53,12 +54,13 @@ if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { incr counter if { ![ad_var_type_check_number_p $grades_wa($party_id)] } { - ad_complain "The grade most be a valid number ($grades_wa($party_id))" + set wrong_grade $grades_wa($party_id) + ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" } } } if { !$counter && ([array size show_student_wa] > 0) } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_grades_na { @@ -67,12 +69,13 @@ if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)]} { incr counter if { ![ad_var_type_check_number_p $grades_na($party_id)] } { - ad_complain "The grade most be a valid number ($grades_na($party_id))" + set wrong_grade $grades_na($party_id) + ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" } } } if { !$counter && ([array size show_student_na] > 0) } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_grades { @@ -81,45 +84,54 @@ if { [info exists grades_to_edit($party_id)] && ![empty_string_p $grades_to_edit($party_id)] } { incr counter if { ![ad_var_type_check_number_p $grades_to_edit($party_id)] } { - ad_complain "The grade most be a valid number ($grades_to_edit($party_id))" + set wrong_grade $grades_to_edit($party_id) + ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" } } } if { !$counter && ([array size show_student_to_edit] > 0) } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_data { foreach party_id [array names comments_gs] { if { [info exists comments_gs($party_id)] && ![info exists grades_gs($party_id)] } { - ad_complain "There is a comment for a grade not realized ($comments_gs($party_id))" + set wrong_comments $comments_gs($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_fo]" } if { [info exists comments_gs($party_id)] && ([string length $comments_gs($party_id)] > 400) } { - ad_complain "There is a comment larger than we can handle. ($comments_gs($party_id))" + set wrong_comments $comments_gs($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_la]" } } foreach party_id [array names comments_wa] { if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } { - ad_complain "There is a comment for a grade not realized ($comments_wa($party_id))" + set wrong_comments $comments_wa($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_fo]" } if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } { - ad_complain "There is a comment larger than we can handle. ($comments_wa($party_id))" + set wrong_comments $comments_wa($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_la]" } } foreach party_id [array names comments_na] { if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } { - ad_complain "There is a comment for a grade not realized ($comments_na($party_id))" + set wrong_comments $comments_na($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_fo]" } if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } { - ad_complain "There is a comment larger than we can handle. ($comments_na($party_id))" + set wrong_comments $comments_na($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_la]" } } foreach party_id [array names reasons_to_edit] { if { [info exists reasons_to_edit($party_id)] && ![info exists grades_to_edit($party_id)] } { - ad_complain "There is an edit reason for a grade not realized ($reasons_to_edit($party_id))" + set wrong_comments $reasons_to_edit($party_id) + ad_complain "[_ evaluation.lt_There_is_an_edit_reas]" } if { [info exists reasons_to_edit($party_id)] && ([string length $reasons_to_edit($party_id)] > 400) } { - ad_complain "There is an edit reason larger than we can handle. ($reasons_to_edit($party_id))" + set wrong_comments $reasons_to_edit($party_id) + ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]" } } } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 13 May 2004 16:29:40 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 10 Jun 2004 21:08:53 -0000 1.3 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ -

Confirm your evaluation(s) on "@task_name@"

+

#evaluation.lt_Confirm_your_evaluati#

@@ -13,10 +13,10 @@
- - - - + + + +
Name:@evaluations_wa.party_name@
Grade:@evaluations_wa.grade@ / @max_grade@
Comments:@evaluations_wa.comment@
Will the studen(s) be
able to see the grade?		@evaluations_wa.show_student@
#evaluation.Name#@evaluations_wa.party_name@
#evaluation.Grade#@evaluations_wa.grade@ / @max_grade@
#evaluation.Comments#@evaluations_wa.comment@
#evaluation.Will_the_studens_be#
#evaluation.lt_able_to_see_the_grade#		@evaluations_wa.show_student@
@@ -35,10 +35,10 @@
- - - - + + + +
Name:@evaluations_na.party_name@
Grade:@evaluations_na.grade@ / @max_grade@
Comments:@evaluations_na.comment@
Will the studen(s) be
able to see the grade?		@evaluations_na.show_student@
#evaluation.Name#@evaluations_na.party_name@
#evaluation.Grade#@evaluations_na.grade@ / @max_grade@
#evaluation.Comments#@evaluations_na.comment@
#evaluation.Will_the_studens_be#
#evaluation.lt_able_to_see_the_grade#		@evaluations_na.show_student@
@@ -57,10 +57,10 @@
- - - - + + + +
Name:@evaluations.party_name@
Grade:@evaluations.grade@ / @max_grade@
Edit Reason:@evaluations.reason@
Will the studen(s) be
able to see the grade?		@evaluations.show_student@
#evaluation.Name#@evaluations.party_name@
#evaluation.Grade#@evaluations.grade@ / @max_grade@
#evaluation.Edit_Reason#@evaluations.reason@
#evaluation.Will_the_studens_be#
#evaluation.lt_able_to_see_the_grade#		@evaluations.show_student@
@@ -73,3 +73,4 @@

+ Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 12 May 2004 02:07:45 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 10 Jun 2004 21:08:53 -0000 1.3 @@ -1,10 +1,11 @@ # /packages/evaluation/www/admin/evaluations/evaluate-students.tcl ad_page_contract { - This page asks for an evaluation confirmation - - @author jopez@galileo.edu - @creation-date Mar 2004 + This page asks for an evaluation confirmation + + @author jopez@galileo.edu + @creation-date Mar 2004 + @cvs-id $Id$ } { task_id:integer,notnull max_grade:integer,notnull @@ -32,12 +33,13 @@ if { [info exists grades_wa($party_id)] && ![empty_string_p $grades_wa($party_id)] } { incr counter if { ![ad_var_type_check_number_p $grades_wa($party_id)] } { - ad_complain "The grade must be a valid number ($grades_wa($party_id))" + set wrong_grade $grades_wa($party_id) + ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]" } } } if { !$counter && ([array size show_student_wa] > 0)} { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_grades_na { @@ -47,29 +49,32 @@ if { [info exists grades_na($party_id)] && ![empty_string_p $grades_na($party_id)] } { incr counter if { ![ad_var_type_check_number_p $grades_na($party_id)] } { - ad_complain "The grade must be a valid number ($grades_na($party_id))" + set wrong_grade $grades_na($party_id) + ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]" } } } else { set grades_na($party_id) 0 } } if { !$counter && ([array size show_student_na] > 0) && [empty_string_p $grade_all] } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_grades { set counter 0 foreach party_id [array names grades] { if { [info exists grades($party_id)] && ![empty_string_p $grades($party_id)] } { if { ![ad_var_type_check_number_p $grades($party_id)] } { - ad_complain "The grade most be a valid number ($grades($party_id))" + set wrong_grade $grades($party_id) + ad_complain "[_ evaluation.lt_The_grade_most_be_a_v]" } else { - set old_grade [format %.2f [db_string get_old_grade { *SQL* }]] - if { ![string eq $old_grade [format %.2f $grades($party_id)]] } { + set old_grade [format %.2f [lc_numeric [db_string get_old_grade { *SQL* }]]] + if { ![string eq $old_grade [format %.2f [lc_numeric $grades($party_id)]]] } { incr counter if { ![info exists reasons($party_id)] || [empty_string_p $reasons($party_id)] } { - ad_complain "You must give an edit reason ($old_grade --> $grades($party_id))" + set grade_wo_reason $grades$party_id) + ad_complain "[_ evaluation.lt_You_must_give_an_edit]" } set grades_to_edit($party_id) $grades($party_id) set reasons_to_edit($party_id) $reasons($party_id) @@ -79,39 +84,45 @@ } } if { !$counter && ([array size show_student] > 0) } { - ad_complain "There must be at least one grade to work with" + ad_complain "[_ evaluation.lt_There_must_be_at_leas]" } } valid_data { foreach party_id [array names comments_wa] { if { [info exists comments_wa($party_id)] && ![info exists grades_wa($party_id)] } { - ad_complain "There is a comment for a grade not realized ($comments_wa($party_id))" + set wrong_comments $comments_wa($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_fo]" } if { [info exists comments_wa($party_id)] && ([string length $comments_wa($party_id)] > 400) } { - ad_complain "There is a comment larger than we can handle. ($comments_wa($party_id))" + set wrong_comments $comments_wa($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_la_1]" } } foreach party_id [array names comments_na] { if { [info exists comments_na($party_id)] && ![info exists grades_na($party_id)] } { - ad_complain "There is a comment for a grade not realized ($comments_na($party_id))" + set wrong_comments $comments_na($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_fo]" } if { [info exists comments_na($party_id)] && ([string length $comments_na($party_id)] > 400) } { - ad_complain "There is a comment larger than we can handle. ($comments_na($party_id))" + set wrong_comments $comments_na($party_id) + ad_complain "[_ evaluation.lt_There_is_a_comment_la]" } } foreach party_id [array names reasons] { if { [info exists reasons($party_id)] && ![info exists grades($party_id)] } { - ad_complain "There is an edit reason for a grade not realized ($reasons($party_id))" + set wrong_comments $reasons($party_id) + ad_complain "[_ evaluation.lt_There_is_an_edit_reas]" } if { [info exists reasons($party_id)] && ([string length $reasons($party_id)] > 400) } { - ad_complain "There is an edit reason larger than we can handle. ($reasons($party_id))" + set wrong_comments $reasons($party_id) + ad_complain "[_ evaluation.lt_There_is_an_edit_reas_1]" } } } } -set page_title "Confirm Your Evaluation" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Confirm Evaluation"] +set page_title "[_ evaluation.lt_Confirm_Your_Evaluati]" +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Confirm_Evaluation_]"] db_1row get_task_info { *SQL* } @@ -128,9 +139,9 @@ set evaluations_wa:${counter}(grade) $grades_wa($party_id) set evaluations_wa:${counter}(comment) $comments_wa($party_id) if { [string eq $show_student_wa($party_id) "t"] } { - set evaluations_wa:${counter}(show_student) Yes + set evaluations_wa:${counter}(show_student) "[_ evaluation.Yes_]" } else { - set evaluations_wa:${counter}(show_student) No + set evaluations_wa:${counter}(show_student) "[_ evaluation.No_]" } set item_ids($party_id) [db_nextval acs_object_id_seq] } @@ -151,9 +162,9 @@ set evaluations_na:${counter}(grade) $grades_na($party_id) set evaluations_na:${counter}(comment) $comments_na($party_id) if { [string eq $show_student_na($party_id) "t"] } { - set evaluations_na:${counter}(show_student) Yes + set evaluations_na:${counter}(show_student) "[_ evaluation.Yes_]" } else { - set evaluations_na:${counter}(show_student) No + set evaluations_na:${counter}(show_student) "[_ evaluation.No_]" } set item_ids($party_id) [db_nextval acs_object_id_seq] } @@ -174,9 +185,9 @@ set evaluations:${counter}(grade) $grades_to_edit($party_id) set evaluations:${counter}(reason) $reasons_to_edit($party_id) if { [string eq $show_student_to_edit($party_id) "t"] } { - set evaluations:${counter}(show_student) Yes + set evaluations:${counter}(show_student) "[_ evaluation.Yes_]" } else { - set evaluations:${counter}(show_student) No + set evaluations:${counter}(show_student) "[_ evaluation.No_]" } } } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -12,13 +12,13 @@ operation } -if { [string eq $operation "Yes, I really want to remove this evaluation"] } { +if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to_]"] } { db_transaction { db_exec_plsql delete_evaluation { *SQL* } } on_error { - ad_return_error "Error deleting the evaluation" "We got the following error while trying to remove the evaluation: 
$errmsg
" + ad_return_error "[_ evaluation.lt_Error_deleting_the_ev]" "[_ evaluation.lt_We_got_the_following_]" ad_script_abort } } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp 10 Jun 2004 21:08:53 -0000 1.2 @@ -2,12 +2,15 @@ @context;noquote@ @page_title@ -Are you sure you want to remove the evaluaiton on "@party_name@"? +#evaluation.lt_Are_you_sure_remove#

- +
-

\ No newline at end of file +

+ + +[_ evaluation.lt_No_I_want_to_cancel_m] Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -13,9 +13,9 @@ task_id:integer,notnull } -set page_title "Delete Evaluation" +set page_title "[_ evaluation.Delete_Evaluation_]" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Delete Evaluation"] +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Delete_Evaluation_]"] db_1row get_evaluation_info { *SQL* } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql 28 Apr 2004 11:06:41 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit-postgresql.xql 10 Jun 2004 21:08:53 -0000 1.2 @@ -13,16 +13,16 @@ ese.grade, ese.item_id, ese.show_student_p, - to_char(ea.last_modified, 'MM-DD-YYYY HH24:MI:SS') as pretty_submission_date, + to_char(ea.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi, ea.last_modified as submission_date, ese.last_modified as evaluation_date, et.online_p, et.due_date, ese.evaluation_id from evaluation_tasks et, evaluation_student_evalsi ese left outer join evaluation_answersi ea on (ea.party_id = ese.party_id - and ea.task_id = ese.task_id - and content_revision__is_live(ea.answer_id) = true) + and ea.task_id = ese.task_id + and content_revision__is_live(ea.answer_id) = true) where et.task_id = :task_id and et.task_id = ese.task_id and content_revision__is_live(ese.evaluation_id) = true Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp 13 May 2004 16:29:40 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp 10 Jun 2004 21:08:53 -0000 1.4 @@ -15,19 +15,19 @@ - + - - - + + +
Grade students using generated file:#evaluation.lt_Grade_students_using_file#
Generate fileSee grades sheets associated with this taskHow does this work?#evaluation.Generate_file##evaluation.lt_See_grades_sheets_ass##evaluation.How_does_this_work#
-

There are no grades to edit +

#evaluation.lt_There_are_no_edit# -

\ No newline at end of file +

Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 31 May 2004 17:04:58 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -11,39 +11,39 @@ {return_url "student-list?[export_vars -url { task_id }]"} } -set page_title "Edit Evaluations" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Edit Evaluations"] +set page_title "[_ evaluation.Edit_Evaluations_]" +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Edit_Evaluations_]"] set elements [list party_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ orderby_asc {party_name asc} \ orderby_desc {party_name desc}] \ answer \ - [list label "Answer" \ + [list label "[_ evaluation.Answer_]" \ link_url_col answer_url \ link_html { title "View answer" }] \ - pretty_submission_date \ - [list label "Submission Date" \ + submission_date_pretty \ + [list label "[_ evaluation.Submission_Date_]" \ orderby_asc {submission_date asc} \ orderby_desc {submission_date desc}] \ grade \ - [list label "Maximun Grade: " \ + [list label "[_ evaluation.Maximun_Grade_] " \ display_template { } ] \ edit_reason \ - [list label "Edit Reason" \ + [list label "[_ evaluation.Edit_Reason_]" \ display_template { } \ ] \ show_student_p \ - [list label "Allow the students
to see the grade?" \ + [list label "[_ evaluation.lt_Allow_the_students_br]" \ display_template { Yes No } \ ] \ ] template::list::create \ -name evaluated_students \ -multirow evaluated_students \ - -key task_id \ - -filters { task_id {} } \ + -key task_id \ + -filters { task_id {} } \ -elements $elements set orderby [template::list::orderby_clause -orderby -name evaluated_students] @@ -52,25 +52,26 @@ set orderby " order by party_name asc" } -db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked } evaluated_students get_evaluated_students { *SQL* } { - - set grade [format %.2f $grade] +db_multirow -extend { answer answer_url radio_yes_checked radio_no_checked submission_date_pretty } evaluated_students get_evaluated_students { *SQL* } { + + set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q"] + set grade [format %.2f [lc_numeric [$grade]] if { [string eq $online_p "t"] } { # working with answer stuff (if it has a file/url attached) if { [empty_string_p $answer_data] } { - set answer "No response" + set answer "[_ evaluation.No_response_]" } elseif { [regexp "http://" $answer_data] } { set answer_url "[export_vars -base "$answer_data" { }]" - set answer "View answer" + set answer "[_ evaluation.View_answer_]" } else { # we assume it's a file set answer_url "[export_vars -base "[ad_conn package_url]view/$answer_title" { }]" } - if { ![string eq $answer "No response"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } { - append answer_url " (NEW answer)" + if { ![string eq $answer "[_ evaluation.No_response_]"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } { + append answer_url " [_ evaluation.NEW_answer_]" } if { [template::util::date::compare $submission_date $due_date] > 0 } { - set pretty_submission_date "$pretty_submission_date (late)" + set pretty_submission_date "$pretty_submission_date [_ evaluation.late__1]" } } Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp 10 Jun 2004 21:08:53 -0000 1.2 @@ -4,38 +4,38 @@

- This funcionallity allows you to upload a CSV (Comma Separated Value) file with the grades of the students. This CSV file can be edited with MS Excell and many other text editors.
+ #evaluation.lt_This_funcionallity_al#
- The file should have a pre-defined format so the system can parse it and obtain the information. If you want to use this functionallity you must follow the following steps:
+ #evaluation.lt_The_file_should_have_#

  1. - Generate the csv file from the system. This file has the proper structure so the system can parse it and obtain the information about the grades. This file is generated by clicking on the "Generate File" link. + #evaluation.lt_Generate_the_csv_file#
  2. - Enter the grades for the students/groups and KEEP THE STRUCTURE of the file. If you are editing a grade, you MUST give an edit reason in the "Comments/Edit reason" field. + #evaluation.lt_Enter_the_grades_for_#
    • - The grade must be a REAL NUMBER. + #evaluation.lt_The_grade_must_be_a_R#
    • - The comments/edit reason is a string with no more than 4,000 characters. + #evaluation.lt_The_commentsedit_reas#
    • - Do NOT change the "party id" field because with this file we associate the grade with the student or group. + #evaluation.lt_Do_NOT_change_the_par#
    - If you do not want to grade or edit the grade of a student/group, just leave intact the fields of that row, or you can delete the whole row.
    - The system assumes that the grades start at the 7th line of the file. + #evaluation.lt_If_you_do_not_want_to#
    + #evaluation.lt_The_system_assumes_th#
  3. - Save the csv file and KEEP THE CSV FORMAT. The CSV file can be edited with any text editor (and MS Excell) but you have to save it keeping the CSV format. If you do not keep the format, the system will not be able to parse the file. + #evaluation.lt_Save_the_csv_file_and#
  4. - Send the file using the "Send file" botton. The system will parse the file and you will be asked for a confirmation (if everything is ok with the file) for the grades. + #evaluation.lt_Send_the_file_using_t#
-You can see the csv files associated with the task by clicking on the "See grades sheets associated with this task" botton. +#evaluation.lt_You_can_see_the_csv_f# -

\ No newline at end of file +

Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -10,7 +10,7 @@ task_id:integer,notnull } -set page_title "Grades Sheet Explanation" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Grades Sheet Explanation"] +set page_title "[_ evaluation.lt_Grades_Sheet_Explanat]" +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.lt_Grades_Sheet_Explanat]"] ad_return_template Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 10 Jun 2004 21:08:53 -0000 1.2 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ -

Confirm your evaluation(s) on "@task_name@"

+

#evaluation.lt_Confirm_your_evaluati#

@@ -11,10 +11,10 @@
- - - - + + + +
Name:@evaluations_gs.party_name@
Grade:@evaluations_gs.grade@ / @max_grade@
Comments/Edit reason:@evaluations_gs.comment@
Will the studen(s) be
able to see the grade?		@evaluations_gs.show_student@
#evaluation.Name#@evaluations_gs.party_name@
#evaluation.Grade#@evaluations_gs.grade@ / @max_grade@
#evaluation.CommentsEdit_reason#@evaluations_gs.comment@
#evaluation.Will_the_studens_be#
#evaluation.lt_able_to_see_the_grade#		@evaluations_gs.show_student@
@@ -23,5 +23,5 @@
-There are no grades in the csv file or there are no modifications in the csv file. - \ No newline at end of file +#evaluation.lt_There_is_no_info_# + Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 22 May 2004 01:20:25 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 10 Jun 2004 21:08:53 -0000 1.4 @@ -1,32 +1,28 @@ # /packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl ad_page_contract { - - Parse the csv file with the grades or the parties for a given task - - @author jopez@galileo.edu - @creation_date May 2004 + + Parse the csv file with the grades or the parties for a given task + + @author jopez@galileo.edu + @creation_date May 2004 @cvs_id $Id$ } { upload_file:notnull - upload_file.tmpfile:notnull + upload_file.tmpfile:notnull task_id:integer,notnull grades_sheet_item_id:integer,notnull } -validate { - csv_type_p { - if { [string compare [string tolower [file extension $upload_file]] ".csv"] } { - ad_complain "The file extension of the file is "[file extension $upload_file]" and it should be .CSV, we can't process it" - } - } -} + csv_type_p { + set file_extension [file extension $upload_file] + if { [string compare [string tolower $file_extension] ".csv"] } { + ad_complain "[_ evaluation.lt_The_file_extension_of]" +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Confirm_Evaluation_]"] -set page_title "Confirm Evaluation" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Confirm Evaluation"] - # Getting some info from the db about the task if ![db_0or1row get_task_info { *SQL* }] { # This should never happen. - ad_return_complaint 1 "
  • There is no information about this task.
    • " + ad_return_complaint 1 "
  • [_ evaluation.lt_There_is_no_informati]
    • " return } @@ -35,41 +31,13 @@ # Double-click protection if { ![db_string file_exists { *SQL* }] } { - set max_n_bytes [parameter::get -parameter MaxNumberOfBytes] - - set tmp_filename [ns_queryget upload_file.tmpfile] - + set max_n_bytes [parameter::get -parameter MaxNumberOfBytes] + + set tmp_filename [ns_queryget upload_file.tmpfile] + if { ![empty_string_p $max_n_bytes] && ([file size "$tmp_filename"] > $max_n_bytes) } { - ad_return_complaint 1 "The file is too large. (The maximun file size is [util_commify_number $max_n_bytes] bytes)" - return 0 - } - - set errors 0 - set errors_text "" - set counter 0 - set line_number 0 - - set file_handler [open $tmp_filename {RDWR}] - - while { ![eof $file_handler] } { - incr line_number - set one_line [gets $file_handler] - - # jump first two lines - if { $line_number <= 2 } { - continue - } - - # replace enters (<-|) with semicolons (;) - regsub -all {(,[\r\n])} $one_line "" clean_line - regsub -all {[\r\n]} $clean_line "" clean_line - - set evaluation [split $clean_line ","] - - if { $line_number == 3 } { - set max_grade [string trim [lindex $evaluation 1]] - if { ![ad_var_type_check_number_p $max_grade] } { - ad_return_error "Invalid Max Grade" "Max Grade does not seem to be a real number. Please don't leave it blank." + set pretty_maxnbytes [lc_numeric $max_n_bytes] + ad_return_complaint 1 "[_ evaluation.lt_The_file_is_too_large]" "[_ evaluation.lt_Max_Grade_does_not_se]" return } continue @@ -78,10 +46,10 @@ # removing the first and last " that comes from the csv format regsub ^\" $see_comments_p "" see_comments_p regsub \"\$ $see_comments_p "" see_comments_p - if { ![string eq $see_comments_p yes] && ![string eq $see_comments_p no] } { - ad_return_error "Bad input" "Input \"Will the student be able to see the grade\" must be YES or NO, please don't leave it blank." + if { ![string eq $see_comments_p 1] && ![string eq $see_comments_p 0] } { + ad_return_error "[_ evaluation.Bad_input_]" "[_ evaluation.lt_Input_Will_the_studen]" return - } elseif { [string eq $see_comments_p \"yes\"] } { + } elseif { [string eq $see_comments_p 1] } { set comments_p "t" } else { set comments_p "f" @@ -109,23 +77,23 @@ # start validations if { ![ad_var_type_check_integer_p $party_id] } { incr errors - append errors_text "
  • Party_id $party_id does not seems to be an integer. Please don't modify this field.
    • " + append errors_text "
  • [_ evaluation.lt_Party_id_party_id_doe]
    • " } if { ![ad_var_type_check_number_p $grade] } { incr errors - append errors_text "
  • Grade $grade does not seem to be a real number.
    • " + append errors_text "
  • [_ evaluation.lt_Grade_grade_does_not_]
    • " } if { [string length $comments] > 4000 } { incr errors - append errors_text "
  • Comment/edit reason on party_id $party_id is larger than 4,000 characters long, which is our max lenght. Please make this comment/edit reason shorter.
    • " + append errors_text "
  • [_ evaluation.lt_Commentedit_reason_on]
    • " } # editing without reason if { ![string eq [format %.2f [db_string check_evaluated { *SQL* } -default $grade]] [format %.2f $grade]] && [empty_string_p $comments] } { incr errors - append errors_text "
  • (ahora $grade, antes [db_string check_evaluated { *SQL* } -default $grade] There must be an edit reason if you want to edit the grade on party_id ${party_id}.
    • " + append errors_text "
  • [_ evaluation.lt_There_must_be_an_edit]
    • " } if { $errors } { @@ -158,9 +126,9 @@ set evaluations_gs:${counter}(grade) $grade set evaluations_gs:${counter}(comment) $comments if { [string eq $comments_p "t"] } { - set evaluations_gs:${counter}(show_student) Yes + set evaluations_gs:${counter}(show_student) "[_ evaluation.Yes_]" } else { - set evaluations_gs:${counter}(show_student) No + set evaluations_gs:${counter}(show_student) "[_ evaluation.No_]" } set evaluation_id [db_string editing_p { *SQL* } -default 0] @@ -182,8 +150,7 @@ close $file_handler if [catch {exec mv $tmp_filename "${tmp_filename}_grades_sheet"} errmsg] { - ad_return_error "Error while storing file" "There was a problem storing the file. Please contact the administrator. -

    This was the error: 

    $errmsg
    " + ad_return_error "[_ evaluation.lt_Error_while_storing_f]" "[_ evaluation.lt_There_was_a_problem_s]" ad_script_abort } } Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets-postgresql.xql 10 Jun 2004 21:08:53 -0000 1.2 @@ -15,7 +15,7 @@ select egs.title as grades_sheet_name, - to_char(egs.creation_date,'Month DD YYYY') as upload_date, + to_char(egs.creation_date, 'YYYY-MM-DD HH24:MI:SS') as upload_date_ansi, person__name(egs.creation_user) as upload_user, egs.data as sheet_data, egs.revision_id Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp 10 Jun 2004 21:08:53 -0000 1.2 @@ -2,8 +2,9 @@ @page_title;noquote@ @context;noquote@ -

    These are the grades sheets used to evaluate students for this task

    +

    #evaluation.lt_These_are_the_grades_#

    + Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 12 May 2004 02:07:45 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 10 Jun 2004 21:08:53 -0000 1.2 @@ -14,36 +14,36 @@ } -validate { grades_sheets { if { ![db_string count_grades_sheets { *SQL* }] } { - ad_complain "There are no files associated with this task" + ad_complain "[_ evaluation.lt_There_are_no_files_as]" } } } -set page_title "Grades Sheets" -set context [list [list "[export_vars -base student-list { task_id }]" "Studen List"] "Grades Sheets"] +set page_title "[_ evaluation.Grades_Sheets_]" +set context [list [list "[export_vars -base student-list { task_id }]" "[_ evaluation.Studen_List_]"] "[_ evaluation.Grades_Sheets_]"] set base_url [ad_conn package_url] template::list::create \ -name grades_sheets \ -multirow grades_sheets \ - -key grades_sheet_id \ - -filters { task_id {} } \ - -orderby { default_value grades_sheet_name } \ + -key grades_sheet_id \ + -filters { task_id {} } \ + -orderby { default_value grades_sheet_name } \ -elements { grades_sheet_name { - label "Grades Sheet Name" + label "[_ evaluation.Grades_Sheet_Name_]" orderby_asc {grades_sheet_name asc} orderby_desc {grades_sheet_name desc} } - upload_date { - label "Upload Date" + upload_date_pretty { + label "[_ evaluation.Upload_Date_]" orderby_asc {upload_date asc} orderby_desc {upload_date desc} } upload_user { - label "Uploaded by" + label "[_ evaluation.Uploaded_by_]" orderby_asc {upload_user asc} orderby_desc {upload_user desc} } @@ -54,7 +54,7 @@ } link_url_col view_url - link_html { title "View grades sheet" } + link_html { title "[_ evaluation.View_grades_sheet_]" } } } @@ -64,8 +64,9 @@ set orderby " order by grades_sheet_name asc" } -db_multirow -extend { view_url } grades_sheets get_grades_sheets { *SQL* } { - set view_url "[export_vars -base "${base_url}view/$grades_sheet_name" { revision_id }]" +db_multirow -extend { view_url upload_date_pretty } grades_sheets get_grades_sheets { *SQL* } { + set view_url "[export_vars -base "${base_url}view/$grades_sheet_name" { revision_id }]" + set upload_date_pretty [lc_time_fmt $upload_date_ansi "%q"] } ad_return_template Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 19 May 2004 17:33:09 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 10 Jun 2004 21:08:53 -0000 1.3 @@ -14,14 +14,14 @@ set return_url "student-list?[export_vars -url { task_id }]" -set page_title "View/Edit Evaluation" +set page_title "[_ evaluation.ViewEdit_Evaluation_]" -set context [list [list [export_vars -base student-list { task_id }] "Students List"] $page_title] +set context [list [list [export_vars -base student-list { task_id }] "[_ evaluation.Students_List_]"] $page_title] if { [ad_form_new_p -key evaluation_id] || [string eq $evaluation_mode "display"] } { - set comment_label "Comments" + set comment_label "[_ evaluation.Comments_]" } else { - set comment_label "Edit Reason" + set comment_label "[_ evaluation.Edit_Reason_]" } db_1row get_evaluation_info { *SQL* } @@ -31,13 +31,13 @@ evaluation_id:key {party_name:text - {label "Name"} + {label "[_ evaluation.Name_]"} {html {size 30}} {mode display} } {grade:text - {label "Grade"} + {label "[_ evaluation.Grade_]"} {html {size 5}} } @@ -47,43 +47,43 @@ } {show_student_p:text(radio) - {label "Will the student be able to see the grade?"} - {options {{Yes t} {No f}}} + {label "[_ evaluation.lt_Will_the_student_be_a_1]"} + {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} } } -edit_request { db_1row evaluation_info { *SQL* } - set grade [format %.2f $grade] + set grade [format %.2f [lc_numeric $grade]] } -validate { {grade { [ad_var_type_check_number_p $grade] } - { The grade must be a valid number } + { [_ evaluation.lt_The_grade_must_be_a_v_1] } } {comments { [string length $comments] < 4000 } - { The edit reason must be less than 4000 characteras long } + { [_ evaluation.lt_The_edit_reason_must_] } } } -on_submit { - db_transaction { - - set revision_id [evaluation::new_evaluation -new_item_p 0 -item_id $item_id -content_type evaluation_student_evals \ - -content_table evaluation_student_evals -content_id evaluation_id -description $comments \ - -show_student_p $show_student_p -grade $grade -task_id $task_id -party_id $party_id] - - evaluation::set_live -revision_id $revision_id - - } - - # send the notification to everyone suscribed - evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif - - ad_returnredirect "$return_url" - ad_script_abort + db_transaction { + + set revision_id [evaluation::new_evaluation -new_item_p 0 -item_id $item_id -content_type evaluation_student_evals \ + -content_table evaluation_student_evals -content_id evaluation_id -description $comments \ + -show_student_p $show_student_p -grade $grade -task_id $task_id -party_id $party_id] + + evaluation::set_live -revision_id $revision_id + + } + + # send the notification to everyone suscribed + evaluation::notification::do_notification -task_id $task_id -evaluation_id $revision_id -package_id [ad_conn package_id] -notif_type one_evaluation_notif + + ad_returnredirect "$return_url" + ad_script_abort } - + ad_return_template Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql 22 May 2004 01:20:25 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list-postgresql.xql 10 Jun 2004 21:08:53 -0000 1.3 @@ -12,16 +12,16 @@ ea.revision_id, ese.party_id, ese.grade, - to_char(ea.last_modified, 'MM-DD-YYYY HH24:MI:SS') as pretty_submission_date, + to_char(ea.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi, ea.last_modified as submission_date, ese.last_modified as evaluation_date, et.online_p, et.due_date, ese.evaluation_id from evaluation_tasks et, evaluation_student_evalsi ese left outer join evaluation_answersi ea on (ea.party_id = ese.party_id - and ea.task_id = ese.task_id - and content_revision__is_live(ea.answer_id) = true) + and ea.task_id = ese.task_id + and content_revision__is_live(ea.answer_id) = true) where et.task_id = :task_id and et.task_id = ese.task_id and content_revision__is_live(ese.evaluation_id) = true @@ -64,7 +64,7 @@ ea.data as answer_data, ea.title as answer_title, ea.revision_id, - to_char(ea.last_modified, 'MM-DD-YYYY HH24:MI:SS') as pretty_submission_date, + to_char(ea.last_modified, 'YYYY-MM-DD HH24:MI:SS') as submission_date_ansi, et.due_date, ea.last_modified as submission_date from evaluation_answersi ea, Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 7 Jun 2004 16:05:09 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 10 Jun 2004 21:08:53 -0000 1.4 @@ -4,32 +4,45 @@ - + - - + + + + + +
    Task Name:#evaluation.Task_Name# @task_name@
    Due Date:@due_date@#evaluation.Due_Date#@due_date_pretty@
    Is the task submitted online? + + +

    Yes

    +     +

    No

    +     + +
    @groups_admin;noquote@
    -

    Evaluated Students (@total_evaluated@)

    +

    #evaluation.lt_Evaluated_Students_to#

    +

    Theese are the evaluated students. Note that if you evaluated them over a grad different from 100, the system automatically did the conversion so the grade will be shown over 100 points.


    -

    Students with answers that have not been evaluated (@not_evaluated_with_answer@)

    +

    #evaluation.lt_Students_with_answers#

    -

    Click here if you want to download all the answers in one file

    +

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

    - +
    @@ -38,24 +51,24 @@ - + - - - + + +
    Grade students using generated file:#evaluation.lt_Grade_students_using_#
    Generate fileSee grades sheets associated with this taskHow does this work?#evaluation.Generate_file##evaluation.lt_See_grades_sheets_ass##evaluation.How_does_this_work#
    -

    There are no students to eval that already answered

    +

    #evaluation.lt_There_are_no_students#
    -

    Students who have not submitted answers and have not been evaluated (@not_evaluated_with_no_answer@)

    +

    #evaluation.lt_Students_who_have_not#

    @@ -64,7 +77,7 @@ - +
    Grade students with 0#evaluation.lt_Grade_students_with_0#
    @@ -76,18 +89,19 @@ - + - - - + + +
    Grade students using generated file:#evaluation.lt_Grade_students_using_#
    Generate fileSee grades sheets associated with this taskHow does this work?#evaluation.Generate_file##evaluation.lt_See_grades_sheets_ass##evaluation.How_does_this_work#
    -

    There are no students to eval with no answer

    +

    #evaluation.lt_There_are_no_students_1#

     + Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 22 May 2004 01:20:25 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 10 Jun 2004 21:08:53 -0000 1.5 @@ -9,21 +9,23 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull - {return_url "student-list?[export_vars -url { task_id }]"} - {orderby_wa:optional} - {orderby_na:optional} + task_id:integer,notnull + {return_url "student-list?[export_vars -url { task_id }]"} + {orderby_wa:optional} + {orderby_na:optional} + {orderby:optional} } set user_id [ad_conn user_id] -set page_title "Student List" -set context { "Student List" } +set page_title "[_ evaluation.Student_List_]" +set context { "[_ evaluation.Student_List_]" } db_1row get_task_info { *SQL* } +set due_date_pretty [lc_time_fmt $due_date_ansi "%q"] if { $number_of_members > 1 } { - set groups_admin "Groups administration" + set groups_admin "[_ evaluation.lt_Groups_administration]" } else { set groups_admin "" } @@ -35,7 +37,7 @@ # working with already evaluated parties # -set actions [list "Edit Evaluations" [export_vars -base "evaluations-edit" { task_id }]] +set actions [list "[_ evaluation.Edit_Evaluations_]" [export_vars -base "evaluations-edit" { task_id }]] template::list::create \ -name evaluated_students \ @@ -44,27 +46,28 @@ -key task_id \ -pass_properties { return_url task_id evaluation_mode } \ -filters { task_id {} } \ + -orderby { default_value party_name } \ -elements { party_name { - label "Name" + label "[_ evaluation.Name_]" orderby_asc {party_name asc} orderby_desc {party_name desc} link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} - link_html { title "View evaluation" } + link_html { title "[_ evaluation.View_evaluation_]" } } grade { - label "Maximun Grade: 100" + label "[_ evaluation.Grade_over_100_]" orderby_asc {grade asc} orderby_desc {grade desc} } - actions { + action { label "" - link_url_col actions_url + link_url_col action_url } - pretty_submission_date { - label "Sumission Date" - orderby_asc {pretty_submission_date asc} - orderby_desc {pretty_submission_date desc} + submission_date_pretty { + label "[_ evaluation.Sumission_Date_]" + orderby_asc {submission_date_ansi asc} + orderby_desc {submission_date_ansi desc} } view { label {} @@ -73,7 +76,7 @@ } link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} - link_html { title "View evaluation" } + link_html { title "[_ evaluation.View_evaluation_]" } } edit { label {} @@ -82,7 +85,7 @@ } link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id }]} - link_html { title "Edit evaluation" } + link_html { title "[_ evaluation.Edit_evaluation_]" } } delete { label {} @@ -91,7 +94,7 @@ } link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} - link_html { title "Delete evaluation" } + link_html { title "[_ evaluation.Delete_evaluation_]" } } } @@ -101,28 +104,30 @@ set orderby " order by party_name asc" } -db_multirow -extend { actions action_url } evaluated_students evaluated_students { *SQL* } { +db_multirow -extend { action action_url submission_date_pretty } evaluated_students evaluated_students { *SQL* } { lappend done_students $party_id - set grade [format %.2f $grade] + set submission_date_pretty [lc_time_fmt $submission_date_ansi "%c"] + set grade [format %.2f [lc_numeric $grade]] + if { [template::util::date::compare $submission_date $due_date] > 0 } { + set action "[_ evaluation.lt_submission_date_prett]" + } + if { [string eq $online_p "t"] } { # working with answer stuff (if it has a file/url attached) if { [empty_string_p $answer_data] } { - set action "No response" + set action "[_ evaluation.No_response_]" } elseif { [regexp "http://" $answer_data] } { set action_url "[export_vars -base "$answer_data" { }]" - set action "View answer" + set action "[_ evaluation.View_answer_]" } else { # we assume it's a file set action_url "[export_vars -base "../../view/$answer_title" { revision_id }]" - set action "View answer" + set action "[_ evaluation.View_answer_]" } - if { [string eq $action "View answer"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } { - set action "View NEW answer" + if { [string eq $action "[_ evaluation.View_answer_]"] && ([template::util::date::compare $submission_date $evaluation_date] > 0) } { + set action " [_ evaluation.View_NEW_answer_]" } - if { [template::util::date::compare $submission_date $due_date] > 0 } { - set pretty_submission_date "$pretty_submission_date (late)" - } } } @@ -141,23 +146,27 @@ # set elements [list party_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ orderby_asc {party_name asc} \ orderby_desc {party_name desc}] \ + submission_date_pretty \ + [list label "[_ evaluation.Submission_Date_]" \ + orderby_asc {submission_date_ansi asc} \ + orderby_desc {submission_date_ansi desc}] \ answer \ - [list label "Answer" \ + [list label "[_ evaluation.Answer_]" \ link_url_col answer_url \ - link_html { title "View answer" }] \ + link_html { title "[_ evaluation.View_answer_]" }] \ grade \ - [list label "Maximun Grade: " \ + [list label "[_ evaluation.Maximun_Grade_] " \ display_template { } ] \ comments \ - [list label "Comments" \ + [list label "[_ evaluation.Comments_]" \ display_template { } \ ] \ show_answer \ - [list label "Allow the students
    to see the grade?" \ - display_template { Yes No } \ + [list label "[_ evaluation.lt_Allow_the_students_br]" \ + display_template { [_ evaluation.Yes_] [_ evaluation.No_] } \ ] \ ] @@ -177,21 +186,23 @@ set orderby_wa " order by party_name asc" } -db_multirow -extend { answer answer_url } not_evaluated_wa get_not_evaluated_wa_students { *SQL* } { +db_multirow -extend { answer answer_url submission_date_pretty } not_evaluated_wa get_not_evaluated_wa_students { *SQL* } { lappend done_students $party_id if { [string eq $online_p "t"] } { - set answer "View answer" + set submission_date_pretty "[lc_time_fmt $submission_date_ansi "%Q"] [lc_time_fmt $submission_date_ansi "%X"]" + if { [template::util::date::compare $submission_date $due_date] > 0 } { + set submission_date_pretty "[_ evaluation.lt_submission_date_prett_1]" + } else { + } + set answer "[_ evaluation.View_answer_]" # working with answer stuff (if it has a file/url attached) if { [regexp "http://" $answer_data] } { set answer_url [export_vars -base "$answer_data" { }] } else { # we assume it's a file set answer_url [export_vars -base "../../view/$answer_title" { revision_id }] } - if { [template::util::date::compare $submission_date $due_date] > 0 } { - set pretty_submission_date "$pretty_submission_date (late answer)" - } } } @@ -200,19 +211,19 @@ # set elements [list party_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ orderby_asc {party_name asc} \ orderby_desc {party_name desc}] \ grade \ - [list label "Grade over " \ + [list label "[_ evaluation.Grade_over_] " \ display_template { } ] \ comments \ - [list label "Comments" \ + [list label "[_ evaluation.Comments_]" \ display_template { } \ ] \ show_answer \ - [list label "Allow the students
    to see the grade?" \ - display_template { Yes No } \ + [list label "[_ evaluation.lt_Allow_the_students_br]" \ + display_template { [_ evaluation.Yes_] [_ evaluation.No_] } \ ] \ ] Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql 7 Jun 2004 16:05:09 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.xql 10 Jun 2004 21:08:53 -0000 1.4 @@ -11,7 +11,7 @@ eg.grade_plural_name, eg.weight as grade_weight, et.weight as task_weight, - to_char(et.due_date,'Month DD YYYY') as due_date, + to_char(et.due_date, 'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, et.number_of_members, et.online_p from evaluation_grades eg, evaluation_tasks et Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp 7 Jun 2004 16:05:11 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp 10 Jun 2004 21:08:54 -0000 1.3 @@ -2,7 +2,7 @@ @page_title@ @context@ -

    Distribution for grade "@grade_plural_name@" +

    #evaluation.lt_Distribution_for_grad#

    @grade_comments@ @@ -16,6 +16,6 @@ -

    There are no tasks associated with this assignments type +

    #evaluation.lt_There_are_no_tasks_as# -

    \ No newline at end of file +

    Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 13 May 2004 16:29:41 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 10 Jun 2004 21:08:54 -0000 1.3 @@ -12,30 +12,30 @@ set user_id [ad_conn user_id] -set page_title "Assignment Types Distribution" -set context [list [list "grades" "Assignment Types"] "Assignment Types Distribution"] +set page_title "[_ evaluation.lt_Assignment_Types_Dist]" +set context [list [list "grades" "[_ evaluation.Assignment_Types_]"] "[_ evaluation.lt_Assignment_Types_Dist]"] db_1row grade_info { *SQL* } set elements [list task_name \ - [list label "Name" \ - orderby_asc {task_name asc} \ - orderby_desc {task_name desc}] \ - task_weight \ - [list label "Weight" \ - display_template { } \ - ] \ - requires_grade \ - [list label "Requires Grade?" \ - display_template { Yes No } \ - ] \ - ] - + [list label "[_ evaluation.Name_]" \ + orderby_asc {task_name asc} \ + orderby_desc {task_name desc}] \ + task_weight \ + [list label "[_ evaluation.Weight_]" \ + display_template { } \ + ] \ + requires_grade \ + [list label "[_ evaluation.Requires_Grade_]" \ + display_template { [_ evaluation.Yes_] [_ evaluation.No_] } \ + ] \ + ] + template::list::create \ -name grades \ -multirow grades \ - -key task_id \ - -filters { grade_id {} } \ + -key task_id \ + -filters { grade_id {} } \ -elements $elements @@ -46,15 +46,15 @@ } db_multirow -extend { radio_yes_checked radio_no_checked } grades get_grade_tasks { *SQL* } { - - if { [string eq $requires_grade_p "t"] } { - set radio_yes_checked "checked" - set radio_no_checked "" - } else { - set radio_yes_checked "" - set radio_no_checked "checked" - } - + + set task_weight [format %.2f [lc_numeric $task_weight]] + if { [string eq $requires_grade_p "t"] } { + set radio_yes_checked "checked" + set radio_no_checked "" + } else { + set radio_yes_checked "" + set radio_no_checked "checked" + } } Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 7 Jun 2004 16:05:11 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 10 Jun 2004 21:08:54 -0000 1.3 @@ -15,58 +15,58 @@ set package_id [ad_conn package_id] if { [ad_form_new_p -key grade_id] } { - set page_title "Add Assignment Type" + set page_title "[_ evaluation.Add_Assignment_Type_]" } else { - set page_title "Edit Assignment Type" + set page_title "[_ evaluation.lt_Edit_Assignment_Type_]" } -set context [list [list [export_vars -base grades { }] "Assignment Types"] $page_title] +set context [list [list [export_vars -base grades { }] "[_ evaluation.Assignment_Types_]"] $page_title] ad_form -name grade -cancel_url [export_vars -base grades { }] -export { } -form { grade_id:key {grade_name:text - {label "Assignment Type Name"} + {label "[_ evaluation.lt_Assignment_Type_Name_]"} {html {size 30}} } {grade_plural_name:text - {label "Assignment Plural Type Name"} + {label "[_ evaluation.lt_Assignment_Plural_Typ]"} {html {size 30}} } {weight:float - {label "Weight"} + {label "[_ evaluation.Weight_]"} {html {size 5}} } {comments:text(textarea),optional - {label "Assignment Type's Comments"} + {label "[_ evaluation.lt_Assignment_Types_Comm]"} {html {rows 4 cols 40}} } } -edit_request { db_1row get_grade_info { *SQL* } - + set weight [format %.2f [lc_numeric $weight]] set grade_id $item_id } -validate { {weight { ($weight >= 0) && ($weight <= 100) } - {Weight must be a real number and between 0 and 100} + { [_ evaluation.lt_Weight_must_be_a_real] } } } -on_submit { db_transaction { - set revision_id [evaluation::new_grade -new_item_p [ad_form_new_p -key grade_id] -item_id $grade_id -content_type evaluation_grades \ - -content_table evaluation_grades -content_id grade_id -name $grade_name -plural_name $grade_plural_name -description $comments -weight $weight] - - evaluation::set_live -revision_id $revision_id - + set revision_id [evaluation::new_grade -new_item_p [ad_form_new_p -key grade_id] -item_id $grade_id -content_type evaluation_grades \ + -content_table evaluation_grades -content_id grade_id -name $grade_name -plural_name $grade_plural_name -description $comments -weight $weight] + + evaluation::set_live -revision_id $revision_id + } ad_returnredirect "grades" Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -12,13 +12,13 @@ operation } -if { [string eq $operation "Yes, I really want to remove this grade"] } { +if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to__1]"] } { db_transaction { db_exec_plsql delete_grade { *SQL* } } on_error { - ad_return_error "Error deleting the grade" "We got the following error while trying to remove the grade: 
    $errmsg
    " + ad_return_error "[_ evaluation.lt_Error_deleting_the_gr]" "[_ evaluation.lt_We_got_the_following__1]" ad_script_abort } } else { Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp 7 Jun 2004 16:05:11 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp 10 Jun 2004 21:08:54 -0000 1.3 @@ -1,12 +1,12 @@ @context;noquote@ -Remove Grade +#evaluation.Remove_Grade# -Are you sure you want to remove the assignment type "@grade_plural_name@"? (If your answer is yes, all the evaluations, tasks, tasks solutions and answers associated with this assignment type will be deleted too) +#evaluation.lt_Are_you_sure_you_want#

    - +
    Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 7 Jun 2004 16:05:11 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 10 Jun 2004 21:08:54 -0000 1.3 @@ -15,16 +15,11 @@ set user_id [ad_verify_and_get_user_id] -set page_title "Delete Assignment Type" +set page_title "[_ evaluation.lt_Delete_Assignment_Typ]" -set context [list [list "grades" "Assignment Types"] "Delete Assignment Type"] +set context [list [list "grades" "[_ evaluation.Assignment_Types_]"] "[_ evaluation.lt_Delete_Assignment_Typ]"] -db_1row get_grade_info " - select item_id, - grade_plural_name - from evaluation_gradesx - where grade_id = :grade_id -" +db_1row get_grade_info { *SQL* } set export_vars [export_form_vars grade_id return_url] Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql 7 Jun 2004 16:05:11 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports-postgresql.xql 10 Jun 2004 21:08:54 -0000 1.5 @@ -33,15 +33,15 @@ - , trunc(evaluation__grade_total_grade(cu.user_id,$grade_id),2) as grade_$grade_id + , [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,$grade_id),2)] as grade_$grade_id - , trunc(evaluation__class_total_grade(cu.user_id,$package_id),2) as total_grade + , [lc_numeric trunc(evaluation__class_total_grade(cu.user_id,$package_id),2)] as total_grade Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -1,6 +1,9 @@ @page_title;noquote@ @context;noquote@ - +

    #evaluation.lt_This_is_the_grades_re#
    +#evaluation.lt_You_can_order_the_gra#
    +

    + Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 7 Jun 2004 16:05:12 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl 10 Jun 2004 21:08:54 -0000 1.5 @@ -13,13 +13,13 @@ } -validate { grades_for_package { if { [string eq [db_string package_grades { *SQL* }] 0] } { - ad_complain "There are no grades for this group." + ad_complain "[_ evaluation.lt_There_are_no_grades_f]" } } } -set page_title "Grades Report" -set context "Grades Report" +set page_title "[_ evaluation.Grades_Report_]" +set context "[_ evaluation.Grades_Report_]" set package_id [ad_conn package_id] # we have to decide if we are going to show all the users in the system @@ -34,14 +34,15 @@ } set elements [list student_name \ - [list label "Name" \ + [list label "[_ evaluation.Name_]" \ link_url_col student_url \ orderby_asc {student_name asc} \ orderby_desc {student_name desc}] \ ] db_foreach grade_type { *SQL* } { - set grade_label_${grade_id} "$grade_plural_name ($weight %) " + set weight [format %.0f [lc_numeric $weight]] + set grade_label_${grade_id} "${grade_plural_name} ($weight%) " append pass_grades " grade_label_${grade_id} " lappend elements grade_$grade_id \ [list label "@grade_label_${grade_id};noquote@" \ @@ -53,7 +54,7 @@ } lappend elements total_grade \ - [list label "Total Grade" \ + [list label "[_ evaluation.Total_Grade_]" \ orderby_asc {total_grade asc} \ orderby_desc {total_grade desc} \ ] @@ -77,5 +78,5 @@ db_multirow grades_report $query_name { *SQL* } { - + } Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports-postgresql.xql 10 Jun 2004 21:08:54 -0000 1.4 @@ -46,15 +46,15 @@ - , trunc(evaluation__task_grade(cu.user_id,$task_id),2) as task_$task_id + , [lc_numeric trunc(evaluation__task_grade(cu.user_id,$task_id),2)] as task_$task_id - , trunc(evaluation__grade_total_grade(cu.user_id,:grade_id),2) as total_grade + , [lc_numeric trunc(evaluation__grade_total_grade(cu.user_id,:grade_id),2)] as total_grade Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -1,6 +1,10 @@ @page_title;noquote@ @context;noquote@ +

    #evaluation.lt_This_is_the_grades_re_1#
    +#evaluation.lt_You_can_order_the_gra_1#
    +

    + Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl 10 Jun 2004 21:08:54 -0000 1.4 @@ -14,13 +14,13 @@ } -validate { tasks_for_grade { if { [string eq [db_string get_tasks { *SQL* }] 0] } { - ad_complain "There are no tasks for this grade type." + ad_complain "[_ evaluation.lt_There_are_no_tasks_fo_1]" } } } -set page_title "Grades Report" -set context [list [list "[export_vars -base grades-reports { }]" "Grades Report"] "One Grade Type"] +set page_title "[_ evaluation.Grades_Report_]" +set context [list [list "[export_vars -base grades-reports { }]" "[_ evaluation.Grades_Report_]"] "[_ evaluation.One_Grade_Type_]"] set package_id [ad_conn package_id] @@ -36,24 +36,24 @@ } set elements [list student_name \ - [list label "Name" \ - orderby_asc {student_name asc} \ - orderby_desc {student_name desc} \ - ]\ - ] + [list label "[_ evaluation.Name_]" \ + orderby_asc {student_name asc} \ + orderby_desc {student_name desc} \ + ]\ + ] db_foreach grade_task { *SQL* } { - lappend elements task_$task_id \ - [list label "$task_name ($weight %)" \ - orderby_asc {task_$task_id asc} \ - orderby_desc {task_$task_id desc} \ - ] - - append sql_query [db_map task_grade] + lappend elements task_$task_id \ + [list label "$task_name (${weight}%)" \ + orderby_asc {task_$task_id asc} \ + orderby_desc {task_$task_id desc} \ + ] + + append sql_query [db_map task_grade] } lappend elements total_grade \ - [list label "Total" \ + [list label "[_ evaluation.Total_]" \ orderby_asc {total_grade asc} \ orderby_desc {total_grade desc} \ ] Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.xql 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.xql 10 Jun 2004 21:08:54 -0000 1.2 @@ -1,5 +1,4 @@ - postgresql7.4 Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/grades/grades.tcl 7 Jun 2004 16:05:12 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl 10 Jun 2004 21:08:54 -0000 1.4 @@ -15,15 +15,15 @@ set context [list Grades] set package_id [ad_conn package_id] -set page_title "Admin Assignment Types" +set page_title "[_ evaluation.lt_Admin_Assignment_Type]" set return_url [ad_conn url] -set actions [list "Add assignment type" [export_vars -base "grades-add-edit" { }]] +set actions [list "[_ evaluation.Add_assignment_type_]" [export_vars -base "grades-add-edit" { }]] if { [format %2.f [db_string sum_grades { *SQL* }]] > 100.00} { - set aggregate_label "Total" + set aggregate_label "[_ evaluation.Total_]" } else { - set aggregate_label "Total" + set aggregate_label "[_ evaluation.Total_]" } template::list::create \ @@ -34,22 +34,22 @@ -pass_properties { return_url aggregate_label } \ -elements { grade_plural_name { - label "Name" + label "[_ evaluation.Name_]" orderby_asc {grade_plural_name asc} orderby_desc {grade_plural_name desc} link_url_eval {[export_vars -base "distribution-edit" { grade_id }]} link_html { title "View assignment type distribution" } } weight { - label "Weight" + label "[_ evaluation.Weight_]" orderby_asc {weight asc} orderby_desc {weight desc} display_template { @grades.weight@% } aggregate sum aggregate_label { @aggregate_label;noquote@ } } comments { - label "Description" + label "[_ evaluation.Description_]" orderby_asc {comments asc} orderby_desc {comments desc} } @@ -60,7 +60,7 @@ } link_url_eval {[export_vars -base "grades-add-edit" { item_id grade_id }]} - link_html { title "Edit assignment type" } + link_html { title "[_ evaluation.lt_Edit_assignment_type_]" } } delete { label {} @@ -69,7 +69,7 @@ } link_url_eval {[export_vars -base "grades-delete" { grade_id return_url }]} - link_html { title "Delete assignment type" } + link_html { title "[_ evaluation.lt_Delete_assignment_typ]" } } } @@ -79,14 +79,16 @@ set orderby " order by grade_plural_name asc" } -db_multirow grades get_class_grades { *SQL* } +db_multirow grades get_class_grades { *SQL* } { + set weight [format %.2f [lc_numeric $weight]] +} db_1row get_total_weight { *SQL* } set total_weight [format %.2f $total_weight] if { ![string eq $total_weight "100.00"] && ![string eq $total_weight "0"] } { - set notice "The sum of the weight of all the assignment types is $total_weight and it should be 100.00 by the end of the term(supposedly)." + set notice "[_ evaluation.lt_The_sum_of_the_weight]" } else { set notice "" } Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -12,14 +12,14 @@ operation } -if { [string eq $operation "Yes, I really want to remove this group"] } { +if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to__2]"] } { db_transaction { db_exec_plsql delete_group { *SQL* } } on_error { - ad_return_error "Error deleting the evaluation" "We got the following error while trying to remove the evaluation: 
    $errmsg
    " + ad_return_error "[_ evaluation.lt_Error_deleting_the_ev]" "[_ evaluation.lt_We_got_the_following_]" ad_script_abort } } Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete.adp 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -2,12 +2,12 @@ @context;noquote@ @page_title@ -Are you sure you want to remove the group "@group_name@"? (If the group has an evaluation/answer associated, it will be deleted too) +#evaluation.lt_Are_you_sure_you_want_1#

    - +
    -

    \ No newline at end of file +

    Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -11,8 +11,8 @@ task_id:integer } -set page_title "Delete Evaluation" -set context [list [list "[export_vars -base one-task { task_id }]" "Task Groups"] [list "[export_vars -base one-group { task_id evaluation_group_id }]" "One Group"] "Delete Group"] +set page_title "[_ evaluation.Delete_Evaluation_]" +set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] [list "[export_vars -base one-group { task_id evaluation_group_id }]" "[_ evaluation.One_Group_]"] "[_ evaluation.Delete_Group_]"] db_1row get_group_info { *SQL* } Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp 31 May 2004 17:04:58 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp 10 Jun 2004 21:08:54 -0000 1.3 @@ -3,11 +3,12 @@ @context;noquote@ -

    Please select the group

    +

    #evaluation.lt_Please_select_the_gro#

     + Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl 31 May 2004 17:04:58 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl 10 Jun 2004 21:08:54 -0000 1.3 @@ -13,34 +13,34 @@ } -validate { target_exists { if { [string eq "select count(group_id) from evaluation_task_groups where task_id = :task_id" 0] } { - ad_complain "There are no groups for this task yet." + ad_complain "[_ evaluation.lt_There_are_no_groups_f]" } } } -set page_title "Add a member to a group" -set context [list [list "[export_vars -base one-task { task_id }]" "Task Groups"] "Add Member to group"] +set page_title "[_ evaluation.lt_Add_a_member_to_a_gro]" +set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] "[_ evaluation.Add_Member_to_group_]"] set elements [list group_name \ - [list label "Group Name" \ + [list label "[_ evaluation.Group_Name_]" \ orderby_asc {group_name asc} \ orderby_desc {group_name desc}] \ number_of_members \ - [list label "No. of members" \ + [list label "[_ evaluation.No_of_members_]" \ orderby_asc {number_of_members asc} \ orderby_desc {number_of_members desc}] \ associate_to_group \ [list label "" \ link_url_col associate_to_group_url \ - link_html { title "Associate" }] \ + link_html { title "[_ evaluation.Associate_]" }] \ ] template::list::create \ -name evaluation_groups \ -multirow evaluation_groups \ - -key evaluation_group_id \ - -filters { student_id {} task_id {} } \ + -key evaluation_group_id \ + -filters { student_id {} task_id {} } \ -elements $elements set orderby [template::list::orderby_clause -orderby -name evaluation_groups] @@ -51,7 +51,7 @@ db_multirow -extend { associate_to_group_url associate_to_group } evaluation_groups get_evaluation_groups { *SQL* } { set associate_to_group_url [export_vars -base "group-member-add-2" -url { task_id student_id evaluation_group_id }] - set associate_to_group "Associate to this group" + set associate_to_group "[_ evaluation.lt_Associate_to_this_gro]" } Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql 22 May 2004 01:20:25 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.xql 10 Jun 2004 21:08:54 -0000 1.3 @@ -5,7 +5,8 @@ - select g.group_name, g.group_id as evaluation_group_id, + select g.group_name, + g.group_id as evaluation_group_id, count(map.object_id_two) as number_of_members from groups g, acs_rels map, evaluation_task_groups etg where map.object_id_one = g.group_id Index: openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -14,7 +14,7 @@ } -validate { students_to_work_with { if { [array size student_ids] == 0 } { - ad_complain "There must be some students selected in order to crate the group." + ad_complain "[_ evaluation.lt_There_must_be_some_st]" } } } Index: openacs-4/packages/evaluation/www/admin/groups/group-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-new.adp 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-new.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -7,28 +7,11 @@ @export_vars;noquote@ - - - - - - -
    -
    - - - - + +
    Please enter the group name
    - - - - - - -
    @students.rownum@.@students.student_name@
    -
    #evaluation.lt_Please_enter_the_grou#
    + Index: openacs-4/packages/evaluation/www/admin/groups/group-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-new.tcl 28 Apr 2004 11:06:42 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-new.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -13,13 +13,13 @@ } -validate { students_to_work_with { if { [array size student_ids] == 0 } { - ad_complain "There must be some students selected in order to crate the group." + ad_complain "[_ evaluation.lt_There_must_be_some_st]" } } } -set page_title "New Group" -set context [list [list "[export_vars -base one-task { task_id }]" "Task Groups"] "Create Group"] +set page_title "[_ evaluation.New_Group_]" +set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] "[_ evaluation.Create_Group_]"] set current_groups_plus_one [db_string get_groups "select count(group_id)+1 from evaluation_task_groups where task_id = :task_id"] set evaluation_group_id [db_nextval acs_object_id_seq] Index: openacs-4/packages/evaluation/www/admin/groups/group-rename.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-rename.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-rename.adp 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-rename.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -6,13 +6,14 @@ @export_vars;noquote@ - + - +
    Please enter the new group name
    #evaluation.lt_Please_enter_the_new_#


    + Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -12,7 +12,7 @@ } -validate { no_groups { if { [db_string get_groups_for_task "select count(*) from evaluation_task_groups where task_id = :task_id"] > 0 } { - ad_complain "There must be no groups for this task in order to copy the groups form another task. You can go back and delete the groups for this task." + ad_complain "[_ evaluation.lt_There_must_be_no_grou]" } } } @@ -34,18 +34,15 @@ } } on_error { - ad_complain "There was an error creating the groups" + ad_complain "[_ evaluation.lt_There_was_an_error_cr]" ns_log Error "/evaluation/www/admin/groups/new-group-2.tcl choked: $errmsg" - ad_return_error "Insert Failed" "This was the error: -
    - 
    $errmsg
    -
    " + ad_return_error "[_ evaluation.Insert_Failed_]" "[_ evaluation.lt_This_was_the_error___]" ad_script_abort } -ad_returnredirect one-task.tcl?[export_vars task_id] +ad_returnredirect "one-task.tcl?[export_vars task_id]" Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -2,6 +2,7 @@ @page_title;noquote@ @context;noquote@ -

    Click on the task that you want the groups to be copy from

    +

    #evaluation.lt_Click_on_the_task_tha#

    + Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl 7 Jun 2004 16:05:14 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl 10 Jun 2004 21:08:54 -0000 1.5 @@ -11,23 +11,23 @@ {orderby:optional} } -set page_title "Reuse Groups" -set context [list [list "[export_vars -base one-task { task_id }]" "Task Groups"] "Reuse Groups"] +set page_title "[_ evaluation.Reuse_Groups_]" +set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] "[_ evaluation.Reuse_Groups_]"] set elements [list task_name \ - [list label "Group Name" \ - link_url_col task_url \ - orderby_asc {task_name asc} \ - orderby_desc {task_name desc}] \ - number_of_members \ - [list label "No. of Members" \ - orderby_asc {number_of_members asc} \ - orderby_desc {number_of_members desc}] \ - grade_plural_name \ - [list label "Assignment Type" \ - orderby_asc {grade_plural_name asc} \ - orderby_desc {grade_plural_name desc}] \ - ] + [list label "[_ evaluation.Group_Name_]" \ + link_url_col task_url \ + orderby_asc {task_name asc} \ + orderby_desc {task_name desc}] \ + number_of_members \ + [list label "[_ evaluation.No_of_Members_]" \ + orderby_asc {number_of_members asc} \ + orderby_desc {number_of_members desc}] \ + grade_plural_name \ + [list label "[_ evaluation.Assignment_Type_]" \ + orderby_asc {grade_plural_name asc} \ + orderby_desc {grade_plural_name desc}] \ + ] template::list::create \ -name groups \ Index: openacs-4/packages/evaluation/www/admin/groups/one-group.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/groups/one-group.adp 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/groups/one-group.adp 10 Jun 2004 21:08:54 -0000 1.4 @@ -5,24 +5,24 @@
      -
    • To chanche the name, edit the name in the text input and then click on the "Rename Group" botton. -
    • To delete the group, click on the "Delete Group" botton. -
    • To unassociate a member of the group, click on the "Unassociate member" link. +
    • #evaluation.lt_To_chanche_the_name_e# +
    • #evaluation.lt_To_delete_the_group_c# +
    • #evaluation.lt_To_unassociate_a_memb#
    @export_vars;noquote@
    - + - + @@ -31,7 +31,8 @@ - There are no studens associated with this group. + #evaluation.lt_There_are_no_studens_# + Index: openacs-4/packages/evaluation/www/admin/groups/one-group.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 10 Jun 2004 21:08:54 -0000 1.4 @@ -14,34 +14,34 @@ set number_of_members [db_string get_no_of_members { *SQL* }] -set page_title "One Group" -set context [list [list "[export_vars -base one-task { task_id }]" "Task Groups"] "One Group"] +set page_title "[_ evaluation.One_Group_]" +set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] "[_ evaluation.One_Group_]"] if { $number_of_members } { set group_name [evaluation::evaluation_group_name -group_id $evaluation_group_id] append page_title ": $group_name" } -set actions [list "Delete Group" [export_vars -base "group-delete" { evaluation_group_id task_id }] {}] +set actions [list "[_ evaluation.Delete_Group_]" [export_vars -base "group-delete" { evaluation_group_id task_id }] {}] set elements [list student_name \ - [list label "Student Name" \ - orderby_asc {student_name asc} \ - orderby_desc {student_name desc}] \ - unassociate_member \ - [list label "" \ - link_url_col unassociate_member_url \ - link_html { title "Unassociate student for this group" }] \ - ] + [list label "[_ evaluation.Student_Name_]" \ + orderby_asc {student_name asc} \ + orderby_desc {student_name desc}] \ + unassociate_member \ + [list label "" \ + link_url_col unassociate_member_url \ + link_html { title "[_ evaluation.lt_Unassociate_student_f]" }] \ + ] template::list::create \ -name one_group \ -multirow one_group \ - -key group_id \ - -pass_properties { return_url evaluation_group_id } \ - -filters { task_id {} evaluation_group_id {} } \ - -actions $actions \ + -key group_id \ + -pass_properties { return_url evaluation_group_id } \ + -filters { task_id {} evaluation_group_id {} } \ + -actions $actions \ -elements $elements set orderby [template::list::orderby_clause -orderby -name one_group] @@ -52,7 +52,7 @@ db_multirow -extend { unassociate_member_url unassociate_member } one_group get_group_members { *SQL* } { set unassociate_member_url [export_vars -base "group-remove-member" -url { evaluation_group_id task_id rel_id }] - set unassociate_member "Unassociate member" + set unassociate_member "[_ evaluation.Unassociate_member_]" } set export_vars [export_vars -form { task_id evaluation_group_id }] Index: openacs-4/packages/evaluation/www/admin/groups/one-task.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/groups/one-task.adp 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/groups/one-task.adp 10 Jun 2004 21:08:54 -0000 1.4 @@ -2,11 +2,11 @@ @page_title;noquote@@context;noquote@ -

    In this page you can administer the groups for the assignment.

    +

    #evaluation.lt_In_this_page_you_can_#

      -
    • First, you will see the list of students without group (if there are students without group) and you can create a group by selecting the members of the group and then clicking on the "Create Group" botton.
      • -
    • You can also add a student to an existing group by clicking on the "Associate to group..." link. Here you will be asked to select the group to wich you want to add the user.
      • -
    • Also, you will see the list of already created groups (if there are any created groups). Click on the "Group administration" link in order to administer the group. In this administration pages you will be able to unassociate members of a given group, rename the group and/or delete the group.
      • +
    • #evaluation.lt_First_you_will_see_th#
      • +
    • #evaluation.lt_You_can_also_add_a_st#
      • +
    • #evaluation.lt_Also_you_will_see_the#
    @@ -20,10 +20,10 @@
    Group name
    #evaluation.Group_name#
    -

    Number of members of this group:
    +

    #evaluation.lt_Number_of_members_of_#
    @number_of_members@
    - + @@ -33,10 +33,11 @@ -

    Already created groups

    +

    #evaluation.lt_Already_created_group#

     + Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 31 May 2004 17:04:58 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 10 Jun 2004 21:08:54 -0000 1.4 @@ -14,15 +14,15 @@ } -validate { group_task { if { [string eq [db_string get_number_of_members { *SQL* }] 1] } { - ad_complain "This task is not in groups" + ad_complain "[_ evaluation.lt_This_task_is_not_in_g]" } } } db_1row get_info { *SQL* } -set page_title "Groups for task $task_name" -set context [list "Assignment Groups"] +set page_title "[_ evaluation.lt_Groups_for_task_task_]" +set context [list "[_ evaluation.Assignment_Groups_]"] # we have to decide if we are going to show all the users in the system # or only the students of a given class (community in dotrln) @@ -36,18 +36,18 @@ } set elements [list associate \ - [list label "" \ - display_template { } \ - ] \ - student_name \ - [list label "Name" \ - orderby_asc {student_name asc} \ - orderby_desc {student_name desc}] \ - associate_to_group \ - [list label "" \ - link_url_col associate_to_group_url \ - link_html { title "Associate to group..." }] \ - ] + [list label "" \ + display_template { } \ + ] \ + student_name \ + [list label "[_ evaluation.Name_]" \ + orderby_asc {student_name asc} \ + orderby_desc {student_name desc}] \ + associate_to_group \ + [list label "" \ + link_url_col associate_to_group_url \ + link_html { title "[_ evaluation.Associate_to_group_]" }] \ + ] template::list::create \ -name students_without_group \ @@ -66,26 +66,26 @@ db_multirow -extend { associate_to_group_url associate_to_group } students_without_group $query_name { *SQL* } { set associate_to_group_url [export_vars -base "group-member-add" -url { task_id student_id }] - set associate_to_group "Associate to group..." + set associate_to_group "[_ evaluation.Associate_to_group_]" } set elements [list group_name \ - [list label "Group Name" \ - orderby_asc {group_name asc} \ - orderby_desc {group_name desc}] \ - members \ - [list label "Members" \ - display_template { @task_groups.members;noquote@ } \ - ] \ - number_of_members \ - [list label "Total of Members" \ - orderby_asc {number_of_members asc} \ - orderby_desc {number_of_members desc}] \ - group_administration \ - [list label "" \ - link_url_col group_administration_url \ - link_html { title "Group administration" }] \ - ] + [list label "[_ evaluation.Group_Name_]" \ + orderby_asc {group_name asc} \ + orderby_desc {group_name desc}] \ + members \ + [list label "[_ evaluation.Members_]" \ + display_template { @task_groups.members;noquote@ } \ + ] \ + number_of_members \ + [list label "[_ evaluation.Total_of_Members_]" \ + orderby_asc {number_of_members asc} \ + orderby_desc {number_of_members desc}] \ + group_administration \ + [list label "" \ + link_url_col group_administration_url \ + link_html { title "[_ evaluation.lt_Group_administration_]" }] \ + ] template::list::create \ @@ -106,14 +106,14 @@ db_multirow -extend { group_administration_url group_administration members } task_groups get_task_groups { *SQL* } { set group_administration_url [export_vars -base "one-group" -url { task_id evaluation_group_id }] - set group_administration "Group administration" + set group_administration "[_ evaluation.lt_Group_administration_]" set members [join [db_list get_group_members { *SQL* }] "
    "] } if { [db_string get_groups_for_task { *SQL* }] > 0 } { set reuse_link "" } else { - set reuse_link "Reuse groups from another task" + set reuse_link "[_ evaluation.lt_Reuse_groups_from_ano]" } ad_return_template Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -2,4 +2,5 @@ @page_title;noquote@@context;noquote@ +Upload a solution for this assignment so the students can see it and learn from it.

    Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 22 May 2004 01:20:25 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 10 Jun 2004 21:08:54 -0000 1.4 @@ -20,12 +20,12 @@ set package_id [ad_conn package_id] if { [ad_form_new_p -key solution_id] } { - set page_title "Add Task Solution" + set page_title "[_ evaluation.Add_Task_Solution_]" } else { - set page_title "View/Edit Task Solution" + set page_title "[_ evaluation.lt_ViewEdit_Task_Solutio]" } -set context [list [list [export_vars -base ../grades/grades { }] "Grades"] $page_title] +set context [list [list [export_vars -base ../grades/grades { }] "[_ evaluation.Grades_]"] $page_title] set attached_p "f" ad_form -html { enctype multipart/form-data } -name solution -cancel_url $return_url -export { grade_id item_id storage_type task_id attached_p } -mode $solution_mode -form { @@ -45,24 +45,24 @@ ad_form -extend -name solution -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} - {help_text "Currently $title is attached to this task solution, but you can attach a different file/url just by adding it here"} + {help_text "[_ evaluation.lt_Currently_title_is_at]"} } {unattach_p:text(checkbox),optional - {label "Unattach file?"} + {label "[_ evaluation.Unattach_file_]"} {options {{"" "t"}}} - {help_text "Check this if you want to unattach the file"} + {help_text "[_ evaluation.lt_Check_this_if_you_wan]"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} } } } else { ad_form -extend -name solution -form { {upload_file:text,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} {value "[return $title]"} {after_html "$title"} @@ -82,18 +82,18 @@ ad_form -extend -name solution -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} - {help_text "Currently $content is associated to this task solution, but you can associate a different url/file just by adding it here"} + {help_text "[_ evaluation.lt_Currently_content_is_]"} } {unattach_p:text(checkbox),optional - {label "Unassociate url?"} + {label "[_ evaluation.Unassociate_url_]"} {options {{"" "t"}}} - {help_text "Check this if you want to unattach the file"} + {help_text "[_ evaluation.lt_Check_this_if_you_wan]"} } } } else { @@ -102,7 +102,7 @@ {upload_file:text(hidden) } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "$content"} {after_html "$content"} } @@ -114,11 +114,11 @@ ad_form -extend -name solution -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} } {unattach_p:text(hidden),optional @@ -131,11 +131,11 @@ ad_form -extend -name solution -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} } {unattach_p:text(hidden),optional @@ -153,15 +153,15 @@ } -validate { {url { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) || ([string eq $url "http://"] && [empty_string_p $upload_file] && [string eq $unattach_p "t"]) } - {Upload a file OR a valid url, and not both } + { [_ evaluation.lt_Upload_a_file_OR_a_va] } } {upload_file { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || ([string eq $url "http://"] && [empty_string_p $upload_file] && [string eq $unattach_p "t"]) } - {Upload a file OR a url, and not both} + { [_ evaluation.lt_Upload_a_file_OR_a_ur] } } {unattach_p { ([string eq $unattach_p "t"] && [empty_string_p $upload_file] && [string eq $url "http://"]) || [empty_string_p $unattach_p] } - {First unattach the file/url, then submit another one or just upload a new file/url and leave this in blank} + { [_ evaluation.lt_First_unattach_the_fi] } } } -on_submit { Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql 7 Jun 2004 16:05:15 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit-postgresql.xql 10 Jun 2004 21:08:54 -0000 1.3 @@ -28,7 +28,7 @@ - select et.task_name, et.description, to_char(et.due_date,'YYYY-MM-DD HH24:MI:SS') as due_date, + select et.task_name, et.description, to_char(et.due_date,'YYYY-MM-DD HH24:MI:SS') as due_date_ansi, et.weight, et.number_of_members, et.online_p, et.late_submit_p, et.requires_grade_p from evaluation_tasksi et where task_id = :task_id Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.adp 7 Jun 2004 16:05:15 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.adp 10 Jun 2004 21:08:54 -0000 1.4 @@ -37,7 +37,8 @@

    - To add this assignment to other classes (where you are administrator)
    please check the last check box at the bottom of the form. + #evaluation.lt_To_add_this_assignmen#
    #evaluation.lt_please_check_the_last#

    + Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 7 Jun 2004 16:05:15 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 10 Jun 2004 21:08:54 -0000 1.7 @@ -23,9 +23,9 @@ set community_id [dotlrn_community::get_community_id] set new_p [ad_form_new_p -key task_id] if { $new_p } { - set page_title "Add Task" + set page_title "[_ evaluation.Add_Task_]" } else { - set page_title "Edit Task" + set page_title "[_ evaluation.Edit_Task_]" } if { [info exists admin_groups_p] } { @@ -46,7 +46,7 @@ task_id:key {task_name:text - {label "Task Name"} + {label "[_ evaluation.Task_Name_]"} {html {size 30}} } @@ -63,24 +63,24 @@ ad_form -extend -name task -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} - {help_text "Currently $title is attached to this task, but you can attach a different file/url just by adding it here"} + {help_text "[_ evaluation.lt_Currently_title_is_at_1]"} } {unattach_p:text(checkbox),optional - {label "Unattach file?"} + {label "[_ evaluation.Unattach_file_]"} {options {{"" "t"}}} - {help_text "Check this if you want to unattach the file"} + {help_text "[_ evaluation.lt_Check_this_if_you_wan]"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} } } } else { ad_form -extend -name task -form { {upload_file:text,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} {value "$title"} } @@ -99,27 +99,27 @@ ad_form -extend -name task -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} - {help_text "Currently $content is associated to this task, but you can associate a different url/file just by adding it here"} + {help_text "[_ evaluation.lt_Currently_content_is__1]"} } {unattach_p:text(checkbox),optional - {label "Unassociate url?"} + {label "[_ evaluation.Unassociate_url_]"} {options {{"" "t"}}} - {help_text "Check this if you want to unattach the file"} + {help_text "[_ evaluation.lt_Check_this_if_you_wan]"} } } } else { ad_form -extend -name task -form { - {upload_file:hidden + {upload_file:text(hidden) } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "$content"} } {unattach_p:text(hidden) @@ -130,13 +130,13 @@ ad_form -extend -name task -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} - {help_text "You can upload a file associated to this task by using the browse button (optional)"} + {help_text "[_ evaluation.lt_You_can_upload_a_file]"} } {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} {help_text "You can associate a link to this task by entering the absolute url here (also optional)"} } @@ -152,18 +152,18 @@ ad_form -extend -name task -form { {upload_file:file,optional - {label "File"} + {label "[_ evaluation.File_]"} {html "size 30"} - {help_text "You can upload a file associated to this task by using the browse button and select the file from your computer (optional)"} + {help_text "[_ evaluation.lt_You_can_upload_a_file_1]"} } } ad_form -extend -name task -form { {url:text(text),optional - {label "URL"} + {label "[_ evaluation.URL__1]"} {value "http://"} - {help_text "You can associate a link to this task by entering the absolute url here (also optional)"} + {help_text "[_ evaluation.lt_You_can_associate_a_l]"} } {unattach_p:text(hidden),optional @@ -175,57 +175,57 @@ ad_form -extend -name task -form { {description:richtext,optional - {label "Task's Description"} + {label "[_ evaluation.lt_Assignments_Descripti]"} {html {rows 4 cols 40 wrap soft}} } {due_date:date,to_sql(linear_date),from_sql(sql_date) - {label "Due Date"} + {label "[_ evaluation.Due_Date_]"} {format "MONTH DD YYYY"} {today} {help} {value {[evaluation::now_plus_days -ndays 15]}} } {number_of_members:naturalnum - {label "Number of Members"} + {label "[_ evaluation.Number_of_Members_]"} {value "1"} {html {size 5 onChange TaskInGroups()}} - {help_text "1 = Individual"} - {after_html {
    Check this if you want to go to the groups admin page after submitting the task
    }} + {help_text "[_ evaluation.1__Individual_]"} + {after_html {
    [_ evaluation.lt_Check_this_if_you_wan_1]
    }} } {weight:float - {label "Weight"} + {label "[_ evaluation.Weight_]"} {html {size 5}} - {help_text "over $grade_weight% of $grade_plural_name"} + {help_text "[_ evaluation.lt_over_grade_weight_of_]"} } {online_p:text(radio) - {label "Will the task be submitted online?"} - {options {{Yes t} {No f}}} + {label "[_ evaluation.lt_Will_the_task_be_subm]"} + {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} {value t} } {late_submit_p:text(radio) - {label "Can the student submit the answer
    after the due date?"} - {options {{Yes t} {"No" f}}} + {label "[_ evaluation.lt_Can_the_student_submi]"} + {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} {value t} } {requires_grade_p:text(radio) - {label "Will this task require a grade on the course?"} - {options {{Yes t} {"No" f}}} + {label "[_ evaluation.lt_Will_this_task_requir]"} + {options {{"[_ evaluation.Yes_]" t} {"[_ evaluation.No_]" f}}} {value t} } } if { $new_p && ![empty_string_p $community_id] } { ad_form -extend -name task -form { {add_to_more_classes_p:text(checkbox),optional - {label "Add this assignment to other class(es)"} + {label "[_ evaluation.lt_Add_this_assignment_t]"} {options {{"" "t"}}} - {help_text "Check this if you want to add the assignment to other class(es) that you administer"} + {help_text "[_ evaluation.lt_Check_this_if_you_wan_2]"} } } } @@ -236,24 +236,25 @@ db_1row task_info { *SQL* } - set due_date [template::util::date::from_ansi $due_date] + set due_date [template::util::date::from_ansi $due_date_ansi] + set weight [format %.2f [lc_numeric $weight]] } -validate { {due_date { [template::util::date::compare $due_date [template::util::date::now]] > 0 } - {Due date must be in the future} + { [_ evaluation.lt_Due_date_must_be_in_t] } } {url { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || ([string eq $url "http://"] && [empty_string_p $upload_file]) || (![string eq $url "http://"] && [util_url_valid_p $url]) } - {Upload a file OR a url, not both} + {[_ evaluation.lt_Upload_a_file_OR_a_ur_1] } } {upload_file { ([string eq $url "http://"] && ![empty_string_p $upload_file]) || (![string eq $url "http://"] && [empty_string_p $upload_file]) || ([string eq $url "http://"] && [empty_string_p $upload_file]) } - {Upload a file OR a url, not both} + { [_ evaluation.lt_Upload_a_file_OR_a_ur_1] } } {unattach_p { ([string eq $unattach_p "t"] && [empty_string_p $upload_file] && [string eq $url "http://"]) || [empty_string_p $unattach_p] } - {First unattach the file/url, then submit another one or just upload a new file/url and leave this in blank} + { [_ evaluation.lt_First_unattach_the_fi] } } } -new_data { Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp 7 Jun 2004 16:05:15 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp 10 Jun 2004 21:08:54 -0000 1.2 @@ -3,9 +3,10 @@ @context;noquote@ -

    The assignment "@task_name@" has been uploaded in this community.
    Check the rest of communities where you want to upload the assignment too

    +

    #evaluation.lt_The_assignment_task_n#
    #evaluation.lt_Check_the_rest_of_com#

     -There are no more communities where you can add the task.
    -If you administer more than one community and you want to upload an assigment in more than one community, you must set the same name for each of the assignment types in each community so the system can identify where to store the assignment. +#evaluation.lt_There_are_no_more_com#
    +#evaluation.lt_If_you_administer_mor#     + Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 7 Jun 2004 16:05:15 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -17,11 +17,11 @@ set user_id [ad_conn user_id] set this_package_id [ad_conn package_id] -set page_title "Add Assignment to Communities" +set page_title "[_ evaluation.lt_Add_Assignment_to_Com]" db_1row task_grade_info { *SQL* } -set context [list [list [export_vars -base grades { communities_packages_ids }] "Add Assignment"] $page_title] +set context [list [list [export_vars -base grades { communities_packages_ids }] "[_ evaluation.Add_Assignment_]"] $page_title] ad_form -name communities -cancel_url $return_url -export { return_url task_id } -form { foo:key } Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -13,13 +13,13 @@ return_url } -if { [string eq $operation "Yes, I really want to remove this task"] } { +if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to__3]"] } { db_transaction { db_exec_plsql delete_task { *SQL* } } on_error { - ad_return_error "Error deleting the task" "We got the following error while trying to remove the task: 
    $errmsg
    " + ad_return_error "[_ evaluation.lt_Error_deleting_the_ta]" "[_ evaluation.lt_We_got_the_following__2]" ad_script_abort } } else { Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp 7 Jun 2004 16:05:16 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp 10 Jun 2004 21:08:54 -0000 1.3 @@ -1,12 +1,13 @@ @context;noquote@ -Remove Grade +#evaluation.Remove_Grade# -Are you sure you want to delete the task "@task_name@"? (If you delete the task, all the information associated with the task, such as answers, task solutions, etc, will be deleted too) +#evaluation.lt_Are_you_sure_you_want_2#

    - +
    + Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 28 Apr 2004 11:09:54 -0000 1.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 10 Jun 2004 21:08:54 -0000 1.2 @@ -12,9 +12,9 @@ return_url } -set page_title "Delete Task" +set page_title "[_ evaluation.Delete_Task_]" -set context [list [list [export_vars -base ../grades/grades { }] "Grades"] $page_title] +set context [list [list [export_vars -base ../grades/grades { }] "[_ evaluation.Grades_]"] $page_title] db_1row get_task_info { *SQL* }
    -

    Number of members for this task:
    +

    #evaluation.lt_Number_of_members_for#
    @n_of_members@