X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1f38e0a49a8ef1b9ee7f6e7759975bbeeddade08..ab64cb42d50e3ca96016958dfd7c47f623f760db:/templates/webpages/order/tabs/basic_data.html

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 36b57b85c..80429aaa1 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -76,6 +76,16 @@
               title_key='safe_name') %]</td>
           </tr>
 
+          [% IF SELF.cv == 'customer' %]
+          <tr>
+            <th align="right">[% 'Salesman' | $T8 %]</th>
+            <td>[% L.select_tag('order.employee_id',
+              SELF.all_employees,
+              default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+              title_key='safe_name') %]</td>
+          </tr>
+          [% END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
@@ -108,7 +118,7 @@
     <tr>
       <td>
 
-        <div id="row_table_scroll_id" style="overflow-y: scroll; height: 500px;">
+        <div id="row_table_scroll_id" style="overflow-y: auto; height: 45vh;">
           <table id="row_table_id" width="100%">
             <thead>
               <tr class="listheading">
@@ -126,11 +136,9 @@
               </tr>
             </thead>
 
-            <tbody>
-              [%- FOREACH item = SELF.order.items_sorted %]
-                [%- PROCESS order/tabs/_row.html ITEM=item %]
-              [%- END %]
-            </tbody>
+            [%- FOREACH item = SELF.order.items_sorted %]
+              [%- PROCESS order/tabs/_row.html ITEM=item %]
+            [%- END %]
 
           </table>
         </div>
@@ -173,7 +181,7 @@
 </div>
 
 
-[% L.sortable_element('#row_table_id tbody') %]
+[% L.sortable_element('#row_table_id') %]
 
 <script type='text/javascript'>
 function reload_cv_dependend_selections() {
@@ -184,6 +192,8 @@ function reload_cv_dependend_selections() {
 }
 
 function add_item() {
+  if ($('#add_item_parts_id').val() == '') return;
+
   var data = $('#order_form').serialize();
   data += '&action=Order/add_item';
   data += '&type=' + $('#type').val();
@@ -192,10 +202,10 @@ function add_item() {
 }
 
 function delete_order_item_row(clicked) {
-  var row = $(clicked).parents("tr").first();
+  var row = $(clicked).parents("tbody").first();
   $(row).remove();
 
-  recalc_amounts_and_taxes()
+  recalc_amounts_and_taxes();
 }
 
 function recalc_amounts_and_taxes() {
@@ -210,6 +220,33 @@ function row_table_scroll_down() {
   $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
 }
 
+function row_set_keyboard_events_by_id(item_id) {
+  var row = $('#item_' + item_id).parents("tbody").first();
+
+  row_set_keyboard_events(row);
+}
+
+function row_set_keyboard_events(rows) {
+  console.log(rows);
+
+  $(rows).keydown(function(event) {
+    if(event.keyCode == 40 && event.shiftKey == true) {
+      // shift arrow down
+      event.preventDefault();
+      var row = $(event.target).parents(".row_entry").first();
+      $(row).children().not(':first').show();
+      return false;
+    }
+    if(event.keyCode == 38 && event.shiftKey == true) {
+      // shift arrow up
+      event.preventDefault();
+      var row = $(event.target).parents(".row_entry").first();
+      $(row).children().not(':first').hide();
+      return false;
+    }
+  });
+}
+
 $(function(){
   $('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
   $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
@@ -221,6 +258,7 @@ $(function(){
       return false;
     }
   });
+  row_set_keyboard_events($('.row_entry'));
 });
 
 </script>