Admin reports search.

4 files changed, 52 insertions, 22 deletions

diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html
index e9a0ac04a..d837919ad 100644
--- a/templates/web/zurich/admin/header.html
+++ b/templates/web/zurich/admin/header.html
@@ -11,7 +11,7 @@ select { width: auto; }
     <a href="/admin/summary">[% loc('Summary') %]</a>
 [% IF admin_type == 'dm' OR admin_type == 'super' %]
     | <a href="/admin/bodies">[% loc('Bodies') %]</a>
-    <!-- | <a href="/admin/reports">[% loc('Reports') %]</a> -->
+    | <a href="/admin/reports">[% loc('Reports') %]</a>
     <!-- | <a href="timeline">Timeline</a> -->
     <!-- | <a href="questionnaire">Survey</a> -->
     <!-- | <a href="/admin/users">[% loc('Users') %]</a> -->
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index c24e39563..9916dc1b7 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -1,16 +1,5 @@
 [% INCLUDE 'admin/header.html' title=loc('Summary') -%]
 [% PROCESS 'admin/report_blocks.html' %]
-[%
-    states = {
-        'unconfirmed' = loc('Submitted'),
-        'confirmed' = loc('Open'),
-        'in progress' = loc('In progress'),
-        'planned' = loc('Planned'),
-        'fixed - council' = loc('Closed'),
-        'hidden' = loc('Hidden'),
-        'closed' = loc('Closed'),
-    }
-%]
 
 [% status_message %]
 
@@ -35,15 +24,6 @@
         <th>[% loc('Created') %]</th>
         <th>*</th>
     </tr>
-[%- FOR problem IN problems %]
-    <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
-        <td>[% problem.id %]</td>
-        <td>[% PROCESS value_or_nbsp value=problem.title %]</td>
-        <td>[% states.${problem.state} %]</td>
-        <td>[% problem.category %]</td>
-        <td>[% PROCESS format_time time=problem.created %]</td>
-        <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
-    </tr>
-[%- END -%]
+[% INCLUDE 'admin/problem_row.html' %]
 </table>
 [% END %]
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
new file mode 100644
index 000000000..fc667c0d7
--- /dev/null
+++ b/templates/web/zurich/admin/problem_row.html
@@ -0,0 +1,25 @@
+[%
+    states = {
+        'unconfirmed' = loc('Submitted'),
+        'confirmed' = loc('Open'),
+        'in progress' = loc('In progress'),
+        'planned' = loc('Planned'),
+        'fixed - council' = loc('Closed'),
+        'hidden' = loc('Hidden'),
+        'closed' = loc('Closed'),
+    }
+%]
+[%- FOR problem IN problems %]
+    <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
+        <td>[%- IF problem.is_visible -%]
+        <a href="[% c.uri_for_email( '/report', problem.id ) %]">[% problem.id %]</a>
+        [%- ELSE %]
+        [%- problem.id %]
+        [%- END -%]</td>
+        <td>[% PROCESS value_or_nbsp value=problem.title %]</td>
+        <td>[% states.${problem.state} %]</td>
+        <td>[% PROCESS value_or_nbsp value=problem.category %]</td>
+        <td>[% PROCESS format_time time=problem.created %]</td>
+        <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+    </tr>
+[%- END -%]
diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html
new file mode 100644
index 000000000..372e94367
--- /dev/null
+++ b/templates/web/zurich/admin/reports.html
@@ -0,0 +1,25 @@
+[% INCLUDE 'admin/header.html' title=loc('Search Reports') %]
+[% PROCESS 'admin/report_blocks.html' %]
+
+<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search">
+</form>
+
+[% IF searched %]
+<table cellspacing="0" cellpadding="2" border="1">
+    <tr>
+        <th>[% loc('ID') %]</th>
+        <th>[% loc('Title') %]</th>
+        <th>[% loc('State') %]</th>
+        <th>[% loc('Category') %]</th>
+        <th>[% loc('Created') %]</th>
+        <th>*</th>
+    </tr>
+    [% INCLUDE 'admin/problem_row.html' %]
+</table>
+
+[% INCLUDE 'admin/list_updates.html' %]
+
+[% END %]
+
+[% INCLUDE 'admin/footer.html' %]