update receive delta column + responsive css

This commit is contained in:
wvengen 2014-01-09 12:17:25 +01:00
parent 56bd527a8b
commit 90c81de872
4 changed files with 36 additions and 13 deletions

View File

@ -233,9 +233,9 @@ tr.unavailable {
margin-bottom: 0; margin-bottom: 0;
} }
// entering units // allow content to appear without sudden table change (receive)
.units_delta { .units_delta {
width: 2em; min-width: 3.5em;
} }
// ********* Tweaks & fixes // ********* Tweaks & fixes
@ -297,9 +297,16 @@ input.package {
i.package { i.package {
.package-image(left); .package-image(left);
min-width: 18px; min-width: 18px;
min-height: 18px;
vertical-align: baseline;
font-style: normal; font-style: normal;
padding-left: 20px; padding-left: 20px;
@media (max-width: 768px) { padding-left: 0; } @media (max-width: 979px) { padding-left: 0; }
}
i.package.icon-only {
padding-left: 6px;
background-position: right;
display: inline-block;
} }
.package { color: tint(@textColor, @nonessentialDim); } .package { color: tint(@textColor, @nonessentialDim); }
.used .package { color: tint(@articleUsedColor, @nonessentialDim); } .used .package { color: tint(@articleUsedColor, @nonessentialDim); }

View File

@ -27,14 +27,27 @@ module OrdersHelper
end end
# can be article or article_price # can be article or article_price
def pkg_helper(article, icon=true) # icon: `false` to not show the icon
# soft_uq: `true` to hide unit quantity specifier on small screens
# sensible in tables with multiple columns calling `pkg_helper`
def pkg_helper(article, options={})
return nil if article.unit_quantity == 1 return nil if article.unit_quantity == 1
if icon uq_text = "× #{article.unit_quantity}"
"<i class='package'> &times; #{article.unit_quantity}</i>".html_safe uq_text = "<span class='hidden-phone'>#{uq_text}</span>" if options[:soft_uq]
if options[:icon].nil? or options[:icon]
pkg_helper_icon(uq_text).html_safe
else else
"<span class='package'> &times; #{article.unit_quantity}</span>".html_safe pkg_helper_icon(uq_text, tag: 'span').html_safe
end end
end end
def pkg_helper_icon(c=nil, options={})
options = {tag: 'i', class: ''}.merge(options)
if c.nil?
c = "&nbsp;"
options[:class] += " icon-only"
end
"<#{options[:tag]} class='package #{options[:class]}'>#{c}</#{options[:tag]}>"
end
def article_price_change_hint(order_article, gross=false) def article_price_change_hint(order_article, gross=false)
return nil if order_article.article.price == order_article.price.price return nil if order_article.article.price == order_article.price.price

View File

@ -17,10 +17,10 @@
-#%td # TODO implement invoice screen -#%td # TODO implement invoice screen
- unless order_article.units_billed.nil? - unless order_article.units_billed.nil?
= order_article.units_billed = order_article.units_billed
= pkg_helper order_article.article = pkg_helper order_article.article, soft_uq: true
%td.units_received_cell %td.units_received_cell
= receive_input_field(form) = receive_input_field(form)
= pkg_helper order_article.article_price, false = pkg_helper order_article.article_price, icon: false, soft_uq: true
/ TODO add almost invisible text_field for entering single units / TODO add almost invisible text_field for entering single units
%td.units_delta %td.units_delta
%td %td

View File

@ -16,10 +16,13 @@
} else if (units == expected) { } else if (units == expected) {
// equal value // equal value
html = '<i class="icon-ok" style="color: green"></i>'; html = '<i class="icon-ok" style="color: green"></i>';
} else if (units < expected) { } else {
html = '<span style="color: red">- '+(expected-units)+'</span>'; if (units < expected) {
} else /*if (units> expected)*/ { html = '<span style="color: red">- '+(expected-units)+'</span>';
html = '<span style="color: green">+ '+(units-expected)+'</span>'; } else /*if (units> expected)*/ {
html = '<span style="color: green">+ '+(units-expected)+'</span>';
}
html += '#{j pkg_helper_icon}';
} }
$(input).closest('tr').find('.units_delta').html(html); $(input).closest('tr').find('.units_delta').html(html);