This is 1.0

views/consumption.js

@@ -45,22 +45,22 @@ $('#product_id').on('change', function(e)
 	if (productId)
 	{
 		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
-			function(productStatistics)
+			function (productDetails)
 			{
-				$('#selected-product-name').text(productStatistics.product.name);
-				$('#selected-product-stock-amount').text(productStatistics.stock_amount || '0');
-				$('#selected-product-stock-qu-name').text(productStatistics.quantity_unit_stock.name);
-				$('#selected-product-stock-qu-name2').text(productStatistics.quantity_unit_stock.name);
-				$('#selected-product-last-purchased').text((productStatistics.last_purchased || 'never').substring(0, 10));
-				$('#selected-product-last-purchased-timeago').text($.timeago(productStatistics.last_purchased || ''));
-				$('#selected-product-last-used').text((productStatistics.last_used || 'never').substring(0, 10));
-				$('#selected-product-last-used-timeago').text($.timeago(productStatistics.last_used || ''));
-				$('#amount').attr('max', productStatistics.stock_amount);
+				$('#selected-product-name').text(productDetails.product.name);
+				$('#selected-product-stock-amount').text(productDetails.stock_amount || '0');
+				$('#selected-product-stock-qu-name').text(productDetails.quantity_unit_stock.name);
+				$('#selected-product-stock-qu-name2').text(productDetails.quantity_unit_stock.name);
+				$('#selected-product-last-purchased').text((productDetails.last_purchased || 'never').substring(0, 10));
+				$('#selected-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
+				$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
+				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
+				$('#amount').attr('max', productDetails.stock_amount);
 
 				Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
 				Grocy.EmptyElementWhenMatches('#selected-product-last-used-timeago', 'NaN years ago');
 
-				if ((productStatistics.stock_amount || 0) === 0)
+				if ((productDetails.stock_amount || 0) === 0)
 				{
 					$('#product_id').val('');
 					$('#product_id_text_input').val('');
@@ -69,6 +69,7 @@ $('#product_id').on('change', function(e)
 					$('#product_id_text_input').closest('.form-group').addClass('has-error');
 					$('#product-error').text('This product is not in stock.');
 					$('#product-error').show();
+					$('#product_id_text_input').focus();
 				}
 				else
 				{
@@ -89,25 +90,19 @@ $('#product_id').on('change', function(e)
 $(function()
 {
 	$('.combobox').combobox({
-		appendId: '_text_input',
-		matcher: function(text)
+		appendId: '_text_input'
+	});
+
+	$('#product_id_text_input').on('change', function(e)
+	{
+		var input = $('#product_id_text_input').val().toString();
+		var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
+		
+		if (possibleOptionElement.length > 0)
 		{
-			var input = $('#product_id_text_input').val();
-			var optionElement = $("#product_id option:contains('" + text + "')").first();
-			var additionalSearchdata = optionElement.data('additional-searchdata');
-			
-			if (text.contains(input))
-			{
-				return true;
-			}
-			else if (additionalSearchdata !== null && additionalSearchdata.length > 0)
-			{
-				return additionalSearchdata.contains(input);
-			}
-			else
-			{
-				return false;
-			}
+			$('#product_id').val(possibleOptionElement.val());
+			$('#product_id').data('combobox').refresh();
+			$('#product_id').trigger('change');
 		}
 	});
 
@@ -120,6 +115,14 @@ $(function()
 	$('#consumption-form').validator();
 	$('#consumption-form').validator('validate');
 
+	$('#amount').on('focus', function(e)
+	{
+		if ($('#product_id_text_input').val().length === 0)
+		{
+			$('#product_id_text_input').focus();
+		}
+	});
+
 	$('#consumption-form input').keydown(function(event)
 	{
 		if (event.keyCode === 13) //Enter

views/dashboard.php

@@ -1,7 +1,14 @@
 <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+
 	<h1 class="page-header">Dashboard</h1>
 
-	<h3>Current stock</h3>
+	<h3>Stock overview</h3>
+
+	<div>
+		<p class="btn btn-lg btn-warning no-real-button"><strong><?php echo count(GrocyPhpHelper::FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('+5 days')), '<')); ?></strong> products expiring within the next 5 days</p>
+		<p class="btn btn-lg btn-danger no-real-button"><strong><?php echo count(GrocyPhpHelper::FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('-1 days')), '<')); ?></strong> products are already expired</p>
+	</div>
+
 	<div class="table-responsive">
 		<table id="current-stock-table" class="table table-striped">
 			<thead>
@@ -13,7 +20,7 @@
 			</thead>
 			<tbody>
 				<?php foreach ($currentStock as $currentStockEntry) : ?>
-				<tr>
+				<tr class="<?php if ($currentStockEntry->best_before_date < date('Y-m-d', strtotime('-1 days'))) echo 'error-bg'; else if ($currentStockEntry->best_before_date < date('Y-m-d', strtotime('+5 days'))) echo 'warning-bg'; ?>">
 					<td>
 						<?php echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name; ?>
 					</td>
@@ -21,11 +28,13 @@
 						<?php echo $currentStockEntry->amount; ?>
 					</td>
 					<td>
-						<?php echo $currentStockEntry->best_before_date; ?> <time class="timeago timeago-contextual" datetime="<?php echo $currentStockEntry->best_before_date; ?>"></time>
+						<?php echo $currentStockEntry->best_before_date; ?>
+						<time class="timeago timeago-contextual" datetime="<?php echo $currentStockEntry->best_before_date; ?>"></time>
 					</td>
 				</tr>
 				<?php endforeach; ?>
 			</tbody>
 		</table>
 	</div>
+
 </div>

views/inventory.js

@@ -0,0 +1,237 @@
+$('#save-inventory-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	var jsonForm = $('#inventory-form').serializeJSON();
+
+	Grocy.FetchJson('/api/stock/get-product-details/' + jsonForm.product_id,
+		function (productDetails)
+		{
+			Grocy.FetchJson('/api/stock/inventory-product/' + jsonForm.product_id + '/' + jsonForm.new_amount + '?bestbeforedate=' + $('#best_before_date').val(),
+				function (result) {
+					toastr.success('Stock amount of ' + productDetails.product.name  + ' is now ' + jsonForm.new_amount.toString() + ' ' + productDetails.quantity_unit_stock.name);
+
+					$('#new_amount').val('');
+					$('#best_before_date').val('');
+					$('#product_id').val('');
+					$('#product_id_text_input').focus();
+					$('#product_id_text_input').val('');
+					$('#product_id_text_input').trigger('change');
+					$('#inventory-form').validator('validate');
+				},
+				function (xhr) {
+					console.error(xhr);
+				}
+			);
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+$('#product_id').on('change', function(e)
+{
+	var productId = $(e.target).val();
+
+	if (productId)
+	{
+		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+			function(productDetails)
+			{
+				$('#selected-product-name').text(productDetails.product.name);
+				$('#selected-product-stock-amount').text(productDetails.stock_amount || '0');
+				$('#selected-product-stock-qu-name').text(productDetails.quantity_unit_stock.name);
+				$('#selected-product-purchase-qu-name').text(productDetails.quantity_unit_purchase.name);
+				$('#selected-product-last-purchased').text((productDetails.last_purchased || 'never').substring(0, 10));
+				$('#selected-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
+				$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
+				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
+				$('#new_amount').attr('not-equal', productDetails.stock_amount);
+				$('#new_amount_qu_unit').text(productDetails.quantity_unit_stock.name);
+
+				Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
+				Grocy.EmptyElementWhenMatches('#selected-product-last-used-timeago', 'NaN years ago');
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+});
+
+$(function()
+{
+	$('.datepicker').datepicker(
+	{
+		format: 'yyyy-mm-dd',
+		startDate: '+0d',
+		todayHighlight: true,
+		autoclose: true,
+		calendarWeeks: true,
+		orientation: 'bottom auto',
+		weekStart: 1,
+		showOnFocus: false
+	});
+	$('.datepicker').trigger('change');
+
+	$('.combobox').combobox({
+		appendId: '_text_input'
+	});
+
+	$('#product_id_text_input').on('change', function(e)
+	{
+		var input = $('#product_id_text_input').val().toString();
+		var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
+		
+		if (possibleOptionElement.length > 0)
+		{
+			$('#product_id').val(possibleOptionElement.val());
+			$('#product_id').data('combobox').refresh();
+			$('#product_id').trigger('change');
+		}
+	});
+
+	$('#new_amount').val('');
+	$('#best_before_date').val('');
+	$('#product_id').val('');
+	$('#product_id_text_input').focus();
+	$('#product_id_text_input').val('');
+	$('#product_id_text_input').trigger('change');
+
+	$('#inventory-form').validator({
+		custom: {
+			'isodate': function($el)
+			{
+				if ($el.val().length !== 0 && !moment($el.val(), 'YYYY-MM-DD', true).isValid())
+				{
+					return 'Wrong date format, needs to be YYYY-MM-DD';
+				}
+			},
+			'notequal': function($el)
+			{
+				if ($el.val().length !== 0 && $el.val().toString() === $el.attr('not-equal').toString())
+				{
+					return 'This value cannot be equal to ' + $el.attr('not-equal').toString();
+				}
+			}
+		}
+	});
+	$('#inventory-form').validator('validate');
+
+	$('#new_amount').on('focus', function(e)
+	{
+		if ($('#product_id_text_input').val().length === 0)
+		{
+			$('#product_id_text_input').focus();
+		}
+	});
+
+	$('#inventory-form input').keydown(function(event)
+	{
+		if (event.keyCode === 13) //Enter
+		{
+			if ($('#inventory-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+			{
+				event.preventDefault();
+				return false;
+			}
+		}
+	});
+});
+
+$('#best_before_date-datepicker-button').on('click', function(e)
+{
+	$('.datepicker').datepicker('show');
+});
+
+$('#best_before_date').on('change', function(e)
+{
+	var value = $('#best_before_date').val();
+	if (value.length === 8 && $.isNumeric(value))
+	{
+		value = value.replace(/(\d{4})(\d{2})(\d{2})/, '$1-$2-$3');
+		$('#best_before_date').val(value);
+		$('#inventory-form').validator('validate');
+	}
+});
+
+$('#best_before_date').on('keypress', function(e)
+{
+	var element = $(e.target);
+	var value = element.val();
+	var dateObj = moment(element.val(), 'YYYY-MM-DD', true);
+
+	$('.datepicker').datepicker('hide');
+
+	if (value.length === 0)
+	{
+		element.val(moment().format('YYYY-MM-DD'));
+	}
+	else if (dateObj.isValid())
+	{
+		if (e.keyCode === 38) //Up
+		{
+			element.val(dateObj.add(-1, 'days').format('YYYY-MM-DD'));
+		}
+		else if (e.keyCode === 40) //Down
+		{
+			element.val(dateObj.add(1, 'days').format('YYYY-MM-DD'));
+		}
+		else if (e.keyCode === 37) //Left
+		{
+			element.val(dateObj.add(-1, 'weeks').format('YYYY-MM-DD'));
+		}
+		else if (e.keyCode === 39) //Right
+		{
+			element.val(dateObj.add(1, 'weeks').format('YYYY-MM-DD'));
+		}
+	}
+
+	$('#inventory-form').validator('validate');
+});
+
+$('#new_amount').on('change', function(e)
+{
+	if ($('#product_id').parent().hasClass('has-error'))
+	{
+		$('#inventory-change-info').hide();
+		return;
+	}
+
+	var productId = $('#product_id').val();
+	var newAmount = $('#new_amount').val();
+
+	if (productId)
+	{
+		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+			function(productDetails)
+			{
+				var productStockAmount = productDetails.stock_amount || '0';
+
+				if (newAmount > productStockAmount)
+				{
+					var amountToAdd = newAmount - productDetails.stock_amount;
+					$('#inventory-change-info').text('This means ' + amountToAdd.toString() + ' ' + productDetails.quantity_unit_stock.name + ' will be added to stock');
+					$('#inventory-change-infoo').show();
+				}
+				else if (newAmount < productStockAmount)
+				{
+					var amountToRemove = productStockAmount - newAmount;
+					$('#inventory-change-info').text('This means ' + amountToRemove.toString() + ' ' + productDetails.quantity_unit_stock.name + ' will be removed from stock');
+					$('#inventory-change-info').show();
+				}
+				else
+				{
+					$('#inventory-change-info').hide();
+				}
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+});

views/inventory.php

@@ -0,0 +1,49 @@
+<div class="col-sm-4 col-sm-offset-3 col-md-3 col-md-offset-2 main">
+	<h1 class="page-header">Inventory</h1>
+
+	<form id="inventory-form">
+
+		<div class="form-group">
+			<label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label>
+			<select class="form-control combobox" id="product_id" name="product_id" required>
+				<option value=""></option>
+				<?php foreach ($products as $product) : ?>
+					<option data-additional-searchdata="<?php echo $product->barcode; ?>" value="<?php echo $product->id; ?>"><?php echo $product->name; ?></option>
+				<?php endforeach; ?>
+			</select>
+			<div class="help-block with-errors"></div>
+		</div>
+
+		<div class="form-group">
+			<label for="new_amount">New amount&nbsp;&nbsp;<span id="new_amount_qu_unit" class="small text-muted"></span></label>
+			<input type="number" data-notequal="notequal" class="form-control" id="new_amount" name="new_amount" min="0" not-equal="-1" required>
+			<div class="help-block with-errors"></div>
+			<div id="inventory-change-info" class="help-block text-muted"></div>
+		</div>
+
+		<div class="form-group">
+			<label for="best_before_date">Best before&nbsp;&nbsp;<span class="small text-muted">This will apply to added products</span></label>
+			<div class="input-group date">
+				<input type="text" data-isodate="isodate" class="form-control datepicker" id="best_before_date" name="best_before_date" autocomplete="off">
+				<div id="best_before_date-datepicker-button" class="input-group-addon">
+					<i class="fa fa-calendar"></i>
+				</div>
+			</div>
+			<div class="help-block with-errors"></div>
+		</div>
+
+		<button id="save-inventory-button" type="submit" class="btn btn-default">OK</button>
+
+	</form>
+</div>
+
+<div class="col-sm-6 col-md-5 col-lg-3 main well">
+	<h3>Product overview <strong><span id="selected-product-name"></span></strong></h3>
+	<h4><strong>Purchase quantity:</strong> <span id="selected-product-purchase-qu-name"></span></h4>
+
+	<p>
+		<strong>Stock amount:</strong> <span id="selected-product-stock-amount"></span> <span id="selected-product-stock-qu-name"></span><br />
+		<strong>Last purchased:</strong> <span id="selected-product-last-purchased"></span> <time id="selected-product-last-purchased-timeago" class="timeago timeago-contextual"></time><br />
+		<strong>Last used:</strong> <span id="selected-product-last-used"></span> <time id="selected-product-last-used-timeago" class="timeago timeago-contextual"></time>
+	</p>
+</div>

views/layout.php

@@ -49,6 +49,9 @@
 					<li data-nav-for-page="consumption.php">
 						<a class="discrete-link" href="/consumption"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Record consumption</a>
 					</li>
+					<li data-nav-for-page="inventory.php">
+						<a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a>
+					</li>
 				</ul>
 
 				<ul class="nav navbar-nav navbar-right">
@@ -82,6 +85,9 @@
 					<li data-nav-for-page="consumption.php">
 						<a class="discrete-link" href="/consumption"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Record consumption</a>
 					</li>
+					<li data-nav-for-page="inventory.php">
+						<a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a>
+					</li>
 				</ul>
 
 				<ul class="nav nav-sidebar">

views/productform.php

@@ -37,6 +37,18 @@
 			<div class="help-block with-errors"></div>
 		</div>
 
+		<div class="form-group">
+			<label for="min_stock_amount">Minimum stock amount</label>
+			<input required min="0" type="number" class="form-control" id="min_stock_amount" name="min_stock_amount" value="<?php if ($mode == 'edit') echo $product->min_stock_amount; else echo '0'; ?>">
+			<div class="help-block with-errors"></div>
+		</div>
+
+		<div class="form-group">
+			<label for="default_best_before_days">Default best before days<br /><span class="small text-muted">For purchases this amount of days will be added to today for the best before date suggestion</span></label>
+			<input required min="0" type="number" class="form-control" id="default_best_before_days" name="default_best_before_days" value="<?php if ($mode == 'edit') echo $product->default_best_before_days; else echo '0'; ?>">
+			<div class="help-block with-errors"></div>
+		</div>
+
 		<div class="form-group">
 			<label for="qu_id_purchase">Quantity unit purchase</label>
 			<select required class="form-control input-group-qu" id="qu_id_purchase" name="qu_id_purchase">

views/products.php

@@ -14,6 +14,7 @@
 					<th>#</th>
 					<th>Name</th>
 					<th>Location</th>
+					<th>Min. stock amount</th>
 					<th>QU purchase</th>
 					<th>QU stock</th>
 					<th>QU factor</th>
@@ -37,6 +38,9 @@
 					<td>
 						<?php echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($locations, 'id', $product->location_id)->name; ?>
 					</td>
+					<td>
+						<?php echo $product->min_stock_amount; ?>
+					</td>
 					<td>
 						<?php echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($quantityunits, 'id', $product->qu_id_purchase)->name; ?>
 					</td>

views/purchase.js

@@ -7,11 +7,11 @@
 	Grocy.FetchJson('/api/stock/get-product-details/' + jsonForm.product_id,
 		function (productDetails)
 		{
-			jsonForm.amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock;
+			var amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock;
 
-			Grocy.FetchJson('/api/stock/add-product/' + jsonForm.product_id + '/' + jsonForm.amount + '?bestbeforedate=' + $('#best_before_date').val(),
+			Grocy.FetchJson('/api/stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + $('#best_before_date').val(),
 				function (result) {
-					toastr.success('Added ' + jsonForm.amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' to stock');
+					toastr.success('Added ' + amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' to stock');
 
 					$('#amount').val(1);
 					$('#best_before_date').val('');
@@ -50,6 +50,12 @@ $('#product_id').on('change', function(e)
 				$('#selected-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
 				$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
 				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
+				$('#new_amount_qu_unit').text(productDetails.quantity_unit_stock.name);
+				
+				if (productDetails.product.default_best_before_days.toString() !== '0')
+				{
+					$('#best_before_date').val(moment().add(productDetails.product.default_best_before_days, 'days').format('YYYY-MM-DD'));
+				}
 
 				Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
 				Grocy.EmptyElementWhenMatches('#selected-product-last-used-timeago', 'NaN years ago');
@@ -78,25 +84,19 @@ $(function()
 	$('.datepicker').trigger('change');
 
 	$('.combobox').combobox({
-		appendId: '_text_input',
-		matcher: function(text)
+		appendId: '_text_input'
+	});
+
+	$('#product_id_text_input').on('change', function(e)
+	{
+		var input = $('#product_id_text_input').val().toString();
+		var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
+		
+		if (possibleOptionElement.length > 0)
 		{
-			var input = $('#product_id_text_input').val();
-			var optionElement = $("#product_id option:contains('" + text + "')").first();
-			var additionalSearchdata = optionElement.data('additional-searchdata');
-			
-			if (text.contains(input))
-			{
-				return true;
-			}
-			else if (additionalSearchdata !== null && additionalSearchdata.length > 0)
-			{
-				return additionalSearchdata.contains(input);
-			}
-			else
-			{
-				return false;
-			}
+			$('#product_id').val(possibleOptionElement.val());
+			$('#product_id').data('combobox').refresh();
+			$('#product_id').trigger('change');
 		}
 	});
 
@@ -120,6 +120,14 @@ $(function()
 	});
 	$('#purchase-form').validator('validate');
 
+	$('#best_before_date').on('focus', function(e)
+	{
+		if ($('#product_id_text_input').val().length === 0)
+		{
+			$('#product_id_text_input').focus();
+		}
+	});
+
 	$('#purchase-form input').keydown(function(event)
 	{
 		if (event.keyCode === 13) //Enter

views/purchase.php

@@ -26,7 +26,7 @@
 		</div>
 
 		<div class="form-group">
-			<label for="amount">Amount</label>
+			<label for="amount">Amount&nbsp;&nbsp;<span id="new_amount_qu_unit" class="small text-muted"></span></label>
 			<input type="number" class="form-control" id="amount" name="amount" value="1" min="1" required>
 			<div class="help-block with-errors"></div>
 		</div>