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

user-level megszuntetese; uj oszlopok a befizeteshez

Browse Source
This commit is contained in:
Richard Toth
2024-10-27 16:03:15 +01:00
parent 22b07e7377
commit b66f6393ca
13 changed files with 73 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_include/include_create.php
View File

@@ -35,16 +35,12 @@ switch ($this->get_id()) {
//training type array
//$tt_assoc_array = $sql->assoc_array("SELECT * FROM training_type WHERE trt_deleted = 0 ORDER by trt_name ASC;");
//lease assoc array
$l_assoc_array = $sql->assoc_array("SELECT * FROM lease WHERE l_deleted = 0 ORDER BY l_name ASC;");
$smarty->assign('region_assoc_array', $region_assoc_array);
$smarty->assign('shirt_size_assoc_array', $shirt_size_assoc_array);
$smarty->assign('school_assoc_array', $schools);
$smarty->assign('school_city_assoc_array', $school_cities);
$smarty->assign('parent_assoc_array', $parent_assoc_array);
//$smarty->assign('tt_assoc_array', $tt_assoc_array);
$smarty->assign('l_assoc_array', $l_assoc_array);
$smarty->assign('today', date("Y-m-d"));
$smarty->display('user_data_create.tpl');

4
_include/include_members.php
View File

@@ -37,9 +37,6 @@ if ($this->is_id()) {
//training type array
//$tt_assoc_array = $sql->assoc_array("SELECT * FROM training_type WHERE trt_deleted = 0 ORDER by trt_name ASC;");
//lease assoc array
$l_assoc_array = $sql->assoc_array("SELECT * FROM lease WHERE l_deleted = 0 ORDER BY l_name ASC;");
//smarty thingz
$smarty->assign('school_assoc_array', $schools);
@@ -49,7 +46,6 @@ if ($this->is_id()) {
$smarty->assign('shirt_size_assoc_array', $shirt_size_assoc_array);
$smarty->assign('parent_assoc_array', $parent_assoc_array);
//$smarty->assign('tt_assoc_array', $tt_assoc_array);
$smarty->assign('l_assoc_array', $l_assoc_array);
$smarty->display('user_data_'.$tpl.'.tpl');
}
else {

2
_include/include_money_deposit.php
View File

@@ -37,7 +37,7 @@ if ($this->is_id()) {
}
else {
# BEFIZETÉS LISTA
$mod_query = "SELECT * FROM money_deposit JOIN money_income ON mod_money_income_mi_id = mi_id WHERE mod_deleted = 0 ORDER BY mi_date DESC, mi_id DESC;";
$mod_query = "SELECT * FROM money_deposit JOIN money_income ON mod_money_income_mi_id = mi_id WHERE mod_deleted = 0 ORDER BY mi_date DESC, mi_id DESC LIMIT 5;";
$mod_array = array();
$mod_assoc_array = $sql->assoc_array($mod_query);

41
_include/include_presence.php
View File

@@ -72,7 +72,7 @@ if ($this->is_id()) {
$exeptions[] = $user->get_uk_id();
}
/*
$rest_user_query = "
SELECT
uk_id
@@ -93,44 +93,7 @@ if ($this->is_id()) {
GROUP BY uk_id
ORDER BY uk_name;
";
*/
$rest_user_query = "
SELECT
*
FROM
(SELECT DISTINCT
uk_id, uk_name
FROM
user_kid
-- LEFT JOIN user_kid_training_type ON uktt_user_kid_uk_id = uk_id
LEFT JOIN user_kid_lease ON ukl_user_kid_uk_id = uk_id
LEFT JOIN lease_training_type ON ltt_lease_l_id = ukl_lease_l_id
WHERE
(uk_deleted = 0 AND uk_is_active = 1)
AND (ltt_training_type_trt_id = {$training->get_tr_training_type_trt_id()}
OR uk_lease = 0) UNION SELECT DISTINCT
uk_id, uk_name
FROM
user_kid
LEFT JOIN money_deposit ON mod_user_kid_uk_id = uk_id
AND mod_expire_date > NOW()
AND mod_deleted = 0
LEFT JOIN lease ON l_id = mod_lease_l_id
LEFT JOIN lease_training_type ON ltt_lease_l_id = l_id
WHERE
uk_deleted = 0 AND uk_is_active = 1
AND ((uk_lease = 1 AND mod_id IS NOT NULL
AND ltt_training_type_trt_id = {$training->get_tr_training_type_trt_id()})
OR (uk_lease = 0 AND mod_lease_l_id IS NULL)) UNION SELECT DISTINCT
uk_id, uk_name
FROM
presence
JOIN user_kid ON pr_user_kid_uk_id = uk_id
WHERE
pr_training_tr_id = {$training->get_tr_id()}) AS res
ORDER BY uk_name
;
";
//var_dump($rest_user_query);
$rest_user_assoc_array = $sql->assoc_array($rest_user_query);