Index: openacs-4/packages/dotlrn/www/admin/user-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-oracle.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/admin/user-oracle.xql 29 Jun 2004 10:18:06 -0000 1.12 +++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql 23 Nov 2017 09:39:47 -0000 1.13 @@ -3,61 +3,6 @@ oracle8.1.6 - - - select dotlrn_users.*, guest_p - from dotlrn_users, dotlrn_guest_status - where dotlrn_users.user_id = :user_id - and dotlrn_guest_status.user_id(+) = dotlrn_users.user_id - - - - - - select cr_items.live_revision as revision_id, - nvl(cr_revisions.title, 'view this portrait') as portrait_title - from acs_rels, - cr_items, - cr_revisions - where acs_rels.object_id_two = cr_items.item_id - and cr_items.live_revision = cr_revisions.revision_id - and acs_rels.object_id_one = :user_id - and acs_rels.rel_type = 'user_portrait_rel' - - - - - - select dotlrn_class_instances_full.*, - dotlrn_member_rels_approved.rel_type, - dotlrn_member_rels_approved.role, - '' as role_pretty_name - from dotlrn_class_instances_full, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id - order by dotlrn_class_instances_full.department_name, - dotlrn_class_instances_full.department_key, - dotlrn_class_instances_full.pretty_name, - dotlrn_class_instances_full.community_key - - - - - - select dotlrn_clubs_full.*, - dotlrn_member_rels_approved.rel_type, - dotlrn_member_rels_approved.role, - '' as role_pretty_name - from dotlrn_clubs_full, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_clubs_full.club_id - order by dotlrn_clubs_full.pretty_name, - dotlrn_clubs_full.community_key - - - select dotlrn_communities.*, Index: openacs-4/packages/dotlrn/www/admin/user-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 29 Jun 2004 10:18:06 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/user-postgresql.xql 23 Nov 2017 09:39:47 -0000 1.6 @@ -3,61 +3,6 @@ postgresql7.1 - - - select dotlrn_users.*, guest_p - from dotlrn_users left outer join dotlrn_guest_status - on dotlrn_guest_status.user_id = dotlrn_users.user_id - where dotlrn_users.user_id = :user_id - - - - - - select cr_items.live_revision as revision_id, - coalesce(cr_revisions.title, 'view this portrait') as portrait_title - from acs_rels, - cr_items, - cr_revisions - where acs_rels.object_id_two = cr_items.item_id - and cr_items.live_revision = cr_revisions.revision_id - and acs_rels.object_id_one = :user_id - and acs_rels.rel_type = 'user_portrait_rel' - - - - - - select dotlrn_class_instances_full.*, - dotlrn_member_rels_approved.rel_type, - dotlrn_member_rels_approved.role, - '' as role_pretty_name - from dotlrn_class_instances_full, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id - order by dotlrn_class_instances_full.department_name, - dotlrn_class_instances_full.department_key, - dotlrn_class_instances_full.pretty_name, - dotlrn_class_instances_full.community_key - - - - - - select dotlrn_clubs_full.*, - dotlrn_member_rels_approved.rel_type, - dotlrn_member_rels_approved.role, - '' as role_pretty_name - from dotlrn_clubs_full, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_clubs_full.club_id - order by dotlrn_clubs_full.pretty_name, - dotlrn_clubs_full.community_key - - - select dotlrn_communities.*, Index: openacs-4/packages/dotlrn/www/admin/user.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/user.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/user.xql 23 Nov 2017 09:39:47 -0000 1.5 @@ -18,4 +18,59 @@ + + + select dotlrn_users.*, guest_p + from dotlrn_users left outer join dotlrn_guest_status + on dotlrn_guest_status.user_id = dotlrn_users.user_id + where dotlrn_users.user_id = :user_id + + + + + + select cr_items.live_revision as revision_id, + coalesce(cr_revisions.title, 'view this portrait') as portrait_title + from acs_rels, + cr_items, + cr_revisions + where acs_rels.object_id_two = cr_items.item_id + and cr_items.live_revision = cr_revisions.revision_id + and acs_rels.object_id_one = :user_id + and acs_rels.rel_type = 'user_portrait_rel' + + + + + + select dotlrn_class_instances_full.*, + dotlrn_member_rels_approved.rel_type, + dotlrn_member_rels_approved.role, + '' as role_pretty_name + from dotlrn_class_instances_full, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_class_instances_full.class_instance_id + order by dotlrn_class_instances_full.department_name, + dotlrn_class_instances_full.department_key, + dotlrn_class_instances_full.pretty_name, + dotlrn_class_instances_full.community_key + + + + + + select dotlrn_clubs_full.*, + dotlrn_member_rels_approved.rel_type, + dotlrn_member_rels_approved.role, + '' as role_pretty_name + from dotlrn_clubs_full, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_clubs_full.club_id + order by dotlrn_clubs_full.pretty_name, + dotlrn_clubs_full.community_key + + + Index: openacs-4/packages/evaluation/www/admin/grades/grades-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/grades/grades-oracle.xql 8 Aug 2006 21:26:42 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/grades-oracle.xql 23 Nov 2017 09:44:20 -0000 1.3 @@ -3,25 +3,6 @@ oracle8.1.6 - - - - select eg.grade_id, - eg.item_id, - eg.grade_plural_name, - eg.comments, - eg.weight, - cri.live_revision - from evaluation_gradesx eg, acs_objects ao, cr_items cri - where eg.item_id = ao.object_id - and eg.grade_item_id = cri.item_id - and (cri.live_revision = eg.grade_id or cri.latest_revision = eg.grade_id) - and ao.context_id = :package_id - $orderby - - - - Index: openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql 8 Aug 2006 21:26:42 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/grades/grades-postgresql.xql 23 Nov 2017 09:44:20 -0000 1.8 @@ -3,25 +3,6 @@ postgresql7.3 - - - - select eg.grade_id, - eg.item_id, - eg.grade_plural_name, - eg.comments, - eg.weight, - cri.live_revision - from evaluation_gradesx eg, acs_objects ao, cr_items cri - where eg.item_id = ao.object_id - and eg.grade_item_id = cri.item_id - and (cri.live_revision = eg.grade_id or cri.latest_revision = eg.grade_id) - and ao.context_id = :package_id - $orderby - - - - Index: openacs-4/packages/evaluation/www/admin/grades/grades.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/grades/grades.xql 23 Nov 2017 09:44:20 -0000 1.1 @@ -0,0 +1,24 @@ + + + + + + + + select eg.grade_id, + eg.item_id, + eg.grade_plural_name, + eg.comments, + eg.weight, + cri.live_revision + from evaluation_gradesx eg, acs_objects ao, cr_items cri + where eg.item_id = ao.object_id + and eg.grade_item_id = cri.item_id + and (cri.live_revision = eg.grade_id or cri.latest_revision = eg.grade_id) + and ao.context_id = :package_id + $orderby + + + + + Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/distribution-edit-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/grades/distribution-edit-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql 9 Jun 2009 03:01:36 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.xql 23 Nov 2017 09:47:04 -0000 1.8 @@ -1,18 +1,33 @@ - - - + + + select eg.grade_plural_name, + eg.weight as grade_weight, + eg.grade_item_id, + eg.comments as grade_comments + from evaluation_gradesi eg + where grade_id = :grade_id + + - select eg.grade_plural_name, - eg.weight as grade_weight, - eg.grade_item_id, - eg.comments as grade_comments - from evaluation_gradesi eg - where grade_id = :grade_id - - - + + + select et.task_item_id, + et.task_name, + et.weight as task_weight, + et.requires_grade_p, + et.task_id, + et.points, + coalesce(et.relative_weight,0) as relative_weight, + cri.live_revision + from evaluation_tasksi et, cr_items cri + where et.grade_item_id = :grade_item_id + and (cri.live_revision = et.task_id or cri.latest_revision = et.task_id) + and cri.item_id = et.task_item_id + order by task_name + +