- messed around mit customers/index.tcl

- fixed projects/index.tcl
- fixed something in HR tcl-procs
- added indices to freelancer-DB

www/customers/index.tcl

@@ -34,7 +34,7 @@ ad_page_contract {
     { order_by "Company" }
     { how_many "" }
     { view_type "all" }
-    { letter:trim "all" }
+    { letter:trim "ALL" }
     { view_name "customer_list" }
 }
 
@@ -285,7 +285,7 @@ where
 # Limit the search results to N data sets only
 # to be able to manage large sites
 #
-if {[string compare $letter "ALL"]} {
+if {[string equal $letter "ALL"]} {
 
     # Set these limits to negative values to deactivate them
     set total_in_limited -1
@@ -294,9 +294,9 @@ if {[string compare $letter "ALL"]} {
 
 } else {
 
-    set limited_query [im_select_row_range $sql $start_idx $end_idx]
+    set limited_query [im_select_row_range "$sql $order_by_clause" $start_idx $end_idx]
     # We can't get around counting in advance if we want to be able to 
-    # sort inside the table on the page for only those users in the 
+    # sort inside the table on the page for only those rows in the 
     # query results
     set total_in_limited [db_string projects_total_in_limited "
 	select count(*) 
@@ -308,14 +308,9 @@ if {[string compare $letter "ALL"]} {
 		$where_clause
 	"]
     
-    set selection "$sql $order_by_clause"
-
-#    set selection "select z.* from ($limited_query) z $order_by_clause"
+    set selection "select z.* from ($limited_query) z $order_by_clause"
 }	
 
-ns_log Notice $selection
-
-
 # ----------------------------------------------------------
 # Do we have to show administration links?
 
@@ -372,10 +367,8 @@ set bgcolor(0) " class=roweven "
 set bgcolor(1) " class=rowodd "
 set ctr 0
 set idx $start_idx
-db_foreach projects_info_query $selection {
 
-#    im_customer_permissions $user_id $customer_id customer_view customer_read customer_write customer_admin
-#    if {!$customer_read} { continue }
+db_foreach projects_info_query $selection {
 
     # Append together a line of data based on the "column_vars" parameter list
     append table_body_html "<tr$bgcolor([expr $ctr % 2])>\n"

www/projects/index.tcl

@@ -39,7 +39,7 @@ ad_page_contract {
     { project_type_id:integer "0" } 
     { user_id_from_search "0"}
     { customer_id:integer "0" } 
-    { letter:trim "all" }
+    { letter:trim "" }
     { start_idx:integer "1" }
     { how_many "" }
     { view_name "project_list" }
@@ -92,6 +92,9 @@ set page_focus "im_header_form.keywords"
 
 set letter [string toupper $letter]
 
+set org_project_type_id $project_type_id
+
+
 # Determine the default status if not set
 if { [empty_string_p $status_id] } {
     # Default status is open
@@ -336,6 +339,7 @@ WHERE
 		perm.permission_member > 0
 		$mine_restriction
 	)
+$order_by_clause
 "
 
 
@@ -349,12 +353,15 @@ WHERE
 
 ns_log Notice "/intranet/project/index: Before limiting clause"
 
-if {[string compare $letter "ALL"]} {
+if {[string equal $letter "ALL"]} {
+
     # Set these limits to negative values to deactivate them
     set total_in_limited -1
     set how_many -1
     set selection "select z.* from ($sql) z $order_by_clause"
+
 } else {
+
     set limited_query [im_select_row_range $sql $start_idx $end_idx]
 
     # We can't get around counting in advance if we want to be able to 
@@ -366,6 +373,7 @@ if {[string compare $letter "ALL"]} {
         where 1=1 $where_clause"]
 
     set selection "select z.* from ($limited_query) z $order_by_clause"
+
 }	
 
 # ---------------------------------------------------------------
@@ -380,7 +388,7 @@ ns_log Notice "/intranet/project/index: Before formatting filter"
 
 set filter_html "
 <form method=get action='/intranet/projects/index'>
-[export_form_vars start_idx order_by how_many view_name include_subprojects_p letter]
+[export_form_vars customer_id start_idx order_by how_many view_name include_subprojects_p letter]
 
 <table border=0 cellpadding=0 cellspacing=0>
   <tr> 
@@ -608,9 +616,11 @@ set table_continuation_html "
 # Navbar
 # ---------------------------------------------------------------
 
+set project_type_id $org_project_type_id
+
 set project_navbar_html "
 <br>
-[im_project_navbar $letter "/intranet/projects/index" $next_page_url $previous_page_url [list start_idx order_by how_many view_name letter]]
+[im_project_navbar $letter "/intranet/projects/index" $next_page_url $previous_page_url [list start_idx order_by customer_id status_id project_type_id how_many view_name letter]]
 "