diff --git a/_include/include_presence.php b/_include/include_presence.php index 23f3c7c..5999605 100644 --- a/_include/include_presence.php +++ b/_include/include_presence.php @@ -78,18 +78,21 @@ if ($this->is_id()) { FROM user_kid LEFT JOIN - money_deposit ON mod_user_kid_uk_id = uk_id AND mod_expire_date > now() AND mod_deleted = 0 + 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_training_type_trt_id = {$training->get_tr_training_type_trt_id()} + 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 ((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)) GROUP BY uk_id ORDER BY uk_name; "; + //var_dump($rest_user_query); $rest_user_assoc_array = $sql->assoc_array($rest_user_query); foreach ($rest_user_assoc_array as $rest_user) { $user = new user_kid(); @@ -97,8 +100,6 @@ if ($this->is_id()) { $rest_users[] = $user; } - - //TRAINING-COACH ARRAY $trc_query = "SELECT * FROM training_coach JOIN user_coach ON ua_id = trc_coach_uc_id WHERE trc_helper = 0 AND ua_deleted = 0 AND trc_training_tr_id = " . $this->get_id(); $trc_coaches = array();