Zeiterfassung: Auch beim Laden entsprechende Eingabe-Felder sperren:

- wenn Auftrag ausgewählt. so ist Kunde und Projekt gesperrt
- wenn Projekt ausgewählt, und Projekt einen Kunden hat, so ist
    Kunde gesperrt

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 5175af70e3d11148e0ce0ad9497a7d3240bc8d4d..628c8ae1ee7fae48697fa50324f972ac309a81de 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -103,10 +103,13 @@ sub action_edit {
     $self->{end_time}   = $self->time_recording->end_time->to_kivitendo_time;
   }
 
+  my $inputs_to_disable = $self->get_inputs_to_disable;
+
   $self->setup_edit_action_bar;
 
   $self->render('time_recording/form',
-                title  => t8('Time Recording'),
+                title             => t8('Time Recording'),
+                inputs_to_disable => $inputs_to_disable,
   );
 }
 
@@ -405,4 +408,12 @@ sub safe_callback {
   $::form->{callback} || (action => 'list')
 }
 
+sub get_inputs_to_disable {
+  my ($self) = @_;
+
+  return [qw(customer project)]  if $self->time_recording->order_id;
+  return [qw(customer)]          if $self->time_recording->project_id && $self->time_recording->project->customer_id;
+}
+
+
 1;

diff --git a/js/kivi.TimeRecording.js b/js/kivi.TimeRecording.js
index 574549e0e20ff669b03939199ca1fdd2a049e8b9..dd44411cf84c568c59faac5b07ee10e0ad8e314a 100644 (file)
--- a/js/kivi.TimeRecording.js
+++ b/js/kivi.TimeRecording.js
@@ -1,6 +1,8 @@
 namespace('kivi.TimeRecording', function(ns) {
   'use strict';
 
+  ns.inputs_to_disable = [];
+
   ns.set_end_date = function() {
     if ($('#start_date').val() !== '' && $('#end_date').val() === '') {
       var kivi_start_date  = kivi.format_date(kivi.parse_date($('#start_date').val()));
@@ -56,8 +58,20 @@ namespace('kivi.TimeRecording', function(ns) {
     });
   };
 
+  ns.set_input_constraints = function() {
+    $(ns.inputs_to_disable).each(function(idx, elt) {
+      if ("customer" === elt) {
+        $('#time_recording_customer_id_name').prop('disabled', true);
+      }
+      if ("project" === elt) {
+        $('#time_recording_project_id_name').prop('disabled', true);
+      }
+    });
+  };
+
 });
 
 $(function() {
+  kivi.TimeRecording.set_input_constraints();
   $('#time_recording_project_id').on('set_item:ProjectPicker', function(){ kivi.TimeRecording.project_changed() });
 });

diff --git a/templates/webpages/time_recording/form.html b/templates/webpages/time_recording/form.html
index 07939daaaf6ac4229dc9dd47b0de5c9ffb88b27f..c5a8d639fe5232a8951d000d659030171d4070e2 100644 (file)
--- a/templates/webpages/time_recording/form.html
+++ b/templates/webpages/time_recording/form.html
@@ -93,3 +93,11 @@
   [%- END %]
 
 </form>
+
+<script type="text/javascript">
+<!--
+  [% FOREACH i = inputs_to_disable %]
+    kivi.TimeRecording.inputs_to_disable.push("[% i %]");
+  [% END %]
+-->
+</script>