Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql 4 Oct 2005 18:00:36 -0000 1.3.2.1 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk-oracle.xql 8 Apr 2006 20:20:50 -0000 1.3.2.2 @@ -25,14 +25,29 @@ - select crr.filename as answer_data, - crr.title as answer_title, - ea.answer_id - from evaluation_answers ea, cr_items cri, cr_revisions crr + select ea.data as answer_data, + ea.title as answer_title, + ea.answer_id,to_char(ea.creation_date,'MM/DD/YYYY HH24:MI') as creation_date + from evaluation_answersi ea, cr_items cri where ea.task_item_id = :task_item_id and cri.live_revision = ea.answer_id - and crr.revision_id = ea.answer_id - and ea.party_id = evaluation.party_id(:user_id,:task_id) + and ea.party_id = + ( select + CASE + WHEN et3.number_of_members = 1 THEN + (select user_id from users where user_id = :user_id) + ELSE + (select etg2.group_id from evaluation_task_groups etg2, + evaluation_tasks et2, + acs_rels map + where map.object_id_one = etg2.group_id + and map.object_id_two = :user_id + and etg2.task_item_id = et2.task_item_id + and et2.task_id = :task_id) + END as nom + from evaluation_tasks et3 + where et3.task_id = :task_id + ) 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.12.2.3 -r1.12.2.4 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 5 Oct 2005 16:42:51 -0000 1.12.2.3 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 8 Apr 2006 20:20:50 -0000 1.12.2.4 @@ -174,7 +174,6 @@ } else { set task_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] } - ns_log notice "fer fiene coon --> $perfect_score <--- \n" set category_weight [expr $category_weight + $task_weight] set grade_url [export_vars -base "${base_url}admin/evaluations/student-list" { grade_id task_id return_url }] set max_weight [format %0.2f [expr $max_weight + $task_weight]]