Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml 10 Jun 2004 22:00:22 -0000 1.1 @@ -0,0 +1,51 @@ + + + + Add %grade_name% + Add/edit answer + Add/edit solution + Assignments + Audit Info. + Audit info + Comments + Delete task + Due date + Edit task + Evaluations + Grade over 100 + Groups Admin. + Admin my Assignment Types + Administer Evaluation + Edit grades distribution of %grade_plural_name% + Evaluation Admin Portlet + Evaluation Administration + Evaluation Assignments Portlet + Evaluation Evaluations Portlet + Groups administration + <small>Total points in this category: %total_grade%/%max_grade%<br /> + This grade category represents the %grade_weight%% of the 100% of the class</small> + <small>Weight used in %grade_plural_name%: %category_weight%% (over 100% of %grade_plural_name%) <br /> + %grade_plural_name% represents %grade_weight%% of the 100% of the class</small> + submit answer <style font-color:red>late</style> + submit answer <style font-color:red>late</style> again + There are no tasks for this package. + There are no tasks to evaluate for this package. + There should be only one instance of evaluation for admin purposes + View evaluation comments + Your total grade in this class is: + Name + Net Value + No group for task + Not available + Not evaluated + submit answer + submit answer again + %task_name% (No data) + %task_name% (URL) + Upload Solution + View comments + View my answer + View task + View/Edit Solution + Weight + Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 31 May 2004 23:43:09 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 10 Jun 2004 22:00:22 -0000 1.2 @@ -13,40 +13,40 @@ db_1row get_grade_info { *SQL* } set elements [list task_name \ - [list label "Name" \ - link_url_col task_url \ - orderby_asc {task_name asc} \ - orderby_desc {task_name desc}] \ - ] + [list label "[_ evaluation-portlet.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-portlet.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}evaluation/admin/grades/distribution-edit" { grade_id }]] + set actions [list "[_ evaluation-portlet.lt_Edit_grades_distribut]" [export_vars -base "${base_url}evaluation/admin/grades/distribution-edit" { grade_id }]] } else { #student lappend elements grade \ - [list label "Grade over 100" \ + [list label "[_ evaluation-portlet.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-portlet.Comments_]" \ link_url_col comments_url \ - link_html { title "View evaluation comments" }] + link_html { title "[_ evaluation-portlet.lt_View_evaluation_comme]" }] lappend elements task_weight \ - [list label "Net Value" \ + [list label "[_ evaluation-portlet.Net_Value_]" \ display_template {
@grade_tasks.task_weight@
} \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] lappend elements answer \ [list label "" \ link_url_col answer_url \ - link_html { title "View my answer" }] + link_html { title "[_ evaluation-portlet.View_my_answer_]" }] set multirow_name grade_tasks set actions "" } @@ -77,60 +77,59 @@ db_multirow -extend { task_url } grade_tasks_admin get_tasks_admin { *SQL* } { set task_url [export_vars -base "${base_url}evaluation/admin/evaluations/student-list" { task_id grade_id }] set category_weight [expr $category_weight + $task_weight] + set task_weight [format %.2f [lc_numeric $task_weight]] } } else { 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-portlet.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-portlet.Not_evaluated_]" } set max_grade [expr $task_weight + $max_grade] } else { - set grade "Not available" + set grade "[_ evaluation-portlet.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-portlet.View_my_answer_]" } else { # we assume it's a file - set answer_url "[export_vars -base "${base_url}evaluation/view/$answer_title" { }]" - set answer "View my answer" + set answer_url "[export_vars -base "${base_url}evaluation/view/$answer_title" { {revision_id $answer_id} }]" + set answer "[_ evaluation-portlet.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-portlet.No_group_for_task_]" } } } if { $admin_p } { - set bottom_line "Weight used in ${grade_plural_name}: ${category_weight}% (over 100% of $grade_plural_name)
- $grade_plural_name represents ${grade_weight}% of the 100% of the class" + set bottom_line "[_ evaluation-portlet.lt_smallWeight_used_in_g]" } 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-portlet.lt_smallTotal_points_in_]" } Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql 31 May 2004 23:43:09 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk-postgresql.xql 10 Jun 2004 22:00:22 -0000 1.2 @@ -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,7 +31,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.due_date, et.requires_grade_p, et.description, et.grade_id, et.title as task_title, Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 31 May 2004 23:43:09 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 10 Jun 2004 22:00:22 -0000 1.2 @@ -15,63 +15,63 @@ set return_url "[ad_conn url]?[export_vars { grade_id }]" set elements [list task_name \ - [list label "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}] \ - ] + [list label "[_ evaluation-portlet.Name_]" \ + link_url_col task_url \ + orderby_asc {task_name asc} \ + orderby_desc {task_name desc}] \ + due_date_pretty \ + [list label "[_ evaluation-portlet.Due_date_]" \ + orderby_asc {due_date_pretty asc} \ + orderby_desc {due_date_pretty 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-portlet.Addedit_solution_]" }] lappend elements audit_info \ [list label "" \ link_url_col audit_info_url \ - link_html { title "Audit info" }] + link_html { title "[_ evaluation-portlet.Audit_info_]" }] lappend elements groups_admin \ [list label "" \ link_url_col groups_admin_url \ - link_html { title "Groups administration" }] + link_html { title "[_ evaluation-portlet.lt_Groups_administration]" }] lappend elements view \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { grade_id task_id return_url mode }]} \ - link_html { title "View task" }] + link_html { title "[_ evaluation-portlet.View_task_]" }] lappend elements edit \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url item_id grade_id task_id }]} \ - link_html { title "Edit task" }] + link_html { title "[_ evaluation-portlet.Edit_task_]" }] lappend elements delete \ [list label "" \ - sub_class narrow \ - display_template {} \ - link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-delete" { grade_id task_id return_url }]} \ - link_html { title "Delete task" }] + sub_class narrow \ + display_template {} \ + link_url_eval {[export_vars -base "${base_url}evaluation/admin/tasks/task-delete" { grade_id task_id return_url }]} \ + link_html { title "[_ evaluation-portlet.Delete_task_]" }] set multirow_name tasks_admin - set actions [list "Add $grade_name" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ] + set actions [list "[_ evaluation-portlet.Add_grade_name_]" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ] } else { #student lappend elements answer \ [list label "" \ link_url_col answer_url \ - link_html { title "Add/edit answer" }] + link_html { title "[_ evaluation-portlet.Addedit_answer_]" }] lappend elements view \ [list label "" \ sub_class narrow \ display_template {} \ link_url_eval {[export_vars -base "${base_url}evaluation/task-view" { grade_id task_id return_url }]} \ - link_html { title "View task" }] + link_html { title "[_ evaluation-portlet.View_task_]" }] set multirow_name tasks set actions "" } @@ -95,74 +95,77 @@ 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 due_date_pretty solution solution_mode task_url audit_info audit_info_url groups_admin groups_admin_url } 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}evaluation/task-view" { grade_id task_id return_url }]" - set task_name "$task_name (No data)" + set task_name "[_ evaluation-portlet.task_name_No_data_]" } elseif { [regexp "http://" $task_data] } { set task_url "[export_vars -base "$task_data" { }]" - set task_name "$task_name (URL)" + set task_name "[_ evaluation-portlet.task_name_URL_]" } else { # we assume it's a file set task_url "[export_vars -base "${base_url}evaluation/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}evaluation/admin/tasks/solution-add-edit" { grade_id task_id solution_id return_url solution_mode }]" - set solution "View/Edit Solution" + set solution "[_ evaluation-portlet.ViewEdit_Solution_]" } else { set solution_mode edit set solution_url "[export_vars -base "${base_url}evaluation/admin/tasks/solution-add-edit" { grade_id task_id return_url solution_mode }]" - set solution "Upload Solution" + set solution "[_ evaluation-portlet.Upload_Solution_]" } set audit_info_url "[export_vars -base "${base_url}evaluation/admin/evaluations/audit-info" { grade_id task_id }]" - set audit_info "Audit Info." + set audit_info "[_ evaluation-portlet.Audit_Info_]" if { ![string eq $number_of_members 1] } { set groups_admin_url "[export_vars -base "${base_url}evaluation/admin/groups/one-task" { grade_id task_id }]" - set groups_admin "Groups Admin." + set groups_admin "[_ evaluation-portlet.Groups_Admin_]" } } } else { - db_multirow -extend { task_url solution_url solution solution_mode answer answer_url } tasks get_tasks { *SQL* } { - set answer_mode display + db_multirow -extend { task_url solution_url solution due_date_pretty solution_mode answer answer_url } 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}evaluation/task-view" { grade_id task_id return_url }]" - set task_name "$task_name (No data)" + set task_name "[_ evaluation-portlet.task_name_No_data_]" } elseif { [regexp "http://" $task_data] } { set task_url "[export_vars -base "$task_data" { }]" - set task_name "$task_name (URL)" + set task_name "[_ evaluation-portlet.task_name_URL_]" } else { # we assume it's a file set task_url "[export_vars -base "${base_url}evaluation/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-portlet.submit_answer_]" set answer_mode edit set answer_url "[export_vars -base "${base_url}evaluation/answer-add-edit" { grade_id task_id return_url answer_mode }]" } else { - set answer "submit answer again" + set answer "[_ evaluation-portlet.submit_answer_again_]" set answer_mode display set answer_url "[export_vars -base "${base_url}evaluation/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 "[_ evaluation-portlet.lt_submit_answer_style_f]" set answer_mode edit set answer_url "[export_vars -base "${base_url}evaluation/answer-add-edit" { grade_id task_id return_url answer_mode }]" } else { - set answer "submit answer again" + set answer "[_ evaluation-portlet.lt_submit_answer_style_f_1]" set answer_mode display set answer_url "[export_vars -base "${base_url}evaluation/admin/tasks/solution-add-edit" { grade_id task_id answer_id return_url solution_mode }]" } Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl~ =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/Attic/tasks-chunk.tcl~,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl~ 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl~ 10 Jun 2004 22:00:22 -0000 1.2 @@ -8,7 +8,7 @@ set user_id [ad_verify_and_get_user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] -set grade_plural_name [db_string grade_plural_name { *SQL* }] +db_1row grade_names { *SQL* } set base_url [ad_conn package_url] set mode display @@ -59,7 +59,7 @@ link_html { title "Delete task" }] set multirow_name tasks_admin - set actions [list "Add $grade_plural_name" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ] + set actions [list "Add $grade_name" [export_vars -base "${base_url}evaluation/admin/tasks/task-add-edit" { return_url grade_id }] ] } else { #student lappend elements answer \ Index: openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/tcl/apm-callback-procs.tcl 10 Jun 2004 22:00:23 -0000 1.2 @@ -28,7 +28,7 @@ db_transaction { set ds_id [portal::datasource::new \ -name "evaluation_assignments_portlet" \ - -description "Evaluation Assignments Portlet"] + -description "[_ evaluation-portlet.lt_Evaluation_Assignment]"] portal::datasource::set_def_param \ -datasource_id $ds_id \ @@ -108,7 +108,7 @@ db_transaction { set ds_id [portal::datasource::new \ -name "evaluation_evaluations_portlet" \ - -description "Evaluation Evaluations Portlet"] + -description "[_ evaluation-portlet.lt_Evaluation_Evaluation]"] portal::datasource::set_def_param \ -datasource_id $ds_id \ @@ -185,11 +185,10 @@ Create the datasources needed by the evaluation portlet. } { - ns_log Notice "SE meteeeeeeeeeeeeeee\n" db_transaction { set ds_id [portal::datasource::new \ -name "evaluation_admin_portlet" \ - -description "Evaluation Admin Portlet"] + -description "[_ evaluation-portlet.lt_Evaluation_Admin_Port]"] portal::datasource::set_def_param \ -datasource_id $ds_id \ Index: openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/tcl/evaluation-portlet-procs.tcl 10 Jun 2004 22:00:23 -0000 1.2 @@ -33,7 +33,7 @@ ad_proc -public evaluation_assignments_portlet::get_pretty_name { } { - return "Assignments" + return "[_ evaluation-portlet.Assignments_]" } @@ -119,7 +119,7 @@ ad_proc -public evaluation_evaluations_portlet::get_pretty_name { } { - return "Evaluations" + return "[_ evaluation-portlet.Evaluations_]" } @@ -190,7 +190,7 @@ ad_proc -public evaluation_admin_portlet::get_pretty_name {} { - return "Evaluation Administration" + return "[_ evaluation-portlet.lt_Evaluation_Administra]" } @@ -264,7 +264,7 @@ ad_proc -public evaluation_admin_portlet::get_pretty_name {} { - return "Evaluation Administration" + return "[_ evaluation-portlet.lt_Evaluation_Administra]" } Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.adp 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,3 +1,4 @@ - + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-admin-portlet.tcl 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,26 +1,26 @@ -# /evaluation-portlet/www/evaluation-admin-portlet.tcl - -ad_page_contract { - The display logic for the evaluation admin portlet - - @author jopez@galileo.edu - @creation-date May 2004 - @cvs_id $Id$ -} -properties { - -} - -array set config $cf -set user_id [ad_conn user_id] -set list_of_package_ids $config(package_id) - -if {[llength $list_of_package_ids] > 1} { - # We have a problem! - return -code error "There should be only one instance of weblogger for admin purposes" -} - -set package_id [lindex $list_of_package_ids 0] - -set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0] - -ad_return_template +# /evaluation-portlet/www/evaluation-admin-portlet.tcl + +ad_page_contract { + The display logic for the evaluation admin portlet + + @author jopez@galileo.edu + @creation-date May 2004 + @cvs_id $Id$ +} -properties { + +} + +array set config $cf +set user_id [ad_conn user_id] +set list_of_package_ids $config(package_id) + +if {[llength $list_of_package_ids] > 1} { + # We have a problem! + return -code error "[_ evaluation-portlet.lt_There_should_be_only_]" +} + +set package_id [lindex $list_of_package_ids 0] + +set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0] + +ad_return_template Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,19 +1,20 @@ - - -
    -
  • @notification_chunk;noquote@
    • - -
  • There are no tasks for this package.
    • -     - -
  • @grades.grade_plural_name@
    - -
    • -     -     -
