Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-f.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-f.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-f.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-fu.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-fu.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-display-fu.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-fu.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-fu.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/lib/item-show-fu.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/assessment/lib/item-show-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-mc.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/assessment/lib/item-show-mc.tcl	31 May 2005 23:13:00 -0000	1.7.2.1
+++ openacs-4/packages/assessment/lib/item-show-mc.tcl	4 Jul 2005 15:02:23 -0000	1.7.2.2
@@ -24,7 +24,7 @@
     incr count
     set options ""
     if {$count < $total} {
-	append options " <a href=\\\"item-mc-edit-choices-swap?assessment_id=$assessment_id&section_id=$section_id&as_item_id=$as_item_id&mc_id=$as_item_type_id&sort_order=$sort_order&direction=down\\\"><img src=\\\"/resources/assessment/down.gif\\\" border=0 alt=\\\"[_ assessment.Move_Down]\\\"></a>"
+	append options " <a href=\\\"item-edit-mc-choices-swap?assessment_id=$assessment_id&section_id=$section_id&as_item_id=$as_item_id&mc_id=$as_item_type_id&sort_order=$sort_order&direction=down\\\"><img src=\\\"/resources/assessment/down.gif\\\" border=0 alt=\\\"[_ assessment.Move_Down]\\\"></a>"
     }
     if {$count > 1} {
 	append options " <a href=\\\"item-edit-mc-choices-swap?assessment_id=$assessment_id&section_id=$section_id&as_item_id=$as_item_id&mc_id=$as_item_type_id&sort_order=$sort_order&direction=up\\\"><img src=\\\"/resources/assessment/up.gif\\\" border=0 alt=\\\"[_ assessment.Move_Up]\\\"></a>"
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/assessment/lib/session-items.adp	15 Mar 2005 22:46:15 -0000	1.7
+++ openacs-4/packages/assessment/lib/session-items.adp	4 Jul 2005 15:02:23 -0000	1.7.2.1
@@ -77,7 +77,7 @@
               <else><br><b>#assessment.not_answered#</b> </else>
             </else>
             <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
-            <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
+            <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@"> 
           </if>
         </if>
       </td>
@@ -101,8 +101,11 @@
         </else>
       </if>
       <elseif @items.presentation_type@ eq fitb>
-        <td>@items.html;noquote@
+        <td>@items.html;noquote@ 
       </elseif>
+      <elseif @items.presentation_type@ eq f>
+      <a href= "@items.view@" onclick= "var w=window.open(this.href, 'newWindow', 'width=650,height=400'); return !w;"><formwidget id="response_to_item.@items.as_item_id@"></a>
+	</elseif>
       <else>
         <td colspan=10><formwidget id="response_to_item.@items.as_item_id@">
       </else>
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/assessment/lib/session-items.tcl	15 Apr 2005 17:26:45 -0000	1.7
+++ openacs-4/packages/assessment/lib/session-items.tcl	4 Jul 2005 15:02:23 -0000	1.7.2.1
@@ -7,14 +7,19 @@
 }
 
 # todo: display feedback text
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title num } items session_items {} {
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title num view} items session_items {} {
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
 
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback]
+    
 
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
     }
+    if {$presentation_type == "f"} {
+	set view "[as::item_display_$presentation_type\::view -item_id $as_item_id -session_id $session_id -section_id $section_id]"
+    }
+
     if {$presentation_type == "rb" || $presentation_type == "cb"} {
 	array set item [as::item::item_data -as_item_id $as_item_id]
 	array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
Index: openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	21 Feb 2005 14:32:55 -0000	1.9
+++ openacs-4/packages/assessment/sql/postgresql/assessment-collected-data-create.sql	4 Jul 2005 15:02:23 -0000	1.9.2.1
@@ -116,7 +116,10 @@
 		references cr_revisions,
 	-- This field stores the signed entered data
 	signed_data varchar(500),
-	points integer
+	points integer,
+	file_id integer
+		constraint as_item_data_file_id_fk
+		references cr_revisions(revision_id)
 	-- to do: figure out how attachment answers should be supported; the Attachment package is still in need of considerable help. Can we rely on it here?
 );
 
Index: openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql	15 Apr 2005 17:26:45 -0000	1.16
+++ openacs-4/packages/assessment/sql/postgresql/assessment-item-create.sql	4 Jul 2005 15:02:23 -0000	1.16.2.1
@@ -124,3 +124,18 @@
 	-- order in which the messages appear
 	sort_order	integer
 );
