Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed finance module to work with bootstrap design.

Browse source
This commit is contained in:
benni 2012-11-10 16:44:05 +01:00
parent 16de9124fe
commit 0236fb5a60
55 changed files with 440 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/finance/group_order_articles/_form.html.haml
View file

@ -1,9 +1,11 @@
%h2 Mengenänderung
%p
%b Artikel: #{@order_article.article.name}
- simple_form_for [:finance, @group_order_article], remote: true do |form|
= simple_form_for [:finance, @group_order_article], remote: true do |form|
= form.hidden_field :order_article_id
= form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
= form.input :result, hint: "Einheit: #{@order_article.article.unit}"
= form.submit 'Speichern'
.modal-header
= button_tag "x", class: 'close', data: {dismiss: 'modal'}
%h3 Mengenänderung für #{@order_article.article.name}
.modal-body
= form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
= form.input :result, hint: "Einheit: #{@order_article.article.unit}"
.modal-footer
= button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
= form.submit "Speichern", class: 'btn btn-primary'

3
app/views/finance/group_order_articles/edit.js.haml
View file

@ -1 +1,2 @@
$.fancybox('#{escape_javascript(render('form'))}');
$('#modalContainer').html('#{j(render("form"))}');
$('#modalContainer').modal();

3
app/views/finance/group_order_articles/new.js.haml
View file

@ -1 +1,2 @@
$.fancybox('#{escape_javascript(render("form"))}');
$('#modalContainer').html('#{j(render("form"))}');
$('#modalContainer').modal();

8
app/views/finance/group_order_articles/update.js.haml
View file

@ -1,5 +1,3 @@
$.fancybox.close();
$('#order_article_#{@order_article.id}').
html('#{escape_javascript(render(partial: 'finance/balancing/order_article', locals: {order_article: @order_article}))}');
$('#group_order_articles_#{@order_article.id}').
html('#{escape_javascript(render(partial: 'finance/balancing/group_order_articles', locals: {order_article: @order_article}))}');
$('#modalContainer').modal('hide');
$('#order_article_#{@order_article.id}').html('#{j(render('finance/balancing/order_article', order_article: @order_article))}');
$('#group_order_articles_#{@order_article.id}').html('#{j(render('finance/balancing/group_order_articles', order_article: @order_article))}');