- - -   - - + + +
    +
  • @notification_chunk;noquote@
    • + +
  • #evaluation-portlet.lt_There_are_no_tasks_fo#
    • +     + +
  • @grades.grade_plural_name@
    + +
    • +     +     +
+ + +   + + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.tcl 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,41 +1,41 @@ -# /evaluation-portlet/www/evaluation-portlet.tcl - -ad_page_contract { - The display logic for the evaluation portlet - - @author jopez@galileo.edu - @creation-date May 2004 - @cvs_id $Id$ -} { - item_id:integer,notnull,optional,multiple - {assignments_orderby ""} -} -properties { -} - -set user_id [ad_conn user_id] - -array set config $cf -set shaded_p $config(shaded_p) - -set list_of_package_ids $config(package_id) -set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] - -set admin_p 0 -array set package_admin_p [list] -foreach package_id $config(package_id) { - set package_admin_p($package_id) [permission::permission_p -object_id $package_id -privilege admin] - if { $package_admin_p($package_id) } { - set admin_p 1 - } -} - -db_multirow grades get_grades { *SQL* } { -} - -set notification_chunk [notification::display::request_widget \ - -type one_assignment_notif \ - -object_id $package_id \ - -pretty_name "Assignments" \ - -url [ad_conn url] \ - ] - +# /evaluation-portlet/www/evaluation-portlet.tcl + +ad_page_contract { + The display logic for the evaluation portlet + + @author jopez@galileo.edu + @creation-date May 2004 + @cvs_id $Id$ +} { + item_id:integer,notnull,optional,multiple + {assignments_orderby ""} +} -properties { +} + +set user_id [ad_conn user_id] + +array set config $cf +set shaded_p $config(shaded_p) + +set list_of_package_ids $config(package_id) +set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] + +set admin_p 0 +array set package_admin_p [list] +foreach package_id $config(package_id) { + set package_admin_p($package_id) [permission::permission_p -object_id $package_id -privilege admin] + if { $package_admin_p($package_id) } { + set admin_p 1 + } +} + +db_multirow grades get_grades { *SQL* } { +} + +set notification_chunk [notification::display::request_widget \ + -type one_assignment_notif \ + -object_id $package_id \ + -pretty_name "[_ evaluation-portlet.Assignments_]" \ + -url [ad_conn url] \ + ] + Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet-postgresql.xql 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,7 +1,7 @@ -postgresql7.1 +postgresql7.4 @@ -17,4 +17,12 @@ + + + + select evaluation__class_total_grade(:user_id,[lindex $list_of_package_ids 0]) + + + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,26 +1,27 @@ - - -
    - -
  • Admin my Assignment Types
    • -     -
  • @notification_chunk;noquote@
    • - - -
  • There are no tasks to evaluate for this package.
    • -     - -
  • @grades.grade_plural_name@
    - -
    • -     - -
    Your total grade in this class is: @total_class_grade@ -     -     -
