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

shirt and money update fix

Browse Source
This commit is contained in:
Tóth Richárd
2018-06-03 18:08:52 +02:00
parent 330f403244
commit a88c0df0d2
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_include/include_camp_shirt_types.php
View File

@@ -16,7 +16,7 @@ else {
# TÁBORI PÓLÓ LISTA # TÁBORI PÓLÓ LISTA
$camp_shirt_query = "SELECT * FROM camp_shirt WHERE cshirt_deleted = 0 ORDER BY cshirt_name ASC"; $camp_shirt_query = "SELECT * FROM camp_shirt WHERE cshirt_deleted = 0 ORDER BY cshirt_id DESC";
$shirt_assoc_array = $sql->assoc_array($camp_shirt_query); $shirt_assoc_array = $sql->assoc_array($camp_shirt_query);
$smarty->assign('shirt_assoc_array',$shirt_assoc_array); $smarty->assign('shirt_assoc_array',$shirt_assoc_array);
@@ -25,4 +25,4 @@ else {
} }
?> ?>

37
_include/include_money_update.php
View File

@@ -7,16 +7,17 @@
$user = new user_kid(); $user = new user_kid();
$user->set_user_data_by_id($value['uk_id']); $user->set_user_data_by_id($value['uk_id']);
# EDZÉS LISTA # EDZÉS LISTA
$action_list_query = "
SELECT $action_list_query = "
SELECT
object_id, object_id,
timestamp(object_date) as object_date, timestamp(object_date) as object_date,
object_type, object_type,
(SELECT (SELECT
count(distinct date(tr_date)) count(distinct date(tr_date))
FROM FROM
presence presence
@@ -27,12 +28,12 @@
AND MONTH(tr_date) = MONTH(object_date) AND MONTH(tr_date) = MONTH(object_date)
AND tr_date <= object_date AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id()." AND pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_date > (select AND tr_date > (select
if(max(trd) is null, if(max(trd) is null,
'1900-01-01', '1900-01-01',
max(trd)) max(trd))
from from
(select (select
tr_date trd tr_date trd
from from
presence presence
@@ -40,7 +41,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id join user_kid ON uk_id = pr_user_kid_uk_id
where where
pr_user_kid_uk_id = ".$user->get_uk_id()." pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT and tr_date >= (SELECT
tr_date tr_date
from from
presence presence
@@ -53,7 +54,7 @@
limit 1) limit 1)
order by tr_date ASC order by tr_date ASC
limit 2) as elso_ket_edzes)) as 'training_per_month', limit 2) as elso_ket_edzes)) as 'training_per_month',
(SELECT (SELECT
count(pr_id) count(pr_id)
FROM FROM
presence presence
@@ -63,12 +64,12 @@
DATE(tr_date) = DATE(object_date) DATE(tr_date) = DATE(object_date)
AND tr_date <= object_date AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id().") as 'training_per_day', 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, if(sum(if(trd = object_date, 1, 0)) > 0,
1, 1,
0) 0)
from from
(select (select
tr_date trd tr_date trd
from from
presence presence
@@ -76,7 +77,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id join user_kid ON uk_id = pr_user_kid_uk_id
where where
pr_user_kid_uk_id = ".$user->get_uk_id()." pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT and tr_date >= (SELECT
tr_date tr_date
from from
presence presence
@@ -90,7 +91,7 @@
order by tr_date ASC order by tr_date ASC
limit 2) elso2edzes) as 'first_two' limit 2) elso2edzes) as 'first_two'
FROM FROM
((SELECT ((SELECT
pr_training_tr_id as object_id, pr_training_tr_id as object_id,
timestamp(tr_date) as object_date, timestamp(tr_date) as object_date,
if(pr_training_tr_id is not null, 'training', null) as object_type if(pr_training_tr_id is not null, 'training', null) as object_type
@@ -99,17 +100,19 @@
JOIN training ON tr_id = pr_training_tr_id JOIN training ON tr_id = pr_training_tr_id
WHERE WHERE
pr_user_kid_uk_id = ".$user->get_uk_id()." pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_deleted = 0) UNION (SELECT AND tr_deleted = 0) UNION (SELECT
mod_id, mod_id,
timestamp(mod_date), timestamp(mi_date),
if(mod_id is not null, 'money_deposit', null) as object_type if(mod_id is not null, 'money_deposit', null) as object_type
FROM FROM
money_deposit money_deposit
JOIN
money_income ON mi_id = mod_money_income_mi_id
WHERE WHERE
mod_user_kid_uk_id = ".$user->get_uk_id()." mod_user_kid_uk_id = ".$user->get_uk_id()."
and mod_deleted = 0)) actions and mod_deleted = 0)) actions
order by object_date ASC; order by object_date ASC;
"; ";
$action_assoc_array = $sql->assoc_array($action_list_query); $action_assoc_array = $sql->assoc_array($action_list_query);
@@ -140,9 +143,9 @@
//var_dump($de_array); //var_dump($de_array);
//$smarty->assign('actions', $actions); //$smarty->assign('actions', $actions);
} }
header('Location: /admin/balance_list' . ($this->is_id()?'/'.$this->get_id():'')); header('Location: /admin/balance_list' . ($this->is_id()?'/'.$this->get_id():''));
?> ?>