diff --git a/_include/include_presence.php b/_include/include_presence.php index f79f457..e53b96e 100644 --- a/_include/include_presence.php +++ b/_include/include_presence.php @@ -35,7 +35,7 @@ if ($this->is_id()) { //SZŰRÉS $tr_ids = array(); - for ($i=1; $i <=4 ; $i++) { + /*for ($i=1; $i <=4 ; $i++) { $actual_date = date("Y-m-d H:i:s" , strtotime($training->get_tr_date() . " - " . $i . " weeks")); $tr_ids_query = "SELECT * FROM training WHERE tr_deleted = 0 AND tr_date = '" . $actual_date . "' and tr_training_type_trt_id = " . $training->get_tr_training_type_trt_id() . ";"; $tr_id = $sql->single_variable($tr_ids_query); @@ -63,7 +63,7 @@ if ($this->is_id()) { $user->set_user_data_by_id($presence['pr_user_kid_uk_id']); $users[] = $user; } - } + }*/ //legeneráljuk a maradékot $exeptions = array(); @@ -72,8 +72,23 @@ if ($this->is_id()) { $exeptions[] = $user->get_uk_id(); } - if (!empty($exeptions)) $rest_user_query = "SELECT * FROM user_kid WHERE uk_id NOT IN (" . implode(',', $exeptions) . ") AND uk_deleted = 0 AND uk_is_active = 1 ORDER BY uk_name ASC;"; //ha vannak kiemelt userek - else $rest_user_query = "SELECT * FROM user_kid WHERE uk_deleted = 0 AND uk_is_active = 1 ORDER BY uk_name;"; //ha nincsenek kiemelt userek + $rest_user_query = " + SELECT + * + FROM + user_kid + LEFT JOIN + money_deposit ON mod_user_kid_uk_id = uk_id + LEFT JOIN + lease ON l_id = mod_lease_l_id + LEFT JOIN + lease_training_type ON ltt_training_type_trt_id = {$training->get_tr_training_type_trt_id()} + WHERE + uk_deleted = 0 AND uk_is_active = 1 + AND ((uk_lease = 1 AND mod_id IS NOT NULL) + OR (uk_lease = 0 AND mod_lease_l_id IS NULL)) + ORDER BY uk_name; + "; $rest_user_assoc_array = $sql->assoc_array($rest_user_query); foreach ($rest_user_assoc_array as $rest_user) { $user = new user_kid();