- - -   - - + + +
    + +
  • #evaluation-portlet.lt_Admin_my_Assignment_T#
    • +     +
  • @notification_chunk;noquote@
    • + + +
  • #evaluation-portlet.lt_There_are_no_tasks_to#
    • +     + +
  • @grades.grade_plural_name@
    + +
    • +     + +
    #evaluation-portlet.lt_Your_total_grade_in_t# @total_class_grade@ +     +     +
+ + +   + + + Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl 31 May 2004 23:43:10 -0000 1.1 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.tcl 10 Jun 2004 22:00:23 -0000 1.2 @@ -1,47 +1,47 @@ -# /evaluation-portlet/www/evaluation-portlet.tcl - -ad_page_contract { - The display logic for the evaluation portlet - - @author jopez@galileo.edu - @creation-date May 2004 - @cvs_id $Id$ -} { - item_id:integer,notnull,optional,multiple - {evaluations_orderby ""} -} -properties { - -} - -set user_id [ad_conn user_id] - -array set config $cf -set shaded_p $config(shaded_p) - -set list_of_package_ids $config(package_id) -set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] - -set admin_p 0 -array set package_admin_p [list] -foreach package_id $config(package_id) { - set package_admin_p($package_id) [permission::permission_p -object_id $package_id -privilege admin] - if { $package_admin_p($package_id) } { - set admin_p 1 - } -} - -db_multirow grades get_grades { *SQL* } { -} - -if { [string eq $one_instance_p 1] && [string eq $admin_p 0] } { - set total_class_grade [format %.2f [db_string get_total_grade "select evaluation__class_total_grade(:user_id,[lindex $list_of_package_ids 0])"]] -} - - -set notification_chunk [notification::display::request_widget \ - -type one_evaluation_notif \ - -object_id $package_id \ - -pretty_name "Evaluations" \ - -url [ad_conn url] \ - ] - +# /evaluation-portlet/www/evaluation-portlet.tcl + +ad_page_contract { + The display logic for the evaluation portlet + + @author jopez@galileo.edu + @creation-date May 2004 + @cvs_id $Id$ +} { + item_id:integer,notnull,optional,multiple + {evaluations_orderby ""} +} -properties { + +} + +set user_id [ad_conn user_id] + +array set config $cf +set shaded_p $config(shaded_p) + +set list_of_package_ids $config(package_id) +set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] + +set admin_p 0 +array set package_admin_p [list] +foreach package_id $config(package_id) { + set package_admin_p($package_id) [permission::permission_p -object_id $package_id -privilege admin] + if { $package_admin_p($package_id) } { + set admin_p 1 + } +} + +db_multirow grades get_grades { *SQL* } { +} + +if { [string eq $one_instance_p 1] && [string eq $admin_p 0] } { + set total_class_grade [format %.2f [lc_numeric [db_string get_total_grade { *SQL* }]]] +} + + +set notification_chunk [notification::display::request_widget \ + -type one_evaluation_notif \ + -object_id $package_id \ + -pretty_name "[_ evaluation-portlet.Evaluations_]" \ + -url [ad_conn url] \ + ] +