Index: openacs-4/packages/evaluation/www/answer-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.tcl,v diff -u -N -r1.18.8.1 -r1.18.8.2 --- openacs-4/packages/evaluation/www/answer-add-edit.tcl 19 Aug 2014 07:35:54 -0000 1.18.8.1 +++ openacs-4/packages/evaluation/www/answer-add-edit.tcl 19 Aug 2014 07:41:45 -0000 1.18.8.2 @@ -7,10 +7,10 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull - grade_id:integer,notnull - answer_id:integer,notnull,optional - item_id:integer,notnull,optional + task_id:naturalnum,notnull + grade_id:naturalnum,notnull + answer_id:naturalnum,notnull,optional + item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional return_url:notnull Index: openacs-4/packages/evaluation/www/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-view.tcl,v diff -u -N -r1.6.6.1 -r1.6.6.2 --- openacs-4/packages/evaluation/www/evaluation-view.tcl 19 Aug 2014 07:35:54 -0000 1.6.6.1 +++ openacs-4/packages/evaluation/www/evaluation-view.tcl 19 Aug 2014 07:41:45 -0000 1.6.6.2 @@ -7,7 +7,7 @@ @creation-date Sept 2004 @cvs-id $Id$ } { - evaluation_id:integer,notnull + evaluation_id:naturalnum,notnull {return_url ""} } Index: openacs-4/packages/evaluation/www/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-view.tcl,v diff -u -N -r1.15.6.1 -r1.15.6.2 --- openacs-4/packages/evaluation/www/task-view.tcl 19 Aug 2014 07:35:54 -0000 1.15.6.1 +++ openacs-4/packages/evaluation/www/task-view.tcl 19 Aug 2014 07:41:45 -0000 1.15.6.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - grade_id:integer,notnull - task_id:integer,notnull + grade_id:naturalnum,notnull + task_id:naturalnum,notnull {return_url ""} } Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl,v diff -u -N -r1.8 -r1.8.8.1 --- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl 8 Aug 2006 21:26:42 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl 19 Aug 2014 07:41:45 -0000 1.8.8.1 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull {orderby:optional ""} } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v diff -u -N -r1.17.8.1 -r1.17.8.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 19 Aug 2014 07:35:55 -0000 1.17.8.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl 19 Aug 2014 07:41:45 -0000 1.17.8.2 @@ -7,7 +7,7 @@ @creation-date Mar 2004 @cvs_id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull max_grade:integer,notnull,optional item_ids:array,integer,optional item_to_edit_ids:array,optional @@ -28,7 +28,7 @@ comments_gs:array,optional show_student_gs:array,optional new_p_gs:array,optional - grades_sheet_item_id:integer,optional + grades_sheet_item_id:naturalnum,optional upload_file:optional {tmp_filename:optional ""} Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl,v diff -u -N -r1.11.8.1 -r1.11.8.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 19 Aug 2014 07:35:55 -0000 1.11.8.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 19 Aug 2014 07:41:45 -0000 1.11.8.2 @@ -7,7 +7,7 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull max_grade:integer,notnull item_ids:array,integer,optional item_to_edit_ids:array,integer,optional Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl,v diff -u -N -r1.9.8.1 -r1.9.8.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl 19 Aug 2014 07:35:55 -0000 1.9.8.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl 19 Aug 2014 07:41:46 -0000 1.9.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - evaluation_id:integer,notnull - task_id:integer,notnull + evaluation_id:naturalnum,notnull + task_id:naturalnum,notnull operation } Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl,v diff -u -N -r1.6 -r1.6.8.1 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl 8 Aug 2006 21:26:42 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.tcl 19 Aug 2014 07:41:46 -0000 1.6.8.1 @@ -9,8 +9,8 @@ @cvs-id $Id$ } { - evaluation_id:integer,notnull - task_id:integer,notnull + evaluation_id:naturalnum,notnull + task_id:naturalnum,notnull } set page_title "[_ evaluation.Delete_Evaluation_]" Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v diff -u -N -r1.13.6.1 -r1.13.6.2 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 19 Aug 2014 07:35:55 -0000 1.13.6.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl 19 Aug 2014 07:41:46 -0000 1.13.6.2 @@ -7,9 +7,9 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull {return_url "student-list?[export_vars -url { task_id }]"} - grade_id:optional + grade_id:naturalnum,optional } set page_title "[_ evaluation.Edit_Evaluations_]" Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl,v diff -u -N -r1.6 -r1.6.8.1 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl 8 Aug 2006 21:26:42 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.tcl 19 Aug 2014 07:41:46 -0000 1.6.8.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull } set page_title "[_ evaluation.lt_Grades_Sheet_Explanat]" Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v diff -u -N -r1.15.8.1 -r1.15.8.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 19 Aug 2014 07:35:55 -0000 1.15.8.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 19 Aug 2014 07:41:46 -0000 1.15.8.2 @@ -10,8 +10,8 @@ } { upload_file:notnull upload_file.tmpfile:notnull - task_id:integer,notnull - grades_sheet_item_id:integer,notnull + task_id:naturalnum,notnull + grades_sheet_item_id:naturalnum,notnull } -validate { csv_type_p -requires { upload_file } { if { [info exists upload_file] } { Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl,v diff -u -N -r1.10.6.1 -r1.10.6.2 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 19 Aug 2014 07:35:55 -0000 1.10.6.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 19 Aug 2014 07:41:46 -0000 1.10.6.2 @@ -10,7 +10,7 @@ } -query { {orderby:optional} - task_id:integer,notnull + task_id:naturalnum,notnull return_url } -validate { grades_sheets { Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v diff -u -N -r1.10.8.1 -r1.10.8.2 --- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 19 Aug 2014 07:35:55 -0000 1.10.8.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl 19 Aug 2014 07:41:46 -0000 1.10.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull - evaluation_id:integer,notnull + task_id:naturalnum,notnull + evaluation_id:naturalnum,notnull {evaluation_mode "edit"} } Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v diff -u -N -r1.25.6.1 -r1.25.6.2 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 19 Aug 2014 07:35:55 -0000 1.25.6.1 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 19 Aug 2014 07:41:46 -0000 1.25.6.2 @@ -10,13 +10,13 @@ @cvs-id $Id$ } { - {task_id:integer,optional ""} - {task_item_id:integer,optional ""} + {task_id:naturalnum,optional ""} + {task_item_id:naturalnum,optional ""} {show_portrait_p ""} {orderby_wa:optional} {orderby_na:optional} {orderby:optional} - {grade_id ""} + {grade_id:naturalnum ""} {class "list"} {bulk_actions ""} } -validate { Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl,v diff -u -N -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 19 Aug 2014 07:35:55 -0000 1.2.8.1 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-2.tcl 19 Aug 2014 07:41:46 -0000 1.2.8.2 @@ -3,7 +3,7 @@ ad_page_contract { Bulk edit a set tasks } { - grade_id:integer,notnull + grade_id:naturalnum,notnull no_grade:array weights:array {weight_sum "0"} Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.tcl,v diff -u -N -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.tcl 19 Aug 2014 07:35:56 -0000 1.2.8.1 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit-3.tcl 19 Aug 2014 07:41:46 -0000 1.2.8.2 @@ -3,7 +3,7 @@ ad_page_contract { Bulk edit a set tasks } { - grade_id:integer,notnull + grade_id:naturalnum,notnull {equal_grade 0} {grade_sum 0} {diff 0} Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v diff -u -N -r1.14.4.1 -r1.14.4.2 --- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 19 Aug 2014 07:35:56 -0000 1.14.4.1 +++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl 19 Aug 2014 07:41:46 -0000 1.14.4.2 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { - grade_id:integer,notnull + grade_id:naturalnum,notnull {set_task_id_live:optional ""} } Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl,v diff -u -N -r1.10 -r1.10.8.1 --- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 8 Aug 2006 21:26:42 -0000 1.10 +++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.tcl 19 Aug 2014 07:41:46 -0000 1.10.8.1 @@ -7,8 +7,8 @@ @creation-date Feb 2004 @cvs-id $Id$ } { - grade_id:integer,notnull,optional - item_id:integer,notnull,optional + grade_id:naturalnum,notnull,optional + item_id:naturalnum,notnull,optional } set user_id [ad_conn user_id] Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl,v diff -u -N -r1.8.8.1 -r1.8.8.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 19 Aug 2014 07:35:56 -0000 1.8.8.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete-2.tcl 19 Aug 2014 07:41:46 -0000 1.8.8.2 @@ -7,7 +7,7 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - grade_id:integer,notnull + grade_id:naturalnum,notnull return_url operation } Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl,v diff -u -N -r1.10 -r1.10.6.1 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 14 Mar 2008 16:22:10 -0000 1.10 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 19 Aug 2014 07:41:46 -0000 1.10.6.1 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { - grade_id:integer,notnull + grade_id:naturalnum,notnull {return_url "index"} } Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl,v diff -u -N -r1.11.8.1 -r1.11.8.2 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl 19 Aug 2014 07:35:56 -0000 1.11.8.1 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl 19 Aug 2014 07:41:47 -0000 1.11.8.2 @@ -10,7 +10,7 @@ } { {orderby ""} - grade_id:integer,notnull + grade_id:naturalnum,notnull } -validate { tasks_for_grade { if {[db_string get_tasks { *SQL* }] eq "0"} { Index: openacs-4/packages/evaluation/www/admin/grades/instructions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/instructions.tcl,v diff -u -N -r1.2 -r1.2.8.1 --- openacs-4/packages/evaluation/www/admin/grades/instructions.tcl 8 Aug 2006 21:26:42 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/grades/instructions.tcl 19 Aug 2014 07:41:47 -0000 1.2.8.1 @@ -1,6 +1,6 @@ ad_page_contract { } { - grade_id:integer,notnull + grade_id:naturalnum,notnull } db_1row grade_info {} Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl,v diff -u -N -r1.8 -r1.8.8.1 --- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl 8 Aug 2006 21:26:42 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl 19 Aug 2014 07:41:47 -0000 1.8.8.1 @@ -9,7 +9,7 @@ @cvs-id $Id$ } { - student_id:integer,notnull + student_id:naturalnum,notnull {orderby:optional ""} } Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl,v diff -u -N -r1.8.8.1 -r1.8.8.2 --- openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 19 Aug 2014 07:35:56 -0000 1.8.8.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 19 Aug 2014 07:41:47 -0000 1.8.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - evaluation_group_id:integer - task_id:integer + evaluation_group_id:naturalnum,notnull + task_id:naturalnum,notnull operation return_url } Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl,v diff -u -N -r1.8 -r1.8.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 8 Aug 2006 21:26:42 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 19 Aug 2014 07:41:47 -0000 1.8.8.1 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - evaluation_group_id:integer - task_id:integer + evaluation_group_id:naturalnum,notnull + task_id:naturalnum,notnull return_url:optional } Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl,v diff -u -N -r1.5 -r1.5.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl 8 Aug 2006 21:26:42 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl 19 Aug 2014 07:41:47 -0000 1.5.8.1 @@ -7,9 +7,9 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - evaluation_group_id:integer,notnull - task_id:integer,notnull - student_id:integer,notnull + evaluation_group_id:naturalnum,notnull + task_id:naturalnum,notnull + student_id:naturalnum,notnull } set creation_user_id [ad_conn user_id] Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl,v diff -u -N -r1.7.8.1 -r1.7.8.2 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl 19 Aug 2014 07:35:56 -0000 1.7.8.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl 19 Aug 2014 07:41:47 -0000 1.7.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - student_id:integer,notnull - task_id:integer,notnull + student_id:naturalnum,notnull + task_id:naturalnum,notnull {orderby:optional} } -validate { target_exists { Index: openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl,v diff -u -N -r1.7 -r1.7.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl 8 Aug 2006 21:26:42 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl 19 Aug 2014 07:41:47 -0000 1.7.8.1 @@ -8,8 +8,8 @@ @cvs-id $Id$ } { student_ids:array,integer,notnull - task_id:integer,notnull - evaluation_group_id:integer,notnull + task_id:naturalnum,notnull + evaluation_group_id:naturalnum,notnull group_name:notnull } -validate { students_to_work_with { Index: openacs-4/packages/evaluation/www/admin/groups/group-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.tcl,v diff -u -N -r1.7 -r1.7.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-new.tcl 8 Aug 2006 21:26:42 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/groups/group-new.tcl 19 Aug 2014 07:41:47 -0000 1.7.8.1 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { student_ids:array,integer,notnull - task_id:integer,notnull + task_id:naturalnum,notnull {return_url "one-task?[export_vars -url { task_id }]"} } -validate { students_to_work_with { Index: openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl,v diff -u -N -r1.6.8.1 -r1.6.8.2 --- openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl 19 Aug 2014 07:35:56 -0000 1.6.8.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl 19 Aug 2014 07:41:47 -0000 1.6.8.2 @@ -7,9 +7,9 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - rel_id:integer,notnull - task_id:integer,notnull - evaluation_group_id:integer,notnull + rel_id:naturalnum,notnull + task_id:naturalnum,notnull + evaluation_group_id:naturalnum,notnull } db_exec_plsql delete_relationship { *SQL* } Index: openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl,v diff -u -N -r1.6 -r1.6.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl 8 Aug 2006 21:26:42 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl 19 Aug 2014 07:41:47 -0000 1.6.8.1 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - evaluation_group_id:integer - task_id:integer + evaluation_group_id:naturalnum,notnull + task_id:naturalnum,notnull group_name:notnull } Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl,v diff -u -N -r1.7 -r1.7.8.1 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl 8 Aug 2006 21:26:42 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl 19 Aug 2014 07:41:47 -0000 1.7.8.1 @@ -7,8 +7,8 @@ @creation-date Apr 2004 @cvs-id $Id$ } { - task_id:integer,notnull - from_task_id:integer,notnull + task_id:naturalnum,notnull + from_task_id:naturalnum,notnull } -validate { no_groups { if { [db_string get_groups_for_task { *SQL* }] > 0 } { Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl,v diff -u -N -r1.9.8.1 -r1.9.8.2 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl 19 Aug 2014 07:35:56 -0000 1.9.8.1 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl 19 Aug 2014 07:41:47 -0000 1.9.8.2 @@ -7,7 +7,7 @@ @creation-date Apr 2004 @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull {orderby:optional} } Index: openacs-4/packages/evaluation/www/admin/groups/one-group.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.tcl,v diff -u -N -r1.9.8.1 -r1.9.8.2 --- openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 19 Aug 2014 07:35:56 -0000 1.9.8.1 +++ openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 19 Aug 2014 07:41:47 -0000 1.9.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer - evaluation_group_id:integer + task_id:naturalnum,notnull + evaluation_group_id:naturalnum,notnull {orderby:optional} } Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v diff -u -N -r1.11.6.1 -r1.11.6.2 --- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 19 Aug 2014 07:35:56 -0000 1.11.6.1 +++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl 19 Aug 2014 07:41:47 -0000 1.11.6.2 @@ -7,7 +7,7 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull + task_id:naturalnum,notnull {orderby:optional} {orderby_groups:optional} {return_url ""} Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v diff -u -N -r1.19.6.1 -r1.19.6.2 --- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 19 Aug 2014 07:35:56 -0000 1.19.6.1 +++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl 19 Aug 2014 07:41:47 -0000 1.19.6.2 @@ -8,13 +8,13 @@ @cvs-id $Id$ } { - task_id:integer,notnull - solution_id:integer,notnull,optional - item_id:integer,notnull,optional + task_id:naturalnum,notnull + solution_id:naturalnum,notnull,optional + item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional {solution_mode "edit"} - grade_id:integer,notnull + grade_id:naturalnum,notnull return_url {attached_p "f"} } Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v diff -u -N -r1.32.4.1 -r1.32.4.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 19 Aug 2014 07:35:57 -0000 1.32.4.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl 19 Aug 2014 07:41:48 -0000 1.32.4.2 @@ -7,9 +7,9 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - grade_id:integer,notnull - task_id:integer,notnull,optional - item_id:integer,notnull,optional + grade_id:naturalnum,notnull + task_id:naturalnum,notnull,optional + item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional {mode "edit"} Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl,v diff -u -N -r1.9 -r1.9.8.1 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 8 Aug 2006 21:26:43 -0000 1.9 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.tcl 19 Aug 2014 07:41:48 -0000 1.9.8.1 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { return_url:notnull - task_id:integer,notnull + task_id:naturalnum,notnull communities_packages_ids:array,optional item_ids:array,optional {redirect_to_groups_p 0} Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl,v diff -u -N -r1.8.8.1 -r1.8.8.2 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 19 Aug 2014 07:35:57 -0000 1.8.8.1 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete-2.tcl 19 Aug 2014 07:41:48 -0000 1.8.8.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull - grade_id:integer,notnull + task_id:naturalnum,notnull + grade_id:naturalnum,notnull operation return_url } Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl,v diff -u -N -r1.7 -r1.7.6.1 --- openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 14 Mar 2008 16:22:10 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl 19 Aug 2014 07:41:48 -0000 1.7.6.1 @@ -7,8 +7,8 @@ @cvs-id $Id$ } { - task_id:integer,notnull - grade_id:integer,notnull + task_id:naturalnum,notnull + grade_id:naturalnum,notnull return_url } Index: openacs-4/packages/evaluation/www/view/answer-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/answer-add-edit.tcl,v diff -u -N -r1.2.8.1 -r1.2.8.2 --- openacs-4/packages/evaluation/www/view/answer-add-edit.tcl 19 Aug 2014 07:35:57 -0000 1.2.8.1 +++ openacs-4/packages/evaluation/www/view/answer-add-edit.tcl 19 Aug 2014 07:41:48 -0000 1.2.8.2 @@ -7,10 +7,10 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - task_id:integer,notnull - grade_id:integer,notnull - answer_id:integer,notnull,optional - item_id:integer,notnull,optional + task_id:naturalnum,notnull + grade_id:naturalnum,notnull + answer_id:naturalnum,notnull,optional + item_id:naturalnum,notnull,optional upload_file:trim,optional upload_file.tmpfile:tmpfile,optional return_url:notnull Index: openacs-4/packages/evaluation/www/view/answer-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/answer-view.tcl,v diff -u -N -r1.3.6.1 -r1.3.6.2 --- openacs-4/packages/evaluation/www/view/answer-view.tcl 19 Aug 2014 07:35:57 -0000 1.3.6.1 +++ openacs-4/packages/evaluation/www/view/answer-view.tcl 19 Aug 2014 07:41:48 -0000 1.3.6.2 @@ -1,8 +1,8 @@ ad_page_contract { } { - grade_id:integer - task_id:integer - {answer_id ""} + grade_id:naturalnum,notnull + task_id:naturalnum,notnull + {answer_id:naturalnum ""} } set user_id [ad_conn user_id] Index: openacs-4/packages/evaluation/www/view/evaluation-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-view.tcl,v diff -u -N -r1.3.6.1 -r1.3.6.2 --- openacs-4/packages/evaluation/www/view/evaluation-view.tcl 19 Aug 2014 07:35:57 -0000 1.3.6.1 +++ openacs-4/packages/evaluation/www/view/evaluation-view.tcl 19 Aug 2014 07:41:48 -0000 1.3.6.2 @@ -7,7 +7,7 @@ @creation-date Sept 2004 @cvs-id $Id$ } { - evaluation_id:integer,notnull + evaluation_id:naturalnum,notnull {return_url ""} } Index: openacs-4/packages/evaluation/www/view/task-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-view.tcl,v diff -u -N -r1.3.6.1 -r1.3.6.2 --- openacs-4/packages/evaluation/www/view/task-view.tcl 19 Aug 2014 07:35:57 -0000 1.3.6.1 +++ openacs-4/packages/evaluation/www/view/task-view.tcl 19 Aug 2014 07:41:48 -0000 1.3.6.2 @@ -7,8 +7,8 @@ @creation-date Mar 2004 @cvs-id $Id$ } { - grade_id:integer,notnull - task_id:integer,notnull + grade_id:naturalnum,notnull + task_id:naturalnum,notnull {return_url ""} }