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

work on presence changes (has error)

Browse Source
This commit is contained in:
Richard Toth
2020-09-08 15:40:57 +02:00
parent c2c61460b6
commit 6ee00f7514
7 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_include/include_create.php
View File

@@ -33,14 +33,18 @@ switch ($this->get_id()) {
$region_assoc_array = $sql->assoc_array($region_query);
//training type array
$tt_assoc_array = $sql->assoc_array("SELECT * FROM training_type WHERE trt_deleted = 0 ORDER by trt_name ASC;");
//$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('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');

8
_include/include_members.php
View File

@@ -36,7 +36,10 @@ if ($this->is_id()) {
$region_assoc_array = $sql->assoc_array($region_query);
//training type array
$tt_assoc_array = $sql->assoc_array("SELECT * FROM training_type WHERE trt_deleted = 0 ORDER by trt_name ASC;");
//$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);
@@ -45,7 +48,8 @@ if ($this->is_id()) {
$smarty->assign('user_data', $user_data_assoc_array[0]);
$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('tt_assoc_array', $tt_assoc_array);
$smarty->assign('l_assoc_array', $l_assoc_array);
$smarty->display('user_data_'.$tpl.'.tpl');
}
else {

6
_include/include_presence.php
View File

@@ -102,10 +102,12 @@ if ($this->is_id()) {
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_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 (uktt_training_type_tt_id = {$training->get_tr_training_type_trt_id()}
AND (ltt_training_type_tt_id = {$training->get_tr_training_type_trt_id()}
OR uk_lease = 0) UNION SELECT DISTINCT
uk_id, uk_name
FROM