Show missing products on dashboard

GrocyDbMigrator.php

@@ -71,6 +71,27 @@ class GrocyDbMigrator
 			INSERT INTO products (name, description, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('DefaultProduct1', 'This is the first default product, edit or delete it', 1, 1, 1, 1);
 			INSERT INTO products (name, description, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('DefaultProduct2', 'This is the second default product, edit or delete it', 1, 1, 1, 1);"
 		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 7, "
+			CREATE VIEW stock_missing_products
+			AS
+			SELECT p.id, MAX(p.name) AS name, p.min_stock_amount - IFNULL(SUM(s.amount), 0) AS amount_missing
+			FROM products p
+			LEFT JOIN stock s
+				ON p.id = s.product_id
+			WHERE p.min_stock_amount != 0
+			GROUP BY p.id
+			HAVING SUM(s.amount) < p.min_stock_amount;"
+		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 8, "
+			CREATE VIEW stock_current
+			AS
+			SELECT product_id, SUM(amount) AS amount, MIN(best_before_date) AS best_before_date
+			from stock
+			GROUP BY product_id
+			ORDER BY MIN(best_before_date) ASC;"
+		);
 	}
 
 	private static function ExecuteMigrationWhenNeeded(PDO $pdo, int $migrationId, string $sql)

GrocyDemoDataGenerator.php

@@ -21,8 +21,8 @@ class GrocyDemoDataGenerator
 				INSERT INTO quantity_units (name) VALUES ('Bund'); --6
 
 				DELETE FROM products WHERE id IN (1, 2);
-				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Gummib<69>rchen', 2, 2, 2, 1); --3
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('Gummib<69>rchen', 2, 2, 2, 1, 8); --3
-				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Chips', 2, 2, 2, 1); --4
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('Chips', 2, 2, 2, 1, 10); --4
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Eier', 1, 2, 1, 10); --5
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Nudeln', 1, 2, 2, 1); --6
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Essiggurken', 3, 3, 3, 1); --7

GrocyLogicStock.php

@@ -8,7 +8,13 @@ class GrocyLogicStock
 
 	public static function GetCurrentStock()
 	{
-		$sql = 'SELECT product_id, SUM(amount) AS amount, MIN(best_before_date) AS best_before_date from stock GROUP BY product_id ORDER BY MIN(best_before_date) ASC';
+		$sql = 'SELECT * from stock_current';
+		return Grocy::ExecuteDbQuery(Grocy::GetDbConnectionRaw(), $sql)->fetchAll(PDO::FETCH_OBJ);
+	}
+
+	public static function GetMissingProducts()
+	{
+		$sql = 'SELECT * from stock_missing_products';
 		return Grocy::ExecuteDbQuery(Grocy::GetDbConnectionRaw(), $sql)->fetchAll(PDO::FETCH_OBJ);
 	}
 

index.php

@@ -37,12 +37,13 @@ $db = Grocy::GetDbConnection();
 $app->get('/', function(Request $request, Response $response) use($db)
 {
 	$db = Grocy::GetDbConnection(true); //For database schema migration
-
+	
 	return $this->renderer->render($response, '/layout.php', [
 		'title' => 'Dashboard',
 		'contentPage' => 'dashboard.php',
 		'products' => $db->products(),
-		'currentStock' => GrocyLogicStock::GetCurrentStock()
+		'currentStock' => GrocyLogicStock::GetCurrentStock(),
+		'missingProducts' => GrocyLogicStock::GetMissingProducts()
 	]);
 });
 

style.css

@@ -119,6 +119,10 @@
 	background-color: #f2dede !important;
 }
 
+.info-bg {
+	background-color: #afd9ee !important;
+}
+
 .discrete-content-separator {
 	padding-top: 5px;
 	padding-bottom: 5px;

views/dashboard.php

@@ -8,6 +8,7 @@
 		<div class="row">
 			<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>
+			<p class="btn btn-lg btn-info no-real-button"><strong><?php echo count($missingProducts); ?></strong> products are below defined min. stock amount</p>
 		</div>
 	</div>
 
@@ -24,7 +25,7 @@
 			</thead>
 			<tbody>
 				<?php foreach ($currentStock as $currentStockEntry) : ?>
-				<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'; ?>">
+				<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'; else if (GrocyPhpHelper::FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null) echo 'info-bg'; ?>">
 					<td>
 						<?php echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name; ?>
 					</td>