X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FPresenter%2FText.pm;h=af3732309e777c149612062498851d10f6590bfd;hb=d4557a8bfab9f122ae19e91a8735e22a4b0c275b;hp=bcae2f96f4ceb5fa0f2678f410543f38b39bca90;hpb=0347cf10772dfc42e8cffb0b593b7a7780b00043;p=kivitendo-erp.git diff --git a/SL/Presenter/Text.pm b/SL/Presenter/Text.pm index bcae2f96f..af3732309 100644 --- a/SL/Presenter/Text.pm +++ b/SL/Presenter/Text.pm @@ -5,19 +5,14 @@ use strict; use parent qw(Exporter); use Exporter qw(import); -our @EXPORT = qw(simple_format truncate); +our @EXPORT = qw(format_man_days simple_format truncate); use Carp; sub truncate { my ($self, $text, %params) = @_; - $params{at} ||= 50; - $params{at} = 3 if 3 > $params{at}; - $params{at} -= 3; - - return $text if length($text) < $params{at}; - return substr($text, 0, $params{at}) . '...'; + return Common::truncate($text, %params); } sub simple_format { @@ -32,6 +27,21 @@ sub simple_format { return '
' . $text;
}
+sub format_man_days {
+ my ($self, $value, %params) = @_;
+
+ return '---' if $params{skip_zero} && !$value;
+
+ return $self->escape($::locale->text('#1 h', $::form->format_amount(\%::myconfig, $value, 2))) if 8.0 > $value;
+
+ $value /= 8.0;
+ my $output = $::locale->text('#1 MD', int($value));
+ my $rest = ($value - int($value)) * 8.0;
+ $output .= ' ' . $::locale->text('#1 h', $::form->format_amount(\%::myconfig, $rest)) if $rest > 0.0;
+
+ return $self->escape($output);
+}
+
1;
__END__
@@ -53,15 +63,20 @@ SL::Presenter::Text - Presenter module for assorted text helpers
=over 4
-=item C