Index: openacs-4/packages/ae-portlet/www/ae-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/www/ae-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ae-portlet/www/ae-portlet.tcl	9 Jun 2005 05:54:36 -0000	1.1
+++ openacs-4/packages/ae-portlet/www/ae-portlet.tcl	4 Feb 2006 13:49:38 -0000	1.2
@@ -14,99 +14,108 @@
 set shaded_p $config(shaded_p)
 
 set list_of_package_ids $config(package_id)
-set package_id [lindex $list_of_package_ids 0]        
 set user_id [ad_conn user_id]
-set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"]
 set dotlrn_admin_p [dotlrn::admin_p -user_id $user_id]
 
-set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
+set community_id [dotlrn_community::get_community_id]
 
-set elements [list]
-if {!$one_instance_p} {
-    set elements [list community_name \
-		      [list \
-			   label "[_ dotlrn.Community]" \
-			   display_template {<if @assessments.community_name@ not nil>@assessments.community_name@</if><else>&nbsp;</else>}]]
+set groupby community_name
+
+if { $community_id eq "" } {
+    set groupby_list {
+	label "[_ ae-portlet.Class]"
+	type multivar
+	values { { "[_ ae-portlet.Class]" { {groupby community_name} } } }
+    }
+} else {
+    set groupby_list [list]
 }
 
-lappend elements title \
-    [list \
-	 label "[_ assessment.open_assessments]" \
-	 display_template {<a href="@assessments.assessment_url@">@assessments.title@</a>}]
-
-
-# create a list with all open assessments
 template::list::create \
     -name assessments \
     -multirow assessments \
-    -key assessment_id \
-    -elements $elements \
-    -main_class narrow
-
-# get the information of all open assessments
-template::multirow create assessments assessment_id title description assessment_url community_url community_name
-set old_comm_node_id 0
-db_foreach open_asssessments {} {
-    if {([empty_string_p $start_time] || $start_time <= $cur_time) && ([empty_string_p $end_time] || $end_time >= $cur_time)} {
-	if {$comm_node_id == $old_comm_node_id} {
-	    set community_name ""
+    -page_flush_p 1 \
+    -html { width 100% } \
+    -pass_properties { package_admin_p } \
+    -elements {
+	title {
+	    label ""
+	    link_url_col assessment_url
 	}
-	set community_url [site_node::get_url -node_id $comm_node_id]
-	set assessment_url [site_node::get_url -node_id $as_node_id]
-	set old_comm_node_id $comm_node_id
-
-	if {[empty_string_p $password]} {
-	    append assessment_url [export_vars -base "assessment" {assessment_id}]
-	} else {
-	    append assessment_url [export_vars -base "assessment-password" {assessment_id}]
+	actions {
+	    label ""
+	    display_template {
+		<if @assessments.session_id@ ne "">
+		<if @assessments.completed_datetime@ eq "">
+		<a href="@assessments.assessment_url;noquote@">#ae-portlet.Finish_Evaluation#</a>
+		</if>
+		<else>
+		<a href="@assessments.edit_response_url;noquote@"><img border=0 src=/resources/Edit16.gif> #ae-portlet.Edit_Your_Response#</a> | <a href="@assessments.view_url;noquote@"><img border=0 src=/resources/Zoom16.gif> #ae-portlet.View_Your_Response#</a>
+		</else>
+		</if>
+		<else>
+		<a href="@assessments.assessment_url;noquote@">#ae-portlet.Take_Evaluation#</a>
+		</else>		    
+		<br />#ae-portlet.Anonymous# <if @package_admin_p@><if @assessments.anonymous_p@ eq "f"><a href="@assessments.anonymous_url;noquote@">#assessment.yes#</a>/<b>#assessment.no#</b></if><else><b>#assessment.yes#</b>/<a href="@assessments.anonymous_url;noquote@">#assessment.no#</a></else>
+		</if><else><if @assessments.anonymous_p@ eq "f"><b>#assessment.no#</b></if><else><b>#assessment.yes#</b></else></else>
+		<if @package_admin_p@>
+		| <a href="@assessments.status_url;noquote@">#ae-portlet.Unpublish#</a> | <a href="@assessments.edit_url;noquote@">#ae-portlet.Edit_Evaluation#</a> | <a href="@assessments.results_url;noquote@">#ae-portlet.Results#</a>
+		</if>
+	    }
 	}
+    } \
+    -groupby $groupby_list
 
-	template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name
-    }
-}
+set status_clause "and not ci.live_revision is null"
+db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url } assessments answered_assessments {} {
 
+    set base_url [site_node::get_url_from_object_id -object_id $package_id]
+    set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"]
 
-set elements [list]
-if {!$one_instance_p} {
-    set elements [list community_name \
-		      [list \
-			   label "[_ dotlrn.Community]" \
-			   display_template {<if @sessions.community_name@ not nil>@sessions.community_name@</if><else>&nbsp;</else>}]]
+    set assessment_url [export_vars -base ${base_url}assessment { assessment_id }]
+    set edit_response_url [export_vars -base ${base_url}assessment { assessment_id session_id }]
+    set view_url [export_vars -base ${base_url}session { assessment_id session_id }]
+    set status_url [export_vars -base ${base_url}asm-admin/toggle-status { assessment_id {return_url [ad_return_url]} }]
+    set anonymous_url [export_vars -base ${base_url}asm-admin/toggle-anonymous { {assessment_id $assessment_rev_id} {return_url [ad_return_url]} }]
+
+    set edit_url [export_vars -base ${base_url}asm-admin/assessment-form { assessment_id }]
+    set results_url [export_vars -base ${base_url}sessions { assessment_id }]
 }
 
-lappend elements title \
-    [list \
-	 label "[_ assessment.Assessments]"] \
+if { $community_id ne "" } {
+    set package_id [dotlrn_community::get_package_id $community_id]
+    set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"]
+    if { $package_admin_p } {
+	set base_url [site_node::get_url_from_object_id -object_id $package_id]
 
-lappend elements edit\
-    [list \
-	  display_template {<center><a href=anon-eval/assessment?assessment_id=@sessions.assessment_id@&session_id=@sessions.session_id@><img border=0 src=/resources/Edit16.gif></a></center>}
-    ]
+	template::list::create \
+	    -name unpublished_assessments \
+	    -multirow unpublished_assessments \
+	    -page_flush_p 1 \
+	    -html { width 100% } \
+	    -pass_properties { package_admin_p } \
+	    -actions [list "#assessment.New_Assessment#" ${base_url}asm-admin/assessment-form "#assessment.New_Assessment#"] \
+	    -elements {
+		title {
+		    label ""
+		    link_url_col assessment_url
+		}
+		actions {
+		    label ""
+		    display_template {
+			#ae-portlet.Anonymous# <if @unpublished_assessments.anonymous_p@ eq "f"><a href="@unpublished_assessments.anonymous_url;noquote@">#assessment.yes#</a>/<b>#assessment.no#</b></if><else><b>#assessment.yes#</b>/<a href="@unpublished_assessments.anonymous_url;noquote@">#assessment.no#</a></else> | <a href="@unpublished_assessments.status_url;noquote@">#ae-portlet.Publish#</a> | <a href="@unpublished_assessments.edit_url;noquote@">#ae-portlet.Edit_Evaluation#</a> | <a href="@unpublished_assessments.results_url;noquote@">#ae-portlet.Results#</a>
+		    }
+		}
+	    }
 
-lappend elements view \
-    [list \
-	 display_template {<center><a href=anon-eval/session?assessment=@sessions.assessment_id@&session_id=@sessions.session_id@><img border=0 src=/resources/Zoom16.gif></a></center>}
-    ]
+	set status_clause "and ci.live_revision is null"
+	db_multirow -extend { edit_url assessment_url status_url anonymous_url edit_url results_url } unpublished_assessments answered_assessments {} {
+	    set assessment_url [export_vars -base ${base_url}assessment { assessment_id }]
+	    set status_url [export_vars -base ${base_url}asm-admin/toggle-status { assessment_id {return_url [ad_return_url]} }]
+	    set anonymous_url [export_vars -base ${base_url}asm-admin/toggle-anonymous { {assessment_id $assessment_rev_id} {return_url [ad_return_url]} }]
 
-# create a list with all answered assessments and their sessions
-template::list::create \
-    -name sessions \
-    -multirow sessions \
-    -key assessment_id \
-    -elements $elements \
-    -main_class narrow
-
-# get the information of all assessments store in the database
-set old_comm_node_id 0
-db_multirow -extend { session_id session_url community_url } sessions answered_assessments {} {
-    if {$comm_node_id == $old_comm_node_id} {
-	set community_name ""
+	    set edit_url [export_vars -base ${base_url}asm-admin/assessment-form { assessment_id }]
+	    set results_url [export_vars -base ${base_url}sessions { assessment_id }]
+	}
     }
-    as::assessment::data -assessment_id $assessment_id
-    set assessment_rev_id $assessment_data(assessment_rev_id)
-    set session_id [db_string last_session {select max(session_id) as session_id from as_sessions where assessment_id = :assessment_rev_id  and subject_id = :user_id}]
-
-    set community_url [site_node::get_url -node_id $comm_node_id]
-    set session_url "[site_node::get_url -node_id $as_node_id][export_vars -base sessions {assessment_id}]"
-    set old_comm_node_id $comm_node_id
-}
+}
\ No newline at end of file