Refactored stockit, delivery an stock_takings.

app/views/stockit/_form.html.haml

@@ -1,44 +1,16 @@
-- form_for stock_article do |form|
-  = form.error_messages
-  %p
-    Lieferantin
-    %br/
-    = form.select :supplier_id, Supplier.without_deleted(:order => 'name').collect{ |s| [s.name, s.id] }
-  %p
-    Name
-    %br/
-    = form.text_field :name
-  %p
-    Einheit
-    %br/
-    = form.text_field :unit
-  %p
-    Notiz
-    %br/
-    = form.text_field :note
+- simple_form_for stock_article, :validate => true do |f|
+  = f.association :supplier
+  = f.input :name
+  = f.input :unit
+  = f.input :note
+
   - if stock_article.new_record?
-    %p
-      Nettopreis
-      %br/
-      = form.text_field :price
-    %p
-      MwSt
-      %br/
-      = form.text_field :tax, :value => (stock_article.tax || 7.0)
-    %p
-      Pfand
-      %br/
-      = form.text_field :deposit
+    = f.input :price
+    = f.input :tax
+    = f.input :deposit
   - else
-    %p
-      Preis:
-      %br/
-      Um Chaos zu vermeiden können bis auf weiteres die Preise von angelegten
-      Lagerartikeln nicht mehr verändert werden.
-  %p
-    Kategorie:
-    = form.select :article_category_id, ArticleCategory.all(:order => 'name').collect { |c| [c.name, c.id] }
-  %p
-    = submit_tag "Lagerartikel speichern"
-    |
-    = link_to "Abbrechen", stock_articles_path
+    = f.input :price, :input_html => {:disabled => 'disabled'},
+    :hint => "Um Chaos zu vermeiden können bis auf weiteres die Preise von angelegten Lagerartikeln nicht mehr verändert werden."
+  = f.association :article_category
+  = f.submit
+  = link_to "oder abbrechen", stock_articles_path

app/views/stockit/index.html.haml

@@ -1,23 +1,26 @@
 - title "Lagerübersicht: #{StockArticle.available.count} Artikel im Lager"
-
+- content_for :head do
+  :javascript
+    $(function() {
+      $('tr.unavailable').hide();
+    })
 .menu
   - form_tag do
     %ul
       %li
         Ansichtsoptionen
         %ul
-          %li= link_to_function "Nicht verfügbare Artikel zeigen/verstecken", |
-            "$$('tr.unavailable').invoke('toggleClassName', 'hidden');", :style => "width:15em" |
+          %li= link_to "Nicht verfügbare Artikel zeigen/verstecken", "#", 'data-toggle-this' => 'tr.unavailable',
+            :style => "width:15em"
 
 
 %div{:style => "padding:0 0 0.5em 0.7em;margin-bottom:2em"}
   %span{:style => "float:left"}
     - form_tag do
       Neue Lieferung anlegen für:
-      = select_tag :new_delivery, |
-        options_for_select([[" -- Lieferantin wählen --", ""]] + |
-          Supplier.without_deleted.collect {|s| [ s.name, url_for(new_supplier_delivery_path(s))] }), |
-        :onchange => "redirectTo(this)", :style => "font-size: 0.9em;margin-left:1em;" |
+      = select_tag :new_delivery,
+        options_for_select([[" -- Lieferantin wählen --", ""]] + Supplier.all.map {|s| [ s.name, new_supplier_delivery_url(s)]}),
+        'data-redirect-to' => true, :style => "font-size: 0.9em;margin-left:1em;"
 
 .single_column{:style => 'width:100%; clear:both'}
   .box_title
@@ -48,7 +51,7 @@
         %tbody
           - for article in @stock_articles
             - class_name = cycle :even, :odd
-            - class_name += " unavailable hidden" if article.quantity_available <= 0
+            - class_name += " unavailable" if article.quantity_available <= 0
             - class_name += " supplier_#{article.supplier.id}"
             %tr{:class => class_name}
               %td=h article.name

app/views/stockit/new.html.haml

@@ -1,16 +1,20 @@
 - title "Neuen Lagerartikel anlegen"
 
-:javascript
-  function fillNewStockArticle(text, li) {
-    new Ajax.Updater('stock_article_form', '/stockit/fill_new_stock_article_form', {
-      parameters: {article_id: li.id}
-    });
-  }
+- content_for :head do
+  :javascript
+    $(function() {
+      $('#article_search').autocomplete({
+          source: '#{articles_search_stock_articles_path}',
+          select: function(e, ui) {
+            alert(ui.item.value);
+            //location.href = '#{nil}' + ui.item.value;
+          }
+        });
+    })
+
 
 %p
   Suche nach Artikeln aus allen Katalogen:
-  = text_field_with_auto_complete :article, :name, {}, |
-  {:url => {:action => 'auto_complete_for_article_name'}, |
-   :after_update_element => 'fillNewStockArticle'} |
+  = text_field_tag 'article_search'
 #stock_article_form
   = render :partial => 'form', :locals => {:stock_article => @stock_article}