Temer plna podpora "nepocitatelnych" polozek, zbyva dodelat assistant/sell

[mirrors/SokoMan.git] / assistants / stats.inc.php

diff --git a/assistants/stats.inc.php b/assistants/stats.inc.php
index bd84300c4e9961fefc5c5a4a925ff8340a948b62..bd7caf0d386978f8517f22e24b15d9180cd56c48 100644 (file)
--- a/assistants/stats.inc.php
+++ b/assistants/stats.inc.php
@@ -1,18 +1,15 @@
 <?php
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/stats';
 $month=date('Y-m');
 $month_sql='';
 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="<?=$script?>/" 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()!!!
@@ -21,16 +18,23 @@ $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) 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)
+                       ) FROM item WHERE item_valid_till=0 AND ( status_id = 3 )',
        "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) {
        echo "<h2>$description</h2>";
-       echo $this->html->render_item_table($result = $this->db->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC));
+       echo $this->html->render_item_table($result = $this->db->safe_query_fetch($sql));
 }