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

CAMP part 1, registration, apply, new login screen, wide layout

Browse Source
This commit is contained in:
Ricsi
2017-06-08 18:35:09 +02:00
parent 7bd93e1730
commit f17adf4850
58 changed files with 4469 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
_include/include_coach_diary.php
View File

@@ -4,27 +4,45 @@
SELECT
*
FROM
training
JOIN
training_coach ON trc_training_tr_id = tr_id
(SELECT
tr_id AS obj_id,
TIMESTAMP(tr_date) AS obj_date,
'training' AS obj_type
FROM
training
JOIN training_coach ON trc_training_tr_id = tr_id
WHERE
trc_coach_uc_id = " . $user->get_ua_id() . " AND tr_deleted = 0
ORDER BY tr_date DESC) valami
UNION (SELECT
mox_id AS obj_id,
TIMESTAMP(date_add(mox_date, INTERVAL '23:59' HOUR_MINUTE)) AS obj_date,
'money_expense' AS obj_type
FROM
money_expense
WHERE
trc_coach_uc_id = " . $user->get_ua_id() . "
ORDER BY tr_date DESC
;
mox_user_coach_ua_id = " . $user->get_ua_id() . " AND mox_deleted = 0) ORDER BY obj_date DESC , obj_type ASC;
";
$action_assoc_array = $sql->assoc_array($action_list_query);
$trainings = array();
foreach ($action_assoc_array as $action) {
$new_training = new training();
$new_training->set_training_data_by_id($action['tr_id']);
$trainings[] = $new_training;
$actions = array();
foreach ($action_assoc_array as $action_array) {
if ('money_expense' == $action_array['obj_type']) {
$action = new $action_array['obj_type']();
$action->set_mox_data_by_id($action_array['obj_id']);
}
elseif ('training' == $action_array['obj_type']) {
$action = new $action_array['obj_type']();
$action->set_training_data_by_id($action_array['obj_id']);
}
$actions[] = $action;
}
$smarty->assign('trainings', $trainings);
//var_dump($actions);
$smarty->assign('actions',$actions);
$smarty->display('coach_diary.tpl');