Index: openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/Attic/evaluations-chunk-postgresql.xql,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql 17 Nov 2004 23:58:15 -0000 1.6.2.1 +++ openacs-4/packages/evaluation/lib/evaluations-chunk-postgresql.xql 8 Jun 2005 22:07:45 -0000 1.6.2.2 @@ -8,15 +8,26 @@ select et.task_name, round(et.weight,2) as task_weight, - et.task_id + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score, online_p from evaluation_tasksi et, cr_items cri where grade_item_id = :grade_item_id and cri.live_revision = et.task_id $evaluations_orderby + + + select ets.solution_id + from evaluation_tasks_sols ets, cr_items cri + where ets.task_item_id = (select task_item_id from evaluation_tasks where task_id=:task_id) + and cri.live_revision = ets.solution_id + + + + + @@ -25,16 +36,19 @@ et.weight as t_weight, eg.weight as g_weight, round((et.weight*eg.weight)/100,2) as task_weight, - et.number_of_members, - et.task_id + et.number_of_members, + et.online_p, + et.due_date, + et.late_submit_p, + et.task_id, (select perfect_score from evaluation_tasks where task_id=et.task_id) as perfect_score from evaluation_grades eg, evaluation_tasksi et, cr_items cri where eg.grade_id = :grade_id and eg.grade_item_id = et.grade_item_id and cri.live_revision = et.task_id $evaluations_orderby - + @@ -83,7 +97,6 @@ from evaluation_tasks et3 where et3.task_id = :task_id ) - -- evaluation__party_id(:user_id,:task_id) @@ -94,7 +107,7 @@ select ea.data as answer_data, ea.title as answer_title, - ea.answer_id + 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 @@ -119,5 +132,41 @@ + + + select 1 from dual where :due_date > now() + + + + + + + select ea.answer_id + from evaluation_answers ea, cr_items cri + where ea.task_item_id = :task_item_id + and cri.live_revision = ea.answer_id + and ea.party_id = + ( select + CASE + WHEN et3.number_of_members = 1 THEN :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 + ) + + --evaluation__party_id(:user_id,:task_id) + + + + +