Index: openacs-4/packages/assessment/tcl/as-section-data-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/as-section-data-procs-oracle.xql,v diff -u -N --- openacs-4/packages/assessment/tcl/as-section-data-procs-oracle.xql 23 Jan 2005 18:10:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ - - -oracle8.1.6 - - - - - update as_section_data - set creation_datetime = sysdate - where session_id = :session_id - and section_id = :section_id - - - - - Index: openacs-4/packages/assessment/tcl/as-section-data-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/as-section-data-procs-postgresql.xql,v diff -u -N --- openacs-4/packages/assessment/tcl/as-section-data-procs-postgresql.xql 23 Jan 2005 18:10:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ - - -postgresql7.1 - - - - - update as_section_data - set creation_datetime = now() - where session_id = :session_id - and section_id = :section_id - - - - - Index: openacs-4/packages/assessment/tcl/as-section-data-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-data-procs.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/assessment/tcl/as-section-data-procs.xql 18 Jan 2005 12:42:37 -0000 1.1 +++ openacs-4/packages/assessment/tcl/as-section-data-procs.xql 22 Nov 2017 09:51:20 -0000 1.2 @@ -1,15 +1,22 @@ - - + + + select 1 + from as_section_data + where session_id = :session_id + and section_id = :section_id + + - select 1 - from as_section_data - where session_id = :session_id - and section_id = :section_id + + + update as_section_data + set creation_datetime = current_timestamp + where session_id = :session_id + and section_id = :section_id + + - - - Index: openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql 15 May 2007 20:14:17 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-section-procs-oracle.xql 22 Nov 2017 10:01:12 -0000 1.9 @@ -2,105 +2,6 @@ oracle8.1.6 - - - - select s.as_item_id, ci.name, r.title, r.description, i.subtext, m.required_p, - m.max_time_to_complete, r2.revision_id as content_rev_id, - r2.title as content_filename, ci2.content_type, - ir.target_rev_id as as_item_type_id, i.validate_block, - r.content as question_text - from as_session_items s, as_items i, as_item_section_map m, cr_revisions r, - cr_items ci, as_item_rels ar, cr_revisions r2, cr_items ci2, - as_item_rels ir - where ar.item_rev_id(+) = s.as_item_id - and ar.rel_type(+) = 'as_item_content_rel' - and ar.target_rev_id = r2.revision_id(+) - and ci2.item_id (+) = r2.item_id - and s.session_id = :session_id - and s.section_id = :section_id - and i.as_item_id = s.as_item_id - and r.revision_id = i.as_item_id - and ci.item_id = r.item_id - and m.as_item_id = s.as_item_id - and m.section_id = s.section_id - and ir.item_rev_id = s.as_item_id - and ir.rel_type = 'as_item_type_rel' - order by s.sort_order - - - - - - - - select i.as_item_id, ci.name, cr.title, cr.description, i.subtext, - m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id, - r2.title as content_filename, ci2.content_type, m.fixed_position, - ir.target_rev_id as as_item_type_id, i.validate_block, - cr.content as question_text - from as_item_section_map m, as_items i, cr_revisions cr, cr_items ci, - as_item_rels ar, cr_revisions r2, cr_items ci2, as_item_rels ir - where ar.item_rev_id (+) = i.as_item_id - and ar.rel_type (+) = 'as_item_content_rel' - and ar.target_rev_id = r2.revision_id (+) - and ci2.item_id (+) = r2.item_id - and cr.revision_id = i.as_item_id - and i.as_item_id = m.as_item_id - and m.section_id = :section_id - and ci.item_id = cr.item_id - and ir.item_rev_id = i.as_item_id - and ir.rel_type = 'as_item_type_rel' - order by m.sort_order - - - - - - - - select asm.points as section_max_points - from as_assessment_section_map asm - where asm.assessment_id = :assessment_id - and asm.section_id = :section_id - and not exists (select 1 - from as_session_items i, as_item_data d, as_session_item_map m - where d.section_id (+) = i.section_id - and d.session_id (+) = i.session_id - and d.as_item_id (+) = i.as_item_id - and m.session_id (+) = d.session_id - and m.item_data_id (+) = d.item_data_id - and i.session_id = :session_id - and i.section_id = :section_id - and d.points is null) - - - - - - - - update as_section_data - set points = :section_points, - completed_datetime = sysdate - where session_id = :session_id - and section_id = :section_id - - - - - - - - update as_section_data - set creation_datetime= sysdate, - completed_datetime = sysdate, - points = 0 - where section_data_id = :section_data_id - - - - update as_sections set instructions=empty_clob() Index: openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql 7 Aug 2006 01:19:34 -0000 1.9 +++ openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql 22 Nov 2017 10:01:12 -0000 1.10 @@ -1,104 +1,7 @@ postgresql7.1 - - - - - select s.as_item_id, ci.name, r.title, - r.description, i.subtext, m.required_p, - m.max_time_to_complete, r2.revision_id as content_rev_id, - r2.title as content_filename, ci2.content_type, - ir.target_rev_id as as_item_type_id, i.validate_block, - r.content as question_text - from cr_items ci, as_items i, as_item_section_map m, cr_revisions r, - as_item_rels ir, as_session_items s - left outer join as_item_rels ar on (ar.item_rev_id = s.as_item_id and ar.rel_type = 'as_item_content_rel') - left outer join cr_revisions r2 on (ar.target_rev_id = r2.revision_id) - left outer join cr_items ci2 on (ci2.item_id = r2.item_id) - where s.session_id = :session_id - and s.section_id = :section_id - and i.as_item_id = s.as_item_id - and r.revision_id = i.as_item_id - and ci.item_id = r.item_id - and m.as_item_id = s.as_item_id - and m.section_id = s.section_id - and ir.item_rev_id = s.as_item_id - and ir.rel_type = 'as_item_type_rel' - order by s.sort_order - - - - - - - - select i.as_item_id, ci.name, cr.title, cr.description, i.subtext, - m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id, - r2.title as content_filename, ci2.content_type, m.fixed_position, - ir.target_rev_id as as_item_type_id, i.validate_block, - cr.content as question_text - from as_item_section_map m, cr_revisions cr, cr_items ci, - as_item_rels ir, as_items i - left outer join as_item_rels ar on (ar.item_rev_id = i.as_item_id and ar.rel_type = 'as_item_content_rel') - left outer join cr_revisions r2 on (ar.target_rev_id = r2.revision_id) - left outer join cr_items ci2 on (ci2.item_id = r2.item_id) - where cr.revision_id = i.as_item_id - and i.as_item_id = m.as_item_id - and m.section_id = :section_id - and ci.item_id = cr.item_id - and ir.item_rev_id = i.as_item_id - and ir.rel_type = 'as_item_type_rel' - order by m.sort_order - - - - - - - - select asm.points as section_max_points - from as_assessment_section_map asm - where asm.assessment_id = :assessment_id - and asm.section_id = :section_id - and not exists (select 1 - from as_session_items i - left outer join as_item_data d on (d.section_id = i.section_id - and d.session_id = i.session_id - and d.as_item_id = i.as_item_id) - left outer join as_session_item_map m on (m.session_id = d.session_id - and m.item_data_id = d.item_data_id) - where i.session_id = :session_id - and i.section_id = :section_id - and d.points is null) - - - - - - - - update as_section_data - set points = :section_points, - completed_datetime = now() - where section_data_id = :section_data_id - - - - - - - - update as_section_data - set creation_datetime= now(), - completed_datetime = now(), - points = 0 - where session_id = :session_id - and section_id = :section_id - - - - + update as_sections set instructions=:instructions Index: openacs-4/packages/assessment/tcl/as-section-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs.xql,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/assessment/tcl/as-section-procs.xql 15 May 2007 20:14:17 -0000 1.14 +++ openacs-4/packages/assessment/tcl/as-section-procs.xql 22 Nov 2017 10:01:12 -0000 1.15 @@ -1,6 +1,103 @@ + + + + select s.as_item_id, ci.name, r.title, + r.description, i.subtext, m.required_p, + m.max_time_to_complete, r2.revision_id as content_rev_id, + r2.title as content_filename, ci2.content_type, + ir.target_rev_id as as_item_type_id, i.validate_block, + r.content as question_text + from cr_items ci, as_items i, as_item_section_map m, cr_revisions r, + as_item_rels ir, as_session_items s + left outer join as_item_rels ar on (ar.item_rev_id = s.as_item_id and ar.rel_type = 'as_item_content_rel') + left outer join cr_revisions r2 on (ar.target_rev_id = r2.revision_id) + left outer join cr_items ci2 on (ci2.item_id = r2.item_id) + where s.session_id = :session_id + and s.section_id = :section_id + and i.as_item_id = s.as_item_id + and r.revision_id = i.as_item_id + and ci.item_id = r.item_id + and m.as_item_id = s.as_item_id + and m.section_id = s.section_id + and ir.item_rev_id = s.as_item_id + and ir.rel_type = 'as_item_type_rel' + order by s.sort_order + + + + + + + + select i.as_item_id, ci.name, cr.title, cr.description, i.subtext, + m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id, + r2.title as content_filename, ci2.content_type, m.fixed_position, + ir.target_rev_id as as_item_type_id, i.validate_block, + cr.content as question_text + from as_item_section_map m, cr_revisions cr, cr_items ci, + as_item_rels ir, as_items i + left outer join as_item_rels ar on (ar.item_rev_id = i.as_item_id and ar.rel_type = 'as_item_content_rel') + left outer join cr_revisions r2 on (ar.target_rev_id = r2.revision_id) + left outer join cr_items ci2 on (ci2.item_id = r2.item_id) + where cr.revision_id = i.as_item_id + and i.as_item_id = m.as_item_id + and m.section_id = :section_id + and ci.item_id = cr.item_id + and ir.item_rev_id = i.as_item_id + and ir.rel_type = 'as_item_type_rel' + order by m.sort_order + + + + + + + + select asm.points as section_max_points + from as_assessment_section_map asm + where asm.assessment_id = :assessment_id + and asm.section_id = :section_id + and not exists (select 1 + from as_session_items i + left outer join as_item_data d on (d.section_id = i.section_id + and d.session_id = i.session_id + and d.as_item_id = i.as_item_id) + left outer join as_session_item_map m on (m.session_id = d.session_id + and m.item_data_id = d.item_data_id) + where i.session_id = :session_id + and i.section_id = :section_id + and d.points is null) + + + + + + + + update as_section_data + set points = :section_points, + completed_datetime = current_timestamp + where section_data_id = :section_data_id + + + + + + + + update as_section_data + set creation_datetime= current_timestamp, + completed_datetime = current_timestamp, + points = 0 + where session_id = :session_id + and section_id = :section_id + + + +