Zeiterfassung: Eingabemaske: Dauer auch in Stunden angeben können

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 745de909bb46c2b7d5444791c0216efe2b5b7b96..db8d2264604bd00b2ebab05e3acd0eb8ebdf3311 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -16,6 +16,7 @@ use SL::DB::Part;
 use SL::DB::TimeRecording;
 use SL::DB::TimeRecordingArticle;
 use SL::Helper::Flash qw(flash);
 use SL::DB::TimeRecording;
 use SL::DB::TimeRecordingArticle;
 use SL::Helper::Flash qw(flash);

+use SL::Helper::Number qw(_round_number _parse_number);

 use SL::Helper::UserPreferences::TimeRecording;
 use SL::Locale::String qw(t8);
 use SL::ReportGenerator;
 use SL::Helper::UserPreferences::TimeRecording;
 use SL::Locale::String qw(t8);
 use SL::ReportGenerator;


@@ -146,7 +147,12 @@ sub init_time_recording {
 
   my %attributes = %{ $::form->{time_recording} || {} };
 
 
   my %attributes = %{ $::form->{time_recording} || {} };
 

-  if (!$self->use_duration) {
+  if ($self->use_duration) {
+    if ($::form->{duration_h} || $::form->{duration_m}) {
+      $attributes{duration} = _round_number(_parse_number($::form->{duration_h}) * 60 + _parse_number($::form->{duration_m}), 0);
+    }
+
+  } else {

     foreach my $type (qw(start end)) {
       if ($::form->{$type . '_date'}) {
         my $date = DateTime->from_kivitendo($::form->{$type . '_date'});
     foreach my $type (qw(start end)) {
       if ($::form->{$type . '_date'}) {
         my $date = DateTime->from_kivitendo($::form->{$type . '_date'});

diff --git a/locale/de/all b/locale/de/all
index f88cbf52ce2d6f5a25852f385ec80a188337ad4c..a44b4796ca53a49a4b368d360393e6d3cf60e8ab 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3983,6 +3983,7 @@ $self->{texts} = {
   'VAT ID and/or taxnumber must be given.' => 'UStId und/oder Steuernummer muss angegeben werden.',
   'VN'                          => 'Kred.-Nr.',
   'Valid'                       => 'Gültig',
   'VAT ID and/or taxnumber must be given.' => 'UStId und/oder Steuernummer muss angegeben werden.',
   'VN'                          => 'Kred.-Nr.',
   'Valid'                       => 'Gültig',

+  'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' => 'Erlaubt sind ganzzahlige Werte und Kommawerte: Beispiel: 4,75h = 4 Stunden und 45 Minuten.',

   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',
   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',


@@ -4269,7 +4270,6 @@ $self->{texts} = {
   'http'                        => 'http',
   'https'                       => 'https',
   'imported'                    => 'Importiert',
   'http'                        => 'http',
   'https'                       => 'https',
   'imported'                    => 'Importiert',

-  'in minutes'                  => 'in Minuten',

   'inactive'                    => 'inaktiv',
   'income'                      => 'Einnahmen-Überschuß-Rechnung',
   'internal error (see details)' => 'Interner Fehler (siehe Details)!',
   'inactive'                    => 'inaktiv',
   'income'                      => 'Einnahmen-Überschuß-Rechnung',
   'internal error (see details)' => 'Interner Fehler (siehe Details)!',


@@ -4301,6 +4301,7 @@ $self->{texts} = {
   'list_of_transactions'        => 'buchungsliste',
   'male'                        => 'männlich',
   'max filesize'                => 'maximale Dateigröße',
   'list_of_transactions'        => 'buchungsliste',
   'male'                        => 'männlich',
   'max filesize'                => 'maximale Dateigröße',

+  'min'                         => 'min',

   'missing'                     => 'Fehlbestand',
   'missing file for action import' => 'Es wurde keine Datei zum Hochladen ausgewählt',
   'missing_br'                  => 'Fehl.',
   'missing'                     => 'Fehlbestand',
   'missing file for action import' => 'Es wurde keine Datei zum Hochladen ausgewählt',
   'missing_br'                  => 'Fehl.',

diff --git a/locale/en/all b/locale/en/all
index 1f5bfeaad32ebfbe910d12aa41962bbd84ca26e4..1310f3b920fd70e3487ff72ff008bf668a1dcc1b 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -3981,6 +3981,7 @@ $self->{texts} = {
   'VAT ID and/or taxnumber must be given.' => '',
   'VN'                          => '',
   'Valid'                       => '',
   'VAT ID and/or taxnumber must be given.' => '',
   'VN'                          => '',
   'Valid'                       => '',

+  'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' => '',

   'Valid from'                  => '',
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',
   'Valid from'                  => '',
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',


@@ -4267,7 +4268,6 @@ $self->{texts} = {
   'http'                        => '',
   'https'                       => '',
   'imported'                    => '',
   'http'                        => '',
   'https'                       => '',
   'imported'                    => '',

-  'in minutes'                  => '',

   'inactive'                    => '',
   'income'                      => 'GUV and BWA',
   'internal error (see details)' => '',
   'inactive'                    => '',
   'income'                      => 'GUV and BWA',
   'internal error (see details)' => '',


@@ -4299,6 +4299,7 @@ $self->{texts} = {
   'list_of_transactions'        => '',
   'male'                        => '',
   'max filesize'                => '',
   'list_of_transactions'        => '',
   'male'                        => '',
   'max filesize'                => '',

+  'min'                         => '',

   'missing'                     => '',
   'missing file for action import' => '',
   'missing_br'                  => 'missing',
   'missing'                     => '',
   'missing file for action import' => '',
   'missing_br'                  => 'missing',

diff --git a/templates/webpages/time_recording/form.html b/templates/webpages/time_recording/form.html
index 62e486f14ac02d4fe2fe522c118e211f197f0f7d..233eb706abc4f719b8526dc1040af2df36bc2e44 100644 (file)
--- a/templates/webpages/time_recording/form.html
+++ b/templates/webpages/time_recording/form.html
@@ -21,9 +21,10 @@
       </td>
     </tr>
     <tr>
       </td>
     </tr>
     <tr>

-      <th align="right">[% 'Duration' | $T8 %] ([% 'in minutes' | $T8 %])</th>
+      <th align="right">[% 'Duration' | $T8 %]</th>

       <td>
       <td>

-        [% P.input_tag('time_recording.duration', SELF.time_recording.duration, size=11) %]
+        [% P.input_tag('duration_h', SELF.time_recording.duration_as_hours,   size=4, class='numeric') %] [% 'h' | $T8 %]<sup>(1)</sup>
+        [% P.input_tag('duration_m', SELF.time_recording.duration_as_minutes, size=4, class='numeric') %] [% 'min' | $T8%]

       </td>
     </tr>
    [%- ELSE %]
       </td>
     </tr>
    [%- ELSE %]


@@ -82,4 +83,11 @@
     </tr>
   </table>
 
     </tr>
   </table>
 

+  [%- IF SELF.use_duration %]
+  <p>
+    <sup>(1)</sup>
+    [% 'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' | $T8 %]
+  </p>
+  [%- END %]
+

 </form>
 </form>