+
+-- File Upload Answers
+create table as_item_fu_answers (
+	choice_id       integer
+                        constraint as_item_fu_answers_id_pk
+                        primary key
+			constraint as_item_fu_answers_id_fk
+			references cr_revisions(revision_id),
+	answer_id	integer
+			constraint as_item_fu_answers_parent_id_fk
+			references as_item_type_fu(as_item_type_id),
+	file_id         integer	
+			constraint as_item_fu_file_id_fk
+			references cr_revisions(revision_id)
+);
Index: openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql	21 Feb 2005 14:32:55 -0000	1.9
+++ openacs-4/packages/assessment/sql/postgresql/assessment-item-type-create.sql	4 Jul 2005 15:02:23 -0000	1.9.2.1
@@ -165,3 +165,28 @@
 	-- the orientation between the "question part" of the Item (the title/subtext) and the "answer part" (beside-left, beside-right, bellow, above)
 	item_answer_alignment	varchar(20)
 );
+
+
+-- File Upload Item
+create table as_item_type_fu (
+	as_item_type_id		integer
+				constraint as_item_type_fu_as_item_type_id_pk
+				primary key
+				constraint as_item_type_fu_as_item_type_id_fk
+				references cr_revisions(revision_id)
+);
+
+-- File Upload Display Type
+create table as_item_display_f (
+	as_item_display_id	integer
+				constraint as_item_display_f_as_item_display_id_pk
+				primary key
+				constraint as_item_display_f_as_item_display_id_fk
+				references cr_revisions(revision_id),
+	-- field to specify other stuff like textarea dimensions
+	html_display_options	varchar(50),
+	-- an abstraction of the real size value in "small","medium","large" 
+	abs_size		varchar(10),
+	-- the orientation between the "question part" of the Item (the title/subtext) and the "answer part" (beside-left, beside-right, bellow, above)
+	item_answer_alignment	varchar(20)
+);
Index: openacs-4/packages/assessment/sql/postgresql/assessment-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-types-create.sql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/assessment/sql/postgresql/assessment-types-create.sql	23 Jan 2005 18:10:48 -0000	1.3
+++ openacs-4/packages/assessment/sql/postgresql/assessment-types-create.sql	4 Jul 2005 15:02:23 -0000	1.3.2.1
@@ -25,6 +25,8 @@
 values ('mc', 'cb');
 insert into as_item_types_map (item_type, display_type)
 values ('mc', 'sb');
+insert into as_item_types_map (item_type, display_type)
+values ('fu', 'f');
 -- insert into as_item_types_map (item_type, display_type)
 -- values ('ca', 'tb');
 -- insert into as_item_types_map (item_type, display_type)
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -r1.30.2.4 -r1.30.2.5
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl	15 Jun 2005 18:07:50 -0000	1.30.2.4
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl	4 Jul 2005 15:02:23 -0000	1.30.2.5
@@ -210,6 +210,17 @@
 # Session results
 content::type::attribute::new -content_type {as_session_results} -attribute_name {target_id} -datatype {number} -pretty_name {Target Answer} -column_spec {integer}
 content::type::attribute::new -content_type {as_session_results} -attribute_name {points} -datatype {number} -pretty_name {Points} -column_spec {integer}
+
+#File Upload Ansers
+content::type::new -content_type {as_item_type_fu} -supertype {content_revision} -pretty_name {Assessment Item Type File Upload} -pretty_plural {Assessment Item Type File Upload} -table_name {as_item_type_fu} -id_column {as_item_type_id}
+
+content::type::new -content_type {as_item_display_f} -supertype {content_revision} -pretty_name {Assessment Item Display File} -pretty_plural {Assessment Item Display File} -table_name {as_item_display_f} -id_column {as_item_display_id}
+
+# File Upload display type
+content::type::attribute::new -content_type {as_item_display_f} -attribute_name {html_display_options} -datatype {string}    -pretty_name {HTML display Options} -column_spec {varchar(50)}
+content::type::attribute::new -content_type {as_item_display_f} -attribute_name {abs_size} -datatype {string}    -pretty_name {Abstraction Real Size} -column_spec {varchar(20)}
+content::type::attribute::new -content_type {as_item_display_f} -attribute_name {box_orientation} -datatype {string}    -pretty_name {Box Orientation} -column_spec {varchar(20)}
+
 }
 
 ad_proc -public as::install::package_instantiate {
@@ -236,6 +247,9 @@
     content::folder::register_content_type -folder_id $folder_id -content_type {as_item_display_ta} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_items} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_section_display_types} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_fu_answers} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_fu} -include_subtypes t
