X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats%2Freserve.inc.php;h=d8e92dbcbf35f4a1e565a45effb4b3ef8a52ce29;hb=113c586b885aeaf164dba3c421057c7ad3544ceb;hp=827781490af2390823975990b6eba186691f61e6;hpb=049a7400bfbbf97a3f5a430bed36668c069db589;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats/reserve.inc.php b/assistants/stats/reserve.inc.php
index 8277814..d8e92db 100644
--- a/assistants/stats/reserve.inc.php
+++ b/assistants/stats/reserve.inc.php
@@ -1,11 +1,16 @@
 <?php
 $queries += array(
-	"Nutno koupit"
-		=> 'SELECT room_id,room_name,model_id,model_name,model_barcode,model_reserve,'.
+	"Nakoupit: Došlo úplně (Urgent WishList)"
+		=> 'SELECT model_id,model_name,barcode_name,model_reserve,model_reserve as item_quantity_to_buy'.
+		' FROM model LEFT JOIN barcode USING(model_id)'.
+		' WHERE model_reserve>0 AND NOT EXISTS'.
+		' (SELECT item_id FROM item WHERE barcode.barcode_id=item.barcode_id AND status_id=1 AND item_quantity>0 AND item_valid_till=0)',
+	"Nakoupit: Dochází (WishList)"
+		=> 'SELECT model_id,model_name,barcode_name,model_reserve,'.
 		' COUNT(item_id),SUM(item_quantity),model_reserve-SUM(item_quantity) as item_quantity_to_buy'.
-		' FROM item LEFT JOIN model USING(model_id) LEFT JOIN room USING(room_id)'.
+		' FROM item LEFT JOIN barcode USING(barcode_id) LEFT JOIN model USING(model_id)'.
 		' WHERE item_valid_till=0 AND status_id=1'.
-		' GROUP BY model_id,room_id'.
+		' GROUP BY model_id'.
 		' HAVING SUM(item_quantity)<model_reserve'.
-		' ORDER BY room_id,model_id;',
+		' ORDER BY model_id;',
 );