Index: openacs-4/packages/assessment/www/last-session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/last-session.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/last-session.tcl	22 Dec 2004 10:57:15 -0000	1.2
+++ openacs-4/packages/assessment/www/last-session.tcl	1 Feb 2005 15:25:25 -0000	1.3
@@ -7,119 +7,115 @@
 	@author Eduardo P�rez Ureta (eperez@it.uc3m.es)
 	@creation-date 2004-09-03
 } {
-  assessment_id:notnull
+    assessment_id:notnull
+    {subject_id:integer,optional ""}
 } -properties {
-	context:onevalue
-	assessment_info:multirow
+    context:onevalue
+    assessment_info:multirow
 }
 
 set context [list "[_ assessment.Show_Sessions]"]
 
 set package_id [ad_conn package_id]
 
-#get the user that take an assessment
-set subject_id [ad_conn user_id]
+if {[empty_string_p $subject_id]} {
+    set subject_id [ad_conn user_id]
+}
 
-#if it's an assessment or a survey
-set assessment_or_survey [db_string assessment_or_survey {
-    SELECT survey_p
-    FROM as_assessmentsx
-    WHERE assessment_id = :assessment_id
-}]
+# Get the assessment data
+as::assessment::data -assessment_id $assessment_id
 
-#Lists the identifier of sessions, the name of subjects that took this assessment, the name of assessment and the finished time 
-#of assessment for an assessment.
-if {$assessment_or_survey == {t}} {
-template::list::create \
-    -name sessions \
-    -multirow sessions \
-    -pass_properties { package_id } \
-    -key sessions_id \
-    -elements {
-         session_id {
-	    label {[_ assessment.Session]}
-	    link_url_eval {[export_vars -base "session" {session_id}]}
-	}
-        subject_name {
-	    label {[_ assessment.Subject_Name]}
-            link_url_eval {[acs_community_member_url -user_id $subject_id]}
+if {![info exists assessment_data(assessment_id)]} {
+    ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
+    ad_script_abort
+}
 
-        }
-	assessment_name {
-	    label {Assessment}
-	    link_url_eval {[export_vars -base "assessment" {assessment_id}]}
+set assessment_rev_id $assessment_data(assessment_rev_id)
+
+if {$assessment_data(survey_p) == "t"} {
+    # Lists the identifier of sessions, the name of subjects that took this assessment,
+    # the name of assessment and the finished time
+    # of assessment for an assessment.
+
+    template::list::create \
+	-name sessions \
+	-multirow sessions \
+	-pass_properties { package_id } \
+	-key sessions_id \
+	-elements {
+	    session_id {
+		label {[_ assessment.Session]}
+		link_url_eval {[export_vars -base "session" {session_id}]}
+	    }
+	    subject_name {
+		label {[_ assessment.Subject_Name]}
+		link_url_eval {[acs_community_member_url -user_id $subject_id]}
+	    }
+	    assessment_name {
+		label {Assessment}
+		link_url_eval {[export_vars -base "assessment" {assessment_id}]}
+	    }
+	    completed_datetime {
+		label {[_ assessment.Finish_Time]}
+		html {nowrap}
+	    }
+	    other_sessions {
+		label {[_ assessment.Other_Sessions]}
+		link_url_eval {[site_node::get_url_from_object_id -object_id $package_id]sessions?[export_vars {assessment_id subject_id}]}
+	    }
+	} -main_class {
+	    narrow
 	}
-	completed_datetime {
-	    label {[_ assessment.Finish_Time]}
-	    html {nowrap}
-	}
-	other_sessions {
-	    label {[_ assessment.Other_Sessions]}
-	    link_url_eval {[site_node::get_url_from_object_id -object_id $package_id]sessions?[export_vars {assessment_id subject_id}]}
-	}
-    } \
-    -main_class {
-        narrow
-    }
 } else {
     template::list::create \
-    -name sessions \
-    -multirow sessions \
-    -pass_properties { package_id } \
-    -key sessions_id \
-    -elements {
-         session_id {
-	    label {[_ assessment.Session]}
-	    link_url_eval {[export_vars -base "session" {session_id}]}
+	-name sessions \
+	-multirow sessions \
+	-pass_properties { package_id } \
+	-key sessions_id \
+	-elements {
+	    session_id {
+		label {[_ assessment.Session]}
+		link_url_eval {[export_vars -base "session" {session_id}]}
+	    }
+	    subject_name {
+		label {[_ assessment.Subject_Name]}
+		link_url_eval {[acs_community_member_url -user_id $subject_id]}
+	    }
+	    assessment_name {
+		label {Assessment}
+		link_url_eval {[export_vars -base "assessment" {assessment_id}]}
+	    }
+	    completed_datetime {
+		label {[_ assessment.Finish_Time]}
+		html {nowrap}
+	    }
+	    percent_score {
+		label {[_ assessment.Percent_Score]}
+		html {nowrap}
+	    }
+	    other_sessions {
+		label {[_ assessment.Other_Sessions]}
+		link_url_eval {[site_node::get_url_from_object_id -object_id $package_id]sessions?[export_vars {assessment_id subject_id}]}
+	    }
+	} \
+	-main_class {
+	    narrow
 	}
-        subject_name {
-	    label {[_ assessment.Subject_Name]}
-            link_url_eval {[acs_community_member_url -user_id $subject_id]}
-
-        }
-	assessment_name {
-	    label {Assessment}
-	    link_url_eval {[export_vars -base "assessment" {assessment_id}]}
-	}
-	completed_datetime {
-	    label {[_ assessment.Finish_Time]}
-	    html {nowrap}
-	}
-	percent_score {
-	    label {[_ assessment.Percent_Score]}
-	    html {nowrap}
-	}
-	other_sessions {
-	    label {[_ assessment.Other_Sessions]}
-	    link_url_eval {[site_node::get_url_from_object_id -object_id $package_id]sessions?[export_vars {assessment_id subject_id}]}
-	}
-    } \
-    -main_class {
-        narrow
-    }
 }
 
-set admin_p [ad_permission_p $package_id admin]
 
-set assessment_id_multi $assessment_id
+
 #if the user is admin he will display all sessions from all subjects
-if { $admin_p } {
-db_multirow -extend { item_url assessment_id other_sessions } sessions sessions_of_assessment {
-} {
-    set item_url [export_vars -base "session" {session_id}]
-    set assessment_id $assessment_id_multi
-    set other_sessions "[_ assessment.View_Other_Sessions]"
-}
-#if the user is not admin he will display only his sessions
+if {[ad_permission_p [acs_magic_object "security_context_root"] "admin"]} {
+    set query "sessions_of_assessment_of_subject"
 } else {
-db_multirow -extend { item_url assessment_id other_sessions } sessions sessions_of_assessment_of_subject {
+    set query "sessions_of_assessment"
+}
+
+db_multirow -extend { item_url assessment_id } sessions $query {
 } {
     set item_url [export_vars -base "session" {session_id}]
-    set assessment_id $assessment_id_multi
-    set other_sessions "[_ assessment.View_Other_Sessions]"
 }
-}
 
-set admin_p [ad_permission_p $package_id admin]
 
 ad_return_template