Merge branch 'dev' of github.com:UniversalScientificTechnologies/OpenIntranet into dev

Author: roman-dvorak

src/OpenIntranet/templates/production.bom_table.hbs

@@ -44,19 +44,28 @@
 
 		<div>
 			{%try%}
-			{%for packets in row['packets'] %}
-				 {% set count = 0 %}
-				 {%for packet in packets['packets'] %}
-				 	{% set this_warehouse = bool(packet['packets']['position'][0]['warehouse'] == current_warehouse) %}
-				 	{% if this_warehouse %} <div> <span class="text-muted hover-packet" packet_id="{{packet['packets']['_id']}}"><i class="bi bi-box-seam"></i> {{str(packet['packets']['_id'])[-4:]}}</span> &middot; <b>{{packet['packet_count']}}</b><small>/{{packet['packet_count']}}</small> ks &middot; <span class="text-muted" data-toggle="tooltip" data-placement="top" title="{{ packet['packets']['position'][0]['text']}}">(<i class="bi bi-inboxes"></i> {{ packet['packets']['position'][0]['name']}})</span></div> {%end%}
-				 	{%set count += packet['packet_count'] %}
-				 {%end%}
-				 <hr style="margin: 2px;">
-				 <div><span data-toggle="tooltip" data-placement="top" title="V tomto skladě" unit_required="{{len(row['Ref'])}}" unit_available="{{count}}" class="count_validation"><i class="bi bi-shop"></i> {{count}} ks</span> <span data-toggle="tooltip" data-placement="top" title="Ostatní sklady" class="text-muted"><i class="bi bi-building"></i> {{packets['component_count'] - count}} ks</span></div>
-				 <hr style="margin: 2px;">
-				 <div> {%if packets['component_count']%} <i class="bi bi-cash-stack"> </i>{{ round(packets['component_price']/packets['component_count']*len(row['Ref']), 2) }} Czk  &middot; <span class="text-muted"><i class="bi bi-cash"> </i>{{ round(packets['component_price']/packets['component_count'], 2) }} Czk/ks </span>{%else%} <span class="text-muted">Není možné určit cenu.</span> {%end%}</div>
+				{% if not len(row['packets']) %}
+					<div>
+						<i class="bi bi-exclamation-square"></i> Není ve skladu
+						<span unit_required="{{len(row['Ref'])}}" unit_available="0" class="count_validation"></span>
+					</div>
+				{%else%}
+					{%for packets in row['packets'] %}
+						 {% set count = 0 %}
+						 {% for packet in packets['packets'] %}
+						 	{% set this_warehouse = bool(packet['packets']['position'][0]['warehouse'] == current_warehouse) %}
+						 	{% if this_warehouse %}
+						 		<div> <span class="text-muted hover-packet" packet_id="{{packet['packets']['_id']}}"><i class="bi bi-box-seam"></i> {{str(packet['packets']['_id'])[-4:]}}</span> &middot; <b>{{packet['packet_count']}}</b><small>/{{packet['packet_count']}}</small> ks &middot; <span class="text-muted" data-toggle="tooltip" data-placement="top" title="{{ packet['packets']['position'][0]['text']}}">(<i class="bi bi-inboxes"></i> {{ packet['packets']['position'][0]['name']}})</span></div>
+						 		{%set count += packet['packet_count'] %}
+						 	{%end%}
+						 {%end%}
+						 <hr style="margin: 2px;">
+						 <div><span data-toggle="tooltip" data-placement="top" title="V tomto skladě" unit_required="{{len(row['Ref'])}}" unit_available="{{count}}" class="count_validation"><i class="bi bi-shop"></i> {{count}} ks</span> <span data-toggle="tooltip" data-placement="top" title="Ostatní sklady" class="text-muted"><i class="bi bi-building"></i> {{packets['component_count'] - count}} ks</span></div>
+						 <hr style="margin: 2px;">
+						 <div> {%if packets['component_count']%} <i class="bi bi-cash-stack"> </i>{{ round(packets['component_price']/packets['component_count']*len(row['Ref']), 2) }} Czk  &middot; <span class="text-muted"><i class="bi bi-cash"> </i>{{ round(packets['component_price']/packets['component_count'], 2) }} Czk/ks </span>{%else%} <span class="text-muted">Není možné určit cenu.</span> {%end%}</div>
 
-			{%end%}
+					{%end%}
+				{%end%}
 			{% except%}
 				ERROR...
 			{%end%}

src/OpenIntranet/templates/production.flow.hbs

@@ -287,15 +287,16 @@ F{% extends "base.hbs" %}
 		update_multiplication(multiplication);
 		$(".count_validation").each(function(){
 			var table_row = $(this).closest('td');
+			console.log($(this));	
 			table_row.removeClass("bg-danger");
 			table_row.removeClass("bg-warning");
+			table_row.removeClass("bg-secondary");
 
 			if(Number($(this).attr("unit_required"))*multiplication > Number($(this).attr("unit_available"))) {
 				table_row.addClass("bg-danger");
 			} else if (Number($(this).attr("unit_required"))*(multiplication+1) > Number($(this).attr("unit_available"))) {
 				table_row.addClass("bg-warning");
 			}
-			
 		});
 	}