Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sortowanie #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sortowanie #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/income.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function MonthlyIncome($year, $month) {
FROM cash
WHERE importid IS NOT NULL AND value>0 AND EXTRACT(YEAR FROM to_timestamp(time))=' . $year . ' AND EXTRACT(MONTH FROM to_timestamp(time))=' . $month . '
GROUP BY EXTRACT(DAY FROM to_timestamp(time))
ORDER BY day
');
return $income;
}
Expand All @@ -24,7 +25,7 @@ function IncomePerMonth($only_year) {
global $LMS, $SMARTY, $SESSION;
$db = LMSDB::getInstance();

$income = $db->GetAll('SELECT EXTRACT(MONTH FROM to_timestamp(time)) AS month, SUM(value) AS suma FROM cash WHERE importid IS NOT NULL AND value>0 AND EXTRACT(YEAR FROM to_timestamp(time))=' . $only_year . ' GROUP BY EXTRACT(MONTH FROM to_timestamp(time))');
$income = $db->GetAll('SELECT EXTRACT(MONTH FROM to_timestamp(time)) AS month, SUM(value) AS suma FROM cash WHERE importid IS NOT NULL AND value>0 AND EXTRACT(YEAR FROM to_timestamp(time))=' . $only_year . ' GROUP BY EXTRACT(MONTH FROM to_timestamp(time)) ORDER BY month');
return $income;
}

Expand Down