1 files changed, 22 insertions, 30 deletions
diff --git a/templates/wagenreihung.html.ep b/templates/wagenreihung.html.ep
index 493d9c6..6781dca 100644
--- a/templates/wagenreihung.html.ep
+++ b/templates/wagenreihung.html.ep
@@ -7,37 +7,10 @@
   </div>
 % }
 % else {
-  % my $has_multi_dest = 0;
-  % my $has_multi_desc = 0;
-  % if (scalar $wr->destinations > 1) {
-    % $has_multi_dest = 1;
-  % }
-  % if (scalar $wr->train_descriptions > 1) {
-    % $has_multi_desc = 1;
-  % }
   <div class="container">
     <div style="text-align: center;">
-%=    join( ' / ', $wr->origins )
-      →
-%=    join( ' / ', map { $_->{name} } $wr->destinations )
+      <%= $wr->station->{name} %> Gleis <%= $wr->platform %><br/>
     </div>
-    % if ($has_multi_dest) {
-      <div style="text-align: center;">
-        % for my $destination ($wr->destinations) {
-          Nach <%= $destination->{name} %> in Abschnitt <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
-       % }
-      </div>
-    % }
-    <%= $wr->station_name %> Gleis <%= $wr->platform %><br/>
-    % for my $desc ($wr->train_descriptions) {
-      % if ($desc->{text}) {
-        %= $desc->{text}
-        % if ($has_multi_desc and length(join(q{}, sort @{$desc->{sections}}))) {
-          in Abschnitt <%= join(q{}, sort @{$desc->{sections}}) %>
-        % }
-        <br/>
-      % }
-    % }
   </div>
   <div class="container">
     <div class="wagonorder exit-<%= stash('exit_dir') // 'unknown'%>">
@@ -49,10 +22,29 @@
           </div>
 %       }
 %     }
-%     for my $wagon ($wr->wagons) {
-%=      include '_wagon', direction => $wr->direction, wagon => $wagon, type => $wr->train_type, wref => $wref, exit_dir => stash('exit_dir');
+%     for my $group ($wr->groups) {
+%       my $first = 1;
+%       for my $wagon ($group->wagons) {
+%=        include '_wagon', wr => $wr, wagon => $wagon, first => $first, multi => (scalar $wr->destinations) - 1 + (scalar $wr->train_nos) - 1, wref => $wref, exit_dir => stash('exit_dir');
+%         $first = 0;
+%       }
 %     }
       </div>
+      <div style="text-align: center;">
+%=      join( ' / ', map { $_->{name} } $wr->origins )
+        →
+%=      join( ' / ', map { $_->{name} } $wr->destinations )
+      </div>
+    % for my $group ($wr->groups) {
+      % if ($group->description) {
+        <div style="text-align: center;">
+          %= $group->description
+          % if (scalar $wr->groups > 1 and $group->has_sections) {
+            in Abschnitt <%= join(q{}, sort $group->sections) %>
+          % }
+        </div>
+      % }
+    % }
 <!--  <div>
       Legende: ♿ Behindertengerechte Ausstattung / 🍴 Bistro/Restaurant / 🚪 Abteile vorhanden
     </div>