X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FHelper%2FDateTime.pm;h=15ab95a7b7473519989cd0f92aca72e4029a6830;hb=1d99e3e9537f75342a9f20f1e89a3e8cb4bb5444;hp=547c4b94b7d279054cd11d06632b764fe0412f5a;hpb=a8b18c65bfd47c845e641fb0fff9587f4122bf9d;p=kivitendo-erp.git

diff --git a/SL/Helper/DateTime.pm b/SL/Helper/DateTime.pm
index 547c4b94b..15ab95a7b 100644
--- a/SL/Helper/DateTime.pm
+++ b/SL/Helper/DateTime.pm
@@ -2,8 +2,12 @@ package DateTime;
 
 use strict;
 
+use DateTime::Format::Strptime;
+
 use SL::Util qw(_hashify);
 
+my ($ymd_parser, $ymdhms_parser);
+
 sub new_local {
   my ($class, %params) = @_;
   return $class->new(hour => 0, minute => 0, second => 0, time_zone => $::locale->get_local_time_zone, %params);
@@ -82,6 +86,49 @@ sub end_of_month {
   return $self->truncate(to => 'month')->add(months => 1)->subtract(days => 1);
 }
 
+sub next_workday {
+  my ($self, %params) = @_;
+
+  my $extra_days = $params{extra_days} // 1;
+  $self->add(days => $extra_days);
+
+  my $day_of_week = $self->day_of_week;
+  $self->add(days => (8 - $day_of_week)) if $day_of_week >= 6;
+
+  return $self;
+}
+
+sub from_ymd {
+  my ($class, $ymd_string) = @_;
+
+  if (!$ymd_parser) {
+    $ymd_parser = DateTime::Format::Strptime->new(
+      pattern   => '%Y-%m-%d',
+      locale    => 'de_DE',
+      time_zone => 'local'
+    );
+  }
+
+  return $ymd_parser->parse_datetime($ymd_string // '');
+}
+
+sub from_ymdhms {
+  my ($class, $ymdhms_string) = @_;
+
+  if (!$ymdhms_parser) {
+    $ymdhms_parser = DateTime::Format::Strptime->new(
+      pattern   => '%Y-%m-%dT%H:%M:%S',
+      locale    => 'de_DE',
+      time_zone => 'local'
+    );
+  }
+
+  $ymdhms_string //= '';
+  $ymdhms_string   =~ s{ }{T};
+
+  return $ymdhms_parser->parse_datetime($ymdhms_string);
+}
+
 1;
 
 __END__
@@ -126,11 +173,37 @@ component (as opposed to L<to_kivitendo>).
 
 The legacy name C<from_lxoffice> is still supported.
 
+=item C<from_ymd $string>
+
+Parses a date string in the ISO 8601 format C<YYYY-MM-DD> and returns
+an instance of L<DateTime>. The time is set to midnight (00:00:00).
+
+=item C<from_ymdhms $string>
+
+Parses a date/time string in the ISO 8601 format
+C<YYYY-MM-DDTHH:MM:SS> (a space instead of C<T> is also supported) and
+returns an instance of L<DateTime>.
+
 =item C<end_of_month>
 
 Sets the object to the last day of object's month at midnight. Returns
 the object itself.
 
+=item C<next_workday %params>
+
+Sets the object to the next workday. The recognized parameter is:
+
+=over 2
+
+=item * C<extra_days> - optional: If C<extra_days> is given, then
+that amount of days is added to the objects date and if the resulting
+date is not a workday, the object is set to the next workday.
+Defaults to 1.
+
+=back
+
+Returns the object itself.
+
 =back
 
 =head1 AUTHOR