X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/72f19f83681b222d1606d75c90ceedc43bb545f9..HEAD:/templates/webpages/email_journal/list.html

diff --git a/templates/webpages/email_journal/list.html b/templates/webpages/email_journal/list.html
index f169aed18..435525c51 100644
--- a/templates/webpages/email_journal/list.html
+++ b/templates/webpages/email_journal/list.html
@@ -1,4 +1,4 @@
-[% USE HTML %][% USE L %][% USE LxERP %]
+[% USE HTML %][% USE L %][% USE P %][% USE LxERP %]
 
 <h1>[% FORM.title %]</h1>
 
@@ -24,12 +24,15 @@
     <th>[% L.sortable_table_header("sent_on") %]</th>
     <th>[% L.sortable_table_header("status") %]</th>
     <th>[% L.sortable_table_header("extended_status") %]</th>
+    <th>[% L.sortable_table_header("record_type") %]</th>
+    <th>[% L.sortable_table_header("obsolete") %]</th>
+    <th>[% L.sortable_table_header("linked_to") %]</th>
    </tr>
   </thead>
 
   <tbody>
   [%- FOREACH entry = ENTRIES %]
-  <tr class="listrow[% IF entry.status != 'ok' %]_error[% END %]" id="email_journal_id_[% entry.id %]">
+  <tr class="listrow[% IF entry.status == 'send_failed' %]_error[% END %]" id="email_journal_id_[% entry.id %]">
    [% IF SELF.can_view_all %]
     <td>
      [% IF entry.sender %]
@@ -39,26 +42,21 @@
      [% END %]
     </td>
    [% END %]
-   <td>
-    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
-     [%- HTML.escape(entry.from) %]
-    </a>
-   </td>
+   [% action_show_link = SELF.url_for(
+        action => 'show', id => entry.id,
+        back_to => SELF.models.get_callback(),
+   ) %]
+   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.from) %]</a></td>
    <td>[%- HTML.escape(entry.recipients) %]</td>
-   <td>
-    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
-     [%- HTML.escape(entry.subject) %]
-    </a>
-   </td>
+   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.subject) %]</a></td>
    <td>[%- HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
+   <td> [% P.email_journal.entry_status(entry) %] </td>
+   <td>[%- HTML.escape(entry.extended_status) %]</td>
+   <td>[% HTML.escape(RECORD_TYPES_TO_TEXT.${entry.record_type}) %]</td>
+   <td>[% HTML.escape(entry.obsolete_as_bool_yn) %]</td>
    <td>
-    [%- IF entry.status == 'ok' %]
-     [%- LxERP.t8('succeeded') %]
-    [% ELSE %]
-     [%- LxERP.t8('failed') %]
-    [%- END %]
+     [% P.record.simple_grouped_record_list(entry.linked_records) %]
    </td>
-   <td>[%- HTML.escape(entry.extended_status) %]</td>
   </tr>
   [%- END %]
   </tbody>