Index: openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl 19 Jul 2005 17:03:54 -0000 1.1.2.1
@@ -0,0 +1,45 @@
+ad_library {
+ Callbacks implementations for evaluation
+
+ @creation-date Jul 19 2005
+ @author Enrique Catalan (quio@galileo.edu)
+ @cvs-id $Id: evaluation-callback-procs.tcl,v 1.1.2.1 2005/07/19 17:03:54 enriquec Exp $
+}
+
+ad_proc -callback merge::MergeShowUserInfo -impl evaluation {
+ -user_id:required
+} {
+ Show the evaluation items of user_id
+} {
+ set msg "Evaluation items"
+ set result [list $msg]
+ ns_log Notice $msg
+
+ lappend result [list "Answers: [db_list sel_answers { *SQL* }] "]
+ lappend result [list "Evals: [db_list_of_lists sel_evals { *SQL* }] "]
+
+ return $result
+}
+
+ad_proc -callback merge::MergePackageUser -impl evaluation {
+ -from_user_id:required
+ -to_user_id:required
+} {
+ Merge the entries of two users.
+ The from_user_id is the user_id of the user
+ that will be deleted and all the items
+ of this user will be mapped to the to_user_id.
+} {
+ set msg "Merging evaluation"
+ set result [list $msg]
+ ns_log Notice $msg
+
+ db_transaction {
+ db_dml upd_from_answers { *SQL* }
+ db_dml upd_from_stud_evals { *SQL* }
+ }
+
+ lappend result "Evaluation merge is done"
+}
+
+
Index: openacs-4/packages/evaluation/tcl/evaluation-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-callback-procs.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/evaluation/tcl/evaluation-callback-procs.xql 19 Jul 2005 17:03:54 -0000 1.1.2.1
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+ select answer_id
+ from evaluation_answers
+ where party_id = :user_id
+
+
+
+
+
+ select evaluation_id, grade
+ from evaluation_student_evals
+ where party_id = :user_id
+
+
+
+
+
+ update evaluation_answers
+ set party_id = :to_user_id
+ where party_id = :from_user_id
+
+
+
+
+
+ update evaluation_student_evals
+ set party_id = :to_user_id
+ where party_id = :from_user_id
+
+
+
+
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v
diff -u -N -r1.31.2.6 -r1.31.2.7
--- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 7 Jul 2005 23:15:14 -0000 1.31.2.6
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 19 Jul 2005 17:03:54 -0000 1.31.2.7
@@ -1240,44 +1240,5 @@
}
-
-ad_proc -callback merge::MergeShowUserInfo -impl evaluation {
- -user_id:required
-} {
- Show the evaluation items of user_id
-} {
- set msg "Evaluation items"
- set result [list $msg]
- ns_log Notice $msg
-
- lappend result [list "Answers: [db_list sel_answers { *SQL* }] "]
- lappend result [list "Evals: [db_list_of_lists sel_evals { *SQL* }] "]
-
- return $result
-}
-
-ad_proc -callback merge::MergePackageUser -impl evaluation {
- -from_user_id:required
- -to_user_id:required
-} {
- Merge the entries of two users.
- The from_user_id is the user_id of the user
- that will be deleted and all the items
- of this user will be mapped to the to_user_id.
-} {
- set msg "Merging evaluation"
- set result [list $msg]
- ns_log Notice $msg
-
- db_transaction {
- db_dml upd_from_answers { *SQL* }
- db_dml upd_from_stud_evals { *SQL* }
- }
-
- lappend result "Evaluation merge is done"
-}
-
-
-
ad_register_proc GET /grades-sheet-csv* evaluation::generate_grades_sheet
ad_register_proc POST /grades-sheet-csv* evaluation::generate_grades_sheet
\ No newline at end of file
Index: openacs-4/packages/evaluation/tcl/evaluation-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.xql,v
diff -u -N -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/evaluation/tcl/evaluation-procs.xql 16 Jun 2005 23:59:53 -0000 1.3.2.3
+++ openacs-4/packages/evaluation/tcl/evaluation-procs.xql 19 Jul 2005 17:03:54 -0000 1.3.2.4
@@ -223,36 +223,5 @@
-
-
- select answer_id
- from evaluation_answers
- where party_id = :user_id
-
-
-
-
-
- select evaluation_id, grade
- from evaluation_student_evals
- where party_id = :user_id
-
-
-
-
-
- update evaluation_answers
- set party_id = :to_user_id
- where party_id = :from_user_id
-
-
-
-
-
- update evaluation_student_evals
- set party_id = :to_user_id
- where party_id = :from_user_id
-
-
-
+