Index: openacs-4/packages/ecommerce/www/admin/problems/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/problems/index.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/problems/index.tcl	26 May 2002 04:36:50 -0000	1.2
@@ -1,83 +1,75 @@
-#  www/[ec_url_concat [ec_url] /admin]/problems/index.tcl
-
 ad_page_contract {
-  This page dislpays the problems in the problem log, if display_all is
-  not set then only unresolved problems are displayed.
 
-  @author Jesse Koontz (jkoontz@arsdigita.com)
-  @creation-date July 21, 1999
-  @cvs-id index.tcl,v 3.2.2.3 2000/08/18 20:23:44 stevenp Exp
-  @author ported by Jerry Asher (jerry@theashergroup.com)
+    This page dislpays the problems in the problem log, if display_all is
+    not set then only unresolved problems are displayed.
+
+    @author Jesse Koontz (jkoontz@arsdigita.com)
+    @creation-date July 21, 1999
+    @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
-  display_all:optional
+    display_all:optional
 }
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "[ad_admin_header "Potental Problems"]
+doc_body_append "
+    [ad_admin_header "Potental Problems"]
+    <h2>Potential Problems</h2>
 
-<h2>Potential Problems</h2>
+    [ad_admin_context_bar [list "[ec_url_concat [ec_url] /admin]/" Ecommerce([ec_system_name])] "Potential Problems"]
+   <hr>"
 
-[ad_admin_context_bar [list "[ec_url_concat [ec_url] /admin]/" Ecommerce([ec_system_name])] "Potential Problems"]
+set problem_count [db_string problem_count "
+    select count(*) 
+    from ec_problems_log"]
+set unresolved_problem_count [db_string unresolved_count "
+    select count(*) 
+    from ec_problems_log where resolved_date is null"]
 
-<hr>
-"
-
-set problem_count [db_string unused_all "select count(*) from ec_problems_log"]
-set unresolved_problem_count [db_string unused_null "select count(*) from ec_problems_log where resolved_date is null"]
-
 if { ![info exists display_all] } {
-    set sql_clause "and resolved_date is null"
+    set sql_clause [db_map include_resolved_date]
     doc_body_append "
-    <b>Unresolved Problems</b> <font size=-1>($unresolved_problem_count)</font> | <a href=\"index?display_all=true\">All Problems</a> <font size=-1>($problem_count)</font>
-    <p>
-    "
+        <p><b>Unresolved Problems</b> <font size=-1>($unresolved_problem_count)</font> | <a href=\"index?display_all=true\">
+           All Problems</a> <font size=-1>($problem_count)</font></p>"
 } else {
     set sql_clause ""
     doc_body_append "
-    <a href=\"index\">Unresolved Problems</a> <font size=-1>($unresolved_problem_count)</font> | <b>All Problems</b> <font size=-1>($problem_count)</font>
-    <p>
-    "
+    	<p><a href=\"index\">Unresolved Problems</a> <font size=-1>($unresolved_problem_count)</font> | 
+           <b>All Problems</b> <font size=-1>($problem_count)</font></p>"
 }
 
-doc_body_append "
-<ul>
-"
+doc_body_append "<ul>"
 
 db_foreach problems_select "
- select 
-      l.*, 
-      u.first_names || ' ' || u.last_name as user_name
- from ec_problems_log l, 
-      cc_users u
- where l.resolved_by = u.user_id(+)
-      $sql_clause
- order by problem_date asc" {
-    doc_body_append "
-    <p>
-    <li>[util_AnsiDatetoPrettyDate $problem_date] ("
+    select l.*, u.first_names || ' ' || u.last_name as user_name
+    from ec_problems_log l, cc_users u
+    where l.resolved_by = u.user_id(+)
+    $sql_clause
+    order by problem_date asc" {
 
-    if { ![empty_string_p $order_id] } {
-	doc_body_append "order #<a href=\"[ec_url_concat [ec_url] /admin]/orders/one?[export_url_vars order_id]\">$order_id</a> | "
-    }
+     doc_body_append "
+        <li>[util_AnsiDatetoPrettyDate $problem_date] ("
 
-    if { [empty_string_p $resolved_date] } {
-	doc_body_append "<a href=\"resolve?[export_url_vars problem_id]\">mark resolved</a>"
-    } else {
-	doc_body_append "resolved by [ec_admin_present_user $resolved_by $user_name] on [util_AnsiDatetoPrettyDate $resolved_date]"
-    }
+     if { ![empty_string_p $order_id] } {
+	 doc_body_append "order #<a href=\"[ec_url_concat [ec_url] /admin]/orders/one?[export_url_vars order_id]\">$order_id</a> | "
+     }
 
-    doc_body_append ")
-    <p>
-    $problem_details
-    <p>
-    "
+     if { [empty_string_p $resolved_date] } {
+	 doc_body_append "<a href=\"resolve?[export_url_vars problem_id]\">mark resolved</a>"
+     } else {
+	 doc_body_append "resolved by [ec_admin_present_user $resolved_by $user_name] on [util_AnsiDatetoPrettyDate $resolved_date]"
+     }
+
+     doc_body_append ")
+    	<p>$problem_details</p>
+	</li>"
 }
 
 doc_body_append "
-</ul>
+   </ul>
+   [ad_admin_footer]"
 
-[ad_admin_footer]
-"
 
-