X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/22f2c3e86aeea63b9e25b6ba249ca9062ae337f8..662df9d7fdc9c953d324a975a5bf554e6534c42e:/SL/DB/TimeRecording.pm diff --git a/SL/DB/TimeRecording.pm b/SL/DB/TimeRecording.pm index 62143b309..13329b782 100644 --- a/SL/DB/TimeRecording.pm +++ b/SL/DB/TimeRecording.pm @@ -33,7 +33,6 @@ sub validate { my @errors; - push @errors, t8('Start time must not be empty.') if !$self->start_time; push @errors, t8('Customer must not be empty.') if !$self->customer_id; push @errors, t8('Staff member must not be empty.') if !$self->staff_member_id; push @errors, t8('Employee must not be empty.') if !$self->employee_id; @@ -109,14 +108,26 @@ sub is_time_in_wrong_order { return; } +sub is_duration_used { + return !$_[0]->start_time; +} + sub displayable_times { my ($self) = @_; - # placeholder - my $ph = $::locale->format_date_object(DateTime->new(year => 1111, month => 11, day => 11, hour => 11, minute => 11), precision => 'minute'); - $ph =~ s{1}{-}g; + my $text; + + if ($self->is_duration_used) { + $text = $self->date_as_date . ': ' . ($self->duration_as_duration_string || '--:--'); + + } else { + # placeholder + my $ph = $::locale->format_date_object(DateTime->new(year => 1111, month => 11, day => 11, hour => 11, minute => 11), precision => 'minute'); + $ph =~ s{1}{-}g; + $text = ($self->start_time_as_timestamp||$ph) . ' - ' . ($self->end_time_as_timestamp||$ph); + } - return ($self->start_time_as_timestamp||$ph) . ' - ' . ($self->end_time_as_timestamp||$ph); + return $text; } 1;