Index: openacs-4/packages/lab-report-central/www/attach-student-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/Attic/attach-student-postgresql.xql,v diff -u -N --- openacs-4/packages/lab-report-central/www/attach-student-postgresql.xql 30 Apr 2006 12:01:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ - - - - postgresql7.4 - - - - SELECT name - FROM lrc_lab - WHERE lab_id = :lab_id - - - - - - INSERT INTO lrc_lab_student_map (lab_id, user_id) - VALUES (:lab_id, :student_id) - - - - Index: openacs-4/packages/lab-report-central/www/attach-student.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/Attic/attach-student.adp,v diff -u -N --- openacs-4/packages/lab-report-central/www/attach-student.adp 30 Apr 2006 12:01:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ - -@page_title;noquote@ -@context;noquote@ -attach_student.name - - Index: openacs-4/packages/lab-report-central/www/attach-student.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/Attic/attach-student.tcl,v diff -u -N --- openacs-4/packages/lab-report-central/www/attach-student.tcl 31 Aug 2006 10:32:07 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,48 +0,0 @@ -ad_page_contract { - Add a student to a lab. - - @author Nick Carroll (nick.c@rroll.net) - @creation-date 2006-04-18 - @cvs-id $Id: attach-student.tcl,v 1.2 2006/08/31 10:32:07 ncarroll Exp $ -} { - lab_id:integer - return_url:optional -} - -auth::require_login - -set package_id [ad_conn package_id] -set user_id [ad_conn user_id] -set peeraddr [ad_conn peeraddr] - -permission::require_permission -party_id $user_id -object_id $package_id \ - -privilege lab_report_central_admin - -if { ![info exists return_url] } { - set return_url [export_vars -url -base students {lab_id}] -} - -set lab_name [db_string lab_name {} -default ""] - -set page_title [_ lab-report-central.add_student] -set context [list [list [export_vars -url -base lab {lab_id}] $lab_name] \ - $page_title] - -ad_form -name attach_student -cancel_url $return_url -form { - {lab_id:integer(hidden) {value $lab_id}} - {return_url:text(hidden) {value $return_url}} - {student_id:search - {result_datatype integer} - {label "[_ lab-report-central.student]" } - {help_text "[_ lab-report-central.help_select_student_to_attach]"} - {options "[lab_report_central::unmapped_students_get_options \ - -lab_id $lab_id]"} - {search_query {[db_map dbqd.lab-report-central.tcl.lab-report-central-procs.lab_student_search]}} - } -} -after_submit { - # Map student to lab. - db_dml attach_student {} - - ad_returnredirect $return_url - ad_script_abort -} Index: openacs-4/packages/lab-report-central/www/group-members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/group-members.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lab-report-central/www/group-members.adp 31 Aug 2006 10:32:07 -0000 1.1 +++ openacs-4/packages/lab-report-central/www/group-members.adp 1 Sep 2006 11:40:29 -0000 1.2 @@ -20,7 +20,7 @@ #lab-report-central.group_members_admin# @context;noquote@ -#lab-report-central.members_of_group# +#lab-report-central.members_of_group#: @group_name@
Index: openacs-4/packages/lab-report-central/www/lab-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/lab-postgresql.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lab-report-central/www/lab-postgresql.xql 31 Aug 2006 10:32:07 -0000 1.5 +++ openacs-4/packages/lab-report-central/www/lab-postgresql.xql 1 Sep 2006 11:40:29 -0000 1.6 @@ -30,14 +30,14 @@ - SELECT u.user_id AS student_id, u.first_names, u.last_name, u.email - FROM cc_users u, lrc_lab_student_map s, lrc_marker_group_map g, - group_member_map m + SELECT u.user_id AS student_id, u.first_names, u.last_name, u.email, + gs.group_name + FROM cc_users u, lrc_marker_group_map g, group_member_map m, groups gs WHERE u.user_id = m.member_id - AND s.lab_id = :lab_id - AND g.lab_id = s.lab_id + AND g.lab_id = :lab_id AND g.marker_id = :user_id AND g.group_id = m.group_id + AND gs.group_id = g.group_id Index: openacs-4/packages/lab-report-central/www/lab.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/lab.adp,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/lab-report-central/www/lab.adp 31 Aug 2006 10:32:07 -0000 1.5 +++ openacs-4/packages/lab-report-central/www/lab.adp 1 Sep 2006 11:40:29 -0000 1.6 @@ -78,15 +78,18 @@ - +

@student.group_name@

+ + +
Index: openacs-4/packages/lab-report-central/www/students-add-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-add-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-add-postgresql.xql 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,13 @@ + + + + postgresql7.4 + + + + INSERT INTO lrc_lab_student_map (lab_id, user_id) + VALUES (:lab_id, :student_id) + + + + Index: openacs-4/packages/lab-report-central/www/students-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-add.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-add.tcl 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,21 @@ +ad_page_contract { + + Adds the given list of users to the class list for the specified lab.. + + @author Nick Carroll (ncarroll@ee.usyd.edu.au) + @creation-date 2005-01-02 + @version $Id: students-add.tcl,v 1.1 2006/09/01 11:40:29 ncarroll Exp $ + +} { + lab_id:integer,notnull + user_id:integer,multiple +} + +set count 0 +# For each member in the list of user IDs, add that user to the group. +foreach student_id $user_id { + db_dml add_student {} + incr count +} + +ad_returnredirect -message "Added $count users to class list." [export_vars -url -base {students-admin} {lab_id}] Index: openacs-4/packages/lab-report-central/www/students-admin-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-admin-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-admin-postgresql.xql 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,42 @@ + + + + postgresql7.4 + + + + SELECT name + FROM lrc_lab + WHERE lab_id = :lab_id + + + + + + INSERT INTO lrc_lab_student_map (lab_id, user_id) + VALUES (:lab_id, :student_id) + + + + + + SELECT c.last_name || ', ' || c.first_names AS name, c.user_id + FROM cc_users c + WHERE c.user_id IN (SELECT s.user_id FROM lrc_lab_student_map s + WHERE s.lab_id = :lab_id) + ORDER BY name ASC + + + + + + SELECT c.last_name || ', ' || c.first_names AS name, c.user_id + FROM cc_users c + WHERE c.user_id NOT IN (SELECT s.user_id + FROM lrc_lab_student_map s + WHERE s.lab_id = :lab_id) + ORDER BY name ASC + + + + Index: openacs-4/packages/lab-report-central/www/students-admin.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-admin.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-admin.adp 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,15 @@ + +@page_title;noquote@ +@context;noquote@ + +#lab-report-central.class_list_of_students# +
+ +
+
+

+#lab-report-central.users_that_can_be_added_as_students# + +

+ +
Index: openacs-4/packages/lab-report-central/www/students-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-admin.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-admin.tcl 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,73 @@ +ad_page_contract { + Add a student to a lab. + + @author Nick Carroll (nick.c@rroll.net) + @creation-date 2006-04-18 + @cvs-id $Id: students-admin.tcl,v 1.1 2006/09/01 11:40:29 ncarroll Exp $ +} { + lab_id:integer + return_url:optional +} + +auth::require_login + +set package_id [ad_conn package_id] +set lab_instructor_id [ad_conn user_id] +set peeraddr [ad_conn peeraddr] + +permission::require_permission -party_id $lab_instructor_id \ + -object_id $package_id \ + -privilege lab_report_central_admin + +if { ![info exists return_url] } { + set return_url [export_vars -url -base students {lab_id}] +} + +set lab_name [db_string lab_name {} -default ""] + +set page_title [_ lab-report-central.add_student] +set context [list [list [export_vars -url -base lab {lab_id}] $lab_name] \ + $page_title] + + +db_multirow students students {} + +template::list::create \ + -name students \ + -multirow students \ + -key user_id \ + -bulk_actions { + "Remove" "students-rem" "Remove user from class list" + } \ + -bulk_action_method post -bulk_action_export_vars { + user_id lab_id + } \ + -no_data {#lab-report-central.no_members_added_to_group#} \ + -elements { + name { + label #lab-report-central.name# + } + } \ + -html {width 60%} + +db_multirow non_students non_students {} + +template::list::create \ + -name non_students \ + -multirow non_students \ + -key user_id \ + -bulk_actions { + "Add" "students-add" "Add user to class list" + } \ + -bulk_action_method post -bulk_action_export_vars { + user_id lab_id + } \ + -no_data {#lab-report-central.no_members_added_to_group#} \ + -elements { + name { + label #lab-report-central.name# + } + } \ + -html {width 60%} + +ad_return_template \ No newline at end of file Index: openacs-4/packages/lab-report-central/www/students-rem-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-rem-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-rem-postgresql.xql 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,14 @@ + + + + postgresql7.4 + + + + DELETE FROM lrc_lab_student_map + WHERE user_id = :student_id + AND lab_id = :lab_id + + + + Index: openacs-4/packages/lab-report-central/www/students-rem.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students-rem.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lab-report-central/www/students-rem.tcl 1 Sep 2006 11:40:29 -0000 1.1 @@ -0,0 +1,21 @@ +ad_page_contract { + + Removes the given list of users to the class list for the specified lab.. + + @author Nick Carroll (ncarroll@ee.usyd.edu.au) + @creation-date 2005-01-02 + @version $Id: students-rem.tcl,v 1.1 2006/09/01 11:40:29 ncarroll Exp $ + +} { + lab_id:integer,notnull + user_id:integer,multiple +} + +set count 0 +# For each member in the list of user IDs, add that user to the group. +foreach student_id $user_id { + db_dml rem_student {} + incr count +} + +ad_returnredirect -message "Removed $count users from class list." [export_vars -url -base {students-admin} {lab_id}] Index: openacs-4/packages/lab-report-central/www/students.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lab-report-central/www/students.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/lab-report-central/www/students.tcl 31 Aug 2006 10:32:07 -0000 1.1 +++ openacs-4/packages/lab-report-central/www/students.tcl 1 Sep 2006 11:40:29 -0000 1.2 @@ -27,7 +27,7 @@ -object_id $package_id \ -privilege lab_report_central_admin] -set add_student_url [export_vars -url -base attach-student {lab_id}] +set add_student_url [export_vars -url -base students-admin {lab_id}] db_multirow -extend {rem_student_url dotfolio_url} student select_students {} { set rem_student_url [export_vars -url -base detach-student {lab_id student_id}]