-- added status of projects shown

   show all projects, not ony active
   show warning when number of items exceeds limit

lib/company-projects.adp

 
-
-
+@warning;noquote@
 <multiple name="active_projects">
   <if @active_projects.llevel@ gt @active_projects.current_level@>
     <ul>
@@ -10,7 +9,7 @@
   </if>  
     
   <li><a href=../projects/view?project_id=@active_projects.project_id@>@active_projects.project_nr@</a>: 
-	@active_projects.project_name@
+	@active_projects.project_name@ (@active_projects.project_status_name;noquote@)
 </multiple>
 
 <if @close_ul_p@>

lib/company-projects.tcl

@@ -22,40 +22,38 @@ set projects_html ""
 set current_level 1
 set ctr 1
 set max_projects 15
-
+set project_status_name ""
+set warning ""
 
 # -- 
 #db_multirow starts here. it still is a draft and it is not finished.
-set where_clause1 "[im_project_status_canceled]"
-set where_clause2 "[im_project_status_deleted]"
-
 
 set where_clause3 "[im_project_type_task]"
 set where_clause4 "[im_project_type_ticket]"
 
-db_multirow -extend {llevel current_level} active_projects select_projects {} {
+db_multirow -extend {llevel current_level project_status_name} active_projects select_projects {} {
 
-#    ns_log Notice "db_multirow begin"
-#    ns_log Notice "level=$llevel | $current_level"
     if { $llevel > $current_level } {
 	incr current_level
     } elseif { $llevel < $current_level } {
 	set current_level [expr $current_level - 1]
     }
 
+    set project_status_name [im_category_from_id $project_status_id]
+    lappend tt [im_category_from_id $project_status_id] 
     set project_url [export_vars -base "../projects/view" {project_id}]
 
- #   ns_log Notice "name=$project_name | $project_nr | project_url"
-    
     incr ctr
-    if {$ctr > $max_projects} { break }
+    if {$ctr > $max_projects} { 
+	set warning  "<p class=\"warning\">[lang::message::lookup "" intranet-core.NumberOfItemsExceedsLimit "Please note: Only a subset of items is shown, total number exceeds limit"]</p>"
+	break 
+    }
 }
 
-
 set close_ul_p 0
 if { [exists_and_not_null level] && $llevel < $current_level } {
     set close_ul_p 1
 }
 
-
-set projects_html [im_table_with_title "[_ intranet-core.Projects]" "<ul>$projects_html</ul>"]
\ No newline at end of file
+# KH: ... this is obsolete
+# set projects_html [im_table_with_title "[_ intranet-core.Projects]" "$warning<ul>$projects_html</ul>"]

lib/company-projects.xql

 <?xml version="1.0"?>
 <!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "/usr/share/emacs/DTDs/xql.dtd">
 
-
 <queryset>
   <rdbms>
     <type>postgresql</type>
@@ -9,7 +8,6 @@
   </rdbms>
   <fullquery name="select_projects">
     <querytext>
-
 	select
 		p.*,
 		1 as llevel
@@ -18,10 +16,6 @@
 	where 
 		p.company_id = :company_id
 	        and p.parent_id is null
-		and p.project_status_id not in (
-		:where_clause1
-		:where_clause2
-		)
 		and p.project_type_id not in (
 		:where_clause3
 		:where_clause4