X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=assistants%2Fbank.inc.php;h=548e56db082d72b2df5478e89e43000457e2b92f;hb=HEAD;hp=755a470dbea54cf1455e2f74d8b7d69b2a66dd12;hpb=bd3726b4451118c135088d97059d711d874b1274;p=mirrors%2FSokoMan.git

diff --git a/assistants/bank.inc.php b/assistants/bank.inc.php
index 755a470..548e56d 100644
--- a/assistants/bank.inc.php
+++ b/assistants/bank.inc.php
@@ -2,6 +2,8 @@
 $bank_currency='Kč';
 global $bank_table;
 $bank_table='transaction';
+$recursive=true; //USE RECURSIVE QUERIES???
+$limit=23;
 
 function bank_name($name) {
 	return strtolower(trim($name));
@@ -37,12 +39,22 @@ function bank_add_account($ctx, $name) {
 	bank_transaction($ctx, $name, $name, "Created account \"$name\"");
 }
 
-function bank_get_total($ctx, $account, $string=false) {
+function bank_month_sql($ctx, $month=false) {
+	global $bank_table;
+	$month_sql = 'TRUE';
+	if(!is_bool($month)) {
+		$month_q = $ctx->db->quote($month);
+		$month_sql .= " AND DATE_FORMAT(${bank_table}_time, '%Y-%m') = ".$month_q;
+	}
+	return $month_sql;
+}
+
+function bank_get_total($ctx, $account, $month, $string=false) {
 	global $bank_table;
 	$account_sql=$ctx->db->quote($account);
-	$result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql;");
+	$result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql AND ".bank_month_sql($ctx,$month).';');
 	$deposits = $result[0]["SUM(${bank_table}_amount)"];
-	$result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_from`=$account_sql;");
+	$result = $ctx->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) FROM `${bank_table}` WHERE `${bank_table}_from`=$account_sql AND (".bank_month_sql($ctx,$month).');');
 	$withdrawals = $result[0]["SUM(${bank_table}_amount)"];
 	if($string) return "$deposits-$withdrawals";
 	return $deposits-$withdrawals;
@@ -61,11 +73,11 @@ function bank_rename_account($ctx, $old, $new) {
 	);
 }
 
-function bank_get_overview($ctx,$prefix='') {
+function bank_get_overview($ctx,$prefix='',$month=false) {
 	global $bank_table;
 	$accounts = bank_get_accounts($ctx);
 	foreach($accounts as $acc) {
-		$total=bank_get_total($ctx, $acc);
+		$total=bank_get_total($ctx, $acc, $month);
 		$overview['table'][]=array("${prefix}account"=>$acc,"${prefix}total"=>$total);
 		$overview['array'][$acc]=$total;
 	}
@@ -73,7 +85,7 @@ function bank_get_overview($ctx,$prefix='') {
 }
 
 if(isset($bank_json_only) && $bank_json_only) {
-	$overview=bank_get_overview($this);
+	$overview=bank_get_overview($this,'');
 	die(json_encode(array(
 		'overview'=>$overview['array']
 	)));
@@ -98,46 +110,63 @@ if(isset($_POST['transaction'])) {
 	$account_to=$_POST['account_to'];
 	$amount=$_POST['amount'];
 	$comment=trim($_POST['comment']);
-	if(!is_numeric($amount) || $amount < 0) $this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"Lze převádět jen kladné částky", true);
-	if(strlen($comment)<4) $this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"Komentář musí mít alespoň 4 znaky!",true);
+	$account_redirect=$account_from;
+	if(!is_numeric($amount)) $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"Převáděnou částkou musí být celé číslo.", true);
+	if($amount < 0) {
+		$amount=abs($amount);
+		list($account_from,$account_to)=array($account_to,$account_from); //swap from/to
+	}
+	if(strlen($comment)<4) $this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_from),"Komentář musí mít alespoň 4 znaky!",true);
 	bank_transaction($this, $account_from, $account_to, $comment, $amount);
-	$this->post_redirect_get("$URL_INTERNAL?account=".$account_from,"Transakce byla provedena:<br />Převod <b>$amount $bank_currency</b> z účtu <b>$account_from</b> na účet <b>$account_to</b>.<br />($comment)");
+	$this->post_redirect_get("$URL_INTERNAL?account=".urlencode($account_redirect),"Transakce byla provedena:<br />Převod <b>$amount $bank_currency</b> z účtu <b>$account_from</b> na účet <b>$account_to</b>.<br />($comment)");
 }
 
+$month = isset($_GET['month']) ? $_GET['month'] : false;
+
 //bank_add_account($this, 'material');
 echo("<a href='$URL/'>Banka</a> - ");
-echo("<a href='$URL/admin'>Správa účtů - </a>");
+echo("<a href='$URL/admin'>Správa účtů</a> - ");
+echo('<span style="float:right;">');
+echo $this->html->form($URL, 'GET', array(
+  array('month',$month,'text',false,'','YYYY-MM:'),
+  array(false,'SELECT BY MONTH','submit')
+));
+echo('</span>');
 echo("Účty: <br />");
 $accounts = bank_get_accounts($this, $SUBPATH[0]=='admin');
 $lastaccount=false;
 foreach($accounts as $account) {
 	if($lastaccount && $lastaccount[0]!=$account[0] && !preg_match('/[a-zA-Z0-9]/', $lastaccount[0])) echo('<br />');
-	echo("<a href='$URL?account=$account'>$account</a>, ");
+	echo("<a href='$URL?account=".urlencode($account)."'>$account</a>, ");
 	$lastaccount=$account;
 }
 
+
+
 switch($SUBPATH[0]) {
 	default:
 
+		if(isset($_GET['limit'])) $limit = intval($_GET['limit']);
+		$limit_sql = $limit==0 ? '' : ' LIMIT '.intval($limit);
+
 		if(!isset($_GET['account'])) {
-			echo("<h1>Banka</h1>");
-			echo ("<h2>Stav</h2>");
-	    $result = $this->db->safe_query_fetch("SELECT COUNT(${bank_table}_amount) as troughput FROM ${bank_table};");
-			echo("Transakcí: ".$result[0]['troughput']."<br />");
-	    $result = $this->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) as troughput FROM ${bank_table};");
-			echo("Obrat: ".$result[0]['troughput'].' '.$bank_currency);
-	    $result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` ORDER BY ${bank_table}_time DESC;");
-			$overview=bank_get_overview($this,$bank_table.'_');
+			echo("<h1>Banka $month</h1>");
+			echo ("<h2>Stav $month</h2>");
+			$result = $this->db->safe_query_fetch("SELECT COUNT(${bank_table}_amount) as troughput FROM ${bank_table} WHERE ".bank_month_sql($this,$month).';');
+			echo("Transakcí $month: ".$result[0]['troughput']."<br />");
+			$result = $this->db->safe_query_fetch("SELECT SUM(${bank_table}_amount) as troughput FROM ${bank_table} WHERE ".bank_month_sql($this,$month).';');
+			echo("Obrat $month: ".$result[0]['troughput'].' '.$bank_currency);
+			$result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` WHERE ".bank_month_sql($this,$month)." ORDER BY ${bank_table}_time DESC".$limit_sql.";");
+			$overview=bank_get_overview($this,$bank_table.'_',$month);
 			echo $this->html->render_item_table($overview['table'],'bank');
-			echo ("<h2>Přehled transakcí</h2>");
 		} else {
 			$account=bank_name($_GET['account']);
 			$account_sql=$this->db->quote($account);
-			echo("<h1>Účet: ".$account." (".bank_get_total($this,$account).$bank_currency.")</h1>");
+			echo("<h1>Účet: ".$account." $month (".bank_get_total($this,$account,$month).$bank_currency.")</h1>");
 
 			?>
 			<form action="?" method="POST">
-				Převést <input type="number" name="amount" value="" /> <?php echo $bank_currency; ?>
+				Převést <!-- &plusmn; --><input type="number" name="amount" value="" /> <?php echo $bank_currency; ?>
 				z účtu <b><?php echo $account; ?></b> <input type="hidden" name="account_from" value="<?php echo $account; ?>" />
 				na účet <select name='account_to'>
 					<?php
@@ -148,17 +177,28 @@ switch($SUBPATH[0]) {
 
 						foreach($accounts as $acc) echo("<option value='$acc'>$acc</option>");
 					?>
-				</select> (pozor! zamysli se! převádíš peníze nebo dluhy?!)<br /><br />
+				</select> (pozor! zamysli se! převádíš peníze nebo dluhy?! záporná částka = převod v opačném směru.)<br /><br />
 				Důvod: <input type="text" name="comment" maxlength="128" style="width:64em;" />
 				<input type="submit" name="transaction" value="Převést" />
 			</form>
 			<?php
 
-			echo(bank_get_total($this,$account,true)." $bank_currency");
-	    $result = $this->db->safe_query_fetch("SELECT * FROM `${bank_table}` WHERE `${bank_table}_to`=$account_sql OR `${bank_table}_from`=$account_sql ORDER BY ${bank_table}_time DESC;");
+			echo(bank_get_total($this,$account,$month,true)." $bank_currency");
+			$subtotal=$recursive?",(
+				(SELECT SUM(${bank_table}_amount) FROM ${bank_table} x WHERE ${bank_table}_to=$account_sql AND x.${bank_table}_id<=${bank_table}.${bank_table}_id)
+				-(SELECT SUM(${bank_table}_amount) FROM ${bank_table} x WHERE ${bank_table}_from=$account_sql AND x.${bank_table}_id<=${bank_table}.${bank_table}_id)
+				) as ${bank_table}_subtotal":'';
+			//(@flux := IF(transaction_to='harvie',IF(transaction_from='harvie',0,1),IF(transaction_from='harvie',-1,0))) as flux
+			$result = $this->db->safe_query_fetch("SELECT *${subtotal} FROM `${bank_table}` WHERE (`${bank_table}_to`=$account_sql OR `${bank_table}_from`=$account_sql) AND (".bank_month_sql($this,$month).") ORDER BY ${bank_table}_time DESC".$limit_sql.";");
 		}
+		echo ("<h2>Přehled transakcí $month</h2>");
 		echo $this->html->render_item_table($result,$bank_table);
 
+		if(!isset($_GET['limit']))
+			echo("<a href='?".$_SERVER['QUERY_STRING']."&limit=0'>zobrazit vše...</a>");
+		if($limit == 0)
+			echo('to je vše.');
+
 		break;
 	case 'admin':
 ?>