X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstats.inc.php;h=2169da1ae2de55515b3ef82ac3661bc411d60664;hb=661e298830a700272104783b049367bf505bff62;hp=e3531281c83e3343d77a0ff0808cae1695411454;hpb=326a9fc904b2a1e303abd2e3bc5b521603579be8;p=mirrors%2FSokoMan.git

diff --git a/assistants/stats.inc.php b/assistants/stats.inc.php
index e353128..2169da1 100644
--- a/assistants/stats.inc.php
+++ b/assistants/stats.inc.php
@@ -5,13 +5,11 @@ if(isset($_GET['month'])) {
 	$month = htmlspecialchars($_GET['month']);
 	$month_sql = " AND DATE_FORMAT(item_valid_from, '%Y-%m') = ".$this->db->quote($_GET['month']);
 }
-?>
 
-<form action="<?=$URL?>/" method="GET">
-	YYYY-MM: <input type="text" name="month" autofocus value="<?=$month?>" />
-	<input type="submit" value="SELECT BY MONTH" />
-</form>
-<?php
+echo $this->html->form($URL, 'GET', array(
+	array('month',$month,'text',false,'autofocus','YYYY-MM:'),
+	array(false,'SELECT BY MONTH','submit')
+));
 
 if($month_sql == '') $month='';
 $queries = array( //TODO: use build_query_select()!!!
@@ -20,13 +18,20 @@ $queries = array( //TODO: use build_query_select()!!!
 	"Použito celkem $month"
 		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 2'.$month_sql,
 	"Prodáno celkem $month"
-		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 3'.$month_sql,
+		=> 'SELECT COUNT(item_id),SUM(item_price_out),SUM(item_price_in),(SUM(item_price_out)-SUM(item_price_in)) FROM item WHERE item_valid_till=0 AND status_id = 3'.$month_sql,
+	"Skladem celkem $month"
+		=> 'SELECT COUNT(item_id),SUM(item_price_in) FROM item WHERE item_valid_till=0 AND status_id = 1'.$month_sql,
+	"Bilance celkem $month"
+		=> "SELECT (
+				SUM(item_price_out)
+				-(SELECT SUM(item_price_in) FROM item WHERE item_valid_till=0$month_sql)
+			) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )$month_sql",
 	"Počet kusů skladem"
-		=> 'SELECT room_id,room_name,model_id,model_name,model_barcode,COUNT(item_id)'.
+		=> 'SELECT room_id,room_name,model_id,model_name,model_barcode,COUNT(item_id),SUM(item_quantity)'.
 		' FROM item LEFT JOIN model USING(model_id) LEFT JOIN room USING(room_id)'.
 		' WHERE item_valid_till=0 AND status_id=1'.
 		' GROUP BY model_id,room_id'.
-		' ORDER BY room_id,model_id;'
+		' ORDER BY room_id,model_id;',
 );
 
 foreach($queries as $description => $sql) {