+    content::folder::register_content_type -folder_id $folder_id -content_type {as_item_type_display_f} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_sections} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_assessments} -include_subtypes t
     content::folder::register_content_type -folder_id $folder_id -content_type {as_sessions} -include_subtypes t
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-display-fu-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-display-fu-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/assessment/tcl/as-item-form-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-form-procs.xql,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/assessment/tcl/as-item-form-procs.xql	13 Apr 2005 18:51:54 -0000	1.8
+++ openacs-4/packages/assessment/tcl/as-item-form-procs.xql	4 Jul 2005 15:02:23 -0000	1.8.2.1
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
 <queryset>
-
 </queryset>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-fu-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/tcl/as-item-type-fu-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/assessment/www/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment.tcl,v
diff -u -r1.47.2.3 -r1.47.2.4
--- openacs-4/packages/assessment/www/assessment.tcl	27 Jun 2005 14:50:16 -0000	1.47.2.3
+++ openacs-4/packages/assessment/www/assessment.tcl	4 Jul 2005 15:02:24 -0000	1.47.2.4
@@ -15,6 +15,7 @@
     {return_url:optional}
     response_to_item:array,optional,multiple,html
     {next_asm:optional}
+    {response:multiple,optional}
 } -properties {
     context:onevalue
     page_title:onevalue
@@ -312,6 +313,7 @@
 
 		# save answer
 		set response_item_id \$item_id
+                
 		db_1row process_item_type {}
 		set item_type \[string range \$item_type end-1 end\]
 		if {!\[info exists response_to_item(\$response_item_id)\]} {
@@ -325,7 +327,14 @@
                 }
 		
 		set points \[ad_decode \$points \"\" 0 \$points\]
-		as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response_to_item(\$response_item_id) -max_points \$points -allow_overwrite_p \$display(back_button_p)
+
+                set response \$response_to_item(\$response_item_id)
+
+                if { \$item_type == \"fu\" } {
+                    set response \[list  \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile)  \$response_to_item(\${response_item_id}.content-type)\]
+                }
+
+		as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p)
 	    }
 	}"
 	set after_submit "{
@@ -391,7 +400,13 @@
                 }
 
 		set points \[ad_decode \$points \"\" 0 \$points\]
-		as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response_to_item(\$response_item_id) -max_points \$points -allow_overwrite_p \$display(back_button_p)
+                set response \$response_to_item(\$response_item_id)                 
+
+                if { \$item_type == \"fu\" } {
+                    set response \[list  \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile)  \$response_to_item(\${response_item_id}.content-type)\]
+                }
+
+		as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p)
 	    }
 
 	    if {\$section_order != \$new_section_order} {
@@ -451,7 +466,14 @@
 		set item_type [string range $item_type end-1 end]
 
 		set points [ad_decode $points "" 0 $points]
-		as::item_type_$item_type\::process -type_id $item_type_id -session_id $session_id -as_item_id $response_item_id -section_id $section_id -subject_id $user_id -response "" -max_points $points -allow_overwrite_p $display(back_button_p)
+		set response \$response_to_item(\$response_item_id)\
+		
+		if { \$item_type == \"fu\" } {
+                    set response \[list  \$response_to_item(\$response_item_id) \$response_to_item(\${response_item_id}.tmpfile)  \$response_to_item(\${response_item_id}.content-type)\]
+                }
+
+		as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p)
+
 	    }
 
 	    if {$section_order != $new_section_order} {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-display-f.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-display-f.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-fu.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-fu.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-add-fu.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-fu.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/item-edit-fu.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl	31 May 2005 23:13:02 -0000	1.8.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl	4 Jul 2005 15:02:24 -0000	1.8.2.2
@@ -149,7 +149,7 @@
 				       -numeric_value \"\" \\
 				       -text_value \"\" \\
 				       -content_value \"\" \\
-				       -feedback_text \"\" 
+				       -feedback_text \"\" \\
 				       -selected_p \"\" \\
 				       -correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] \\
 				       -sort_order \$count \\
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	15 Apr 2005 17:26:46 -0000	1.6
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	4 Jul 2005 15:02:24 -0000	1.6.2.1
@@ -33,6 +33,9 @@
 set item_type [string range [db_string item_type {}] end-1 end]
 set display_type [string range [db_string display_type {}] end-1 end]
 
+if {[string eq $display_type "_f"]} {
+    set display_type f
+}
 
 ad_form -name item_edit -mode display -action item-edit-general -export { assessment_id section_id as_item_id } -form {
     {title:text(textarea) {label "[_ assessment.Title]"} {html {rows 3 cols 80}} {value $title} {help_text "[_ assessment.item_Title_help]"}}