tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates and restart camps

Browse Source
This commit is contained in:
Tóth Richárd
2018-05-03 20:27:35 +02:00
parent 392b484666
commit a249c20433
38 changed files with 1153 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
_include/include_diary.php
View File

@@ -3,11 +3,11 @@
$action_list_query = "
SELECT
SELECT
object_id,
timestamp(object_date) as object_date,
object_type,
(SELECT
(SELECT
count(distinct date(tr_date))
FROM
presence
@@ -18,12 +18,12 @@
AND MONTH(tr_date) = MONTH(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_date > (select
AND tr_date > (select
if(max(trd) is null,
'1900-01-01',
max(trd))
from
(select
(select
tr_date trd
from
presence
@@ -31,7 +31,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT
and tr_date >= (SELECT
tr_date
from
presence
@@ -44,7 +44,7 @@
limit 1)
order by tr_date ASC
limit 2) as elso_ket_edzes)) as 'training_per_month',
(SELECT
(SELECT
count(pr_id)
FROM
presence
@@ -54,12 +54,12 @@
DATE(tr_date) = DATE(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id().") as 'training_per_day',
(select
(select
if(sum(if(trd = object_date, 1, 0)) > 0,
1,
0)
from
(select
(select
tr_date trd
from
presence
@@ -67,7 +67,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT
and tr_date >= (SELECT
tr_date
from
presence
@@ -81,7 +81,7 @@
order by tr_date ASC
limit 2) elso2edzes) as 'first_two'
FROM
((SELECT
((SELECT
pr_training_tr_id as object_id,
timestamp(tr_date) as object_date,
if(pr_training_tr_id is not null, 'training', null) as object_type
@@ -90,12 +90,14 @@ FROM
JOIN training ON tr_id = pr_training_tr_id
WHERE
pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_deleted = 0) UNION (SELECT
AND tr_deleted = 0) UNION (SELECT
mod_id,
timestamp(mod_date),
timestamp(mi_date),
if(mod_id is not null, 'money_deposit', null) as object_type
FROM
money_deposit
JOIN
money_income ON mi_id = mod_money_income_mi_id
WHERE
mod_user_kid_uk_id = ".$user->get_uk_id()."
and mod_deleted = 0)) actions
@@ -134,7 +136,7 @@ order by object_date ASC;
$smarty->assign('actions', $de_array);
//$smarty->assign('balance', $balance);
$smarty->display('user_diary.tpl');
?>
?>