From bfe7cdc876d867f2ac8095090c5f9ff77cca00e0 Mon Sep 17 00:00:00 2001 From: Will Budic Date: Sat, 9 May 2020 07:03:10 +1000 Subject: [PATCH] reverted back, bug fix 22. Category selected is irrelevant, should not be searched for. --- htdocs/cgi-bin/stats.cgi | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi index 91d512a..be764ec 100755 --- a/htdocs/cgi-bin/stats.cgi +++ b/htdocs/cgi-bin/stats.cgi @@ -77,23 +77,10 @@ my $notes_rc = selectSQL('select count(LID) from NOTES where DOC is not null;'); my $id; #INCOME -$stm1 = 'select ID from CAT where NAME like "Income"'; -$id = selectSQL($stm1); -if($id){ - $stm1 = "SELECT sum(AMOUNT) from LOG where date>=date('now','start of year') AND (ID_CAT =$id or AFLAG=1);"; -} -else{ - $stm1 = 'SELECT sum(AMOUNT) from LOG where date>=date("now","start of year") AND AFLAG = 1;'; -} +$stm1 = 'SELECT sum(AMOUNT) from LOG where date>=date("now","start of year") AND AFLAG = 1;'; #EXPENSE -$stm2 = 'select ID from CAT where NAME like "Expense"'; -$id = selectSQL($stm2); -if($id){ - $stm2 = "SELECT sum(AMOUNT) from LOG where date>=date('now','start of year') AND (ID_CAT =$id or AFLAG=2);"; -} -else{ - $stm2 = 'SELECT sum(AMOUNT) from LOG where date>=date("now","start of year") AND AFLAG = 2;'; -} +$stm2 = 'SELECT sum(AMOUNT) from LOG where date>=date("now","start of year") AND AFLAG = 2;'; + my $income = selectSQL($stm1); my $expense= selectSQL($stm2); -- 2.34.1