Commit d23bfb57 authored by Daniel Friesel's avatar Daniel Friesel
Browse files

train details: replace HAFAS 'Information'/'Störung' messages with icons

parent 76c1bffa

lib/DBInfoscreen/Controller/Stationboard.pm

+34 −10
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ sub format_iris_result_info { 
		if ( $template ne 'json' ) {

			push(

				@{$moreinfo},

				[ 'Außerplanmäßiger Halt in', $additional_line ]

				[ 'Außerplanmäßiger Halt in', { text => $additional_line } ]

			);

		}

	}
@@ -517,7 +517,7 @@ sub format_iris_result_info { 
		$info

		  = 'Ohne Halt in: ' . $cancel_line . ( $info ? ' +++ ' : q{} ) . $info;

		if ( $template ne 'json' ) {

			push( @{$moreinfo}, [ 'Ohne Halt in', $cancel_line ] );

			push( @{$moreinfo}, [ 'Ohne Halt in', { text => $cancel_line } ] );

		}

	}
@@ -781,8 +781,12 @@ sub render_train { 
				$departure->{messages}{him} = $him;

				for my $message ( @{$him} ) {

					if ( $message->{display} ) {

						push( @him_messages,

							[ $message->{header}, $message->{lead} ] );

						push(

							@him_messages,

							[

								$message->{header}, { text => $message->{lead} }

							]

						);

						if ( $message->{lead} =~ m{zuginfo.nrw/?\?msg=(\d+)} ) {

							push(

								@{ $departure->{links} },
@@ -800,6 +804,14 @@ sub render_train { 
					  = grep { $_->[0] !~ m{Information\. $m\.$} }

					  @him_messages;

				}

				for my $m (@him_messages) {

					if ( $m->[0] =~ s{: Information.}{: } ) {

						$m->[1]{icon} = 'info_outline';

					}

					if ( $m->[0] =~ s{: Störung.}{: } ) {

						$m->[1]{icon} = 'warning';

					}

				}

				unshift( @{ $departure->{moreinfo} }, @him_messages );

			}

		}
@@ -1053,8 +1065,12 @@ sub train_details { 
				my @him_messages;

				for my $message ( @{$him} ) {

					if ( $message->{display} ) {

						push( @him_messages,

							[ $message->{header}, $message->{lead} ] );

						push(

							@him_messages,

							[

								$message->{header}, { text => $message->{lead} }

							]

						);

						if ( $message->{lead} =~ m{zuginfo.nrw/?\?msg=(\d+)} ) {

							push(

								@{ $res->{links} },
@@ -1066,6 +1082,14 @@ sub train_details { 
						}

					}

				}

				for my $m (@him_messages) {

					if ( $m->[0] =~ s{: Information.}{:} ) {

						$m->[1]{icon} = 'info_outline';

					}

					if ( $m->[0] =~ s{: Störung.}{: } ) {

						$m->[1]{icon} = 'warning';

					}

				}

				$res->{moreinfo} = [@him_messages];

			}

templates/_train_details.html.ep

+9 −3
Original line number Diff line number Diff line
@@ -173,16 +173,22 @@ 
%         else {

%=          $pair->[0]->strftime('%H:%M')

%         }

          <span class="reason">

%=        $pair->[1]

          </span>

%       }

%       else {

%         if ($pair->[1]{icon}) {

            <i class="material-icons"><%= $pair->[1]{icon} %></i>

%         }

%=        $pair->[0]

%         if (length($pair->[0]) > 25) {

            <br/>

%         }

%         }

          <span class="reason">

%=      $pair->[1]

%=        $pair->[1]{text}

          </span>

%       }

        </li>

%     }

%     if ($departure->{route_info}) {