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

fixes

Browse Source
This commit is contained in:
Tóth Richárd
2018-09-15 15:39:16 +02:00
parent 180e9af3ff
commit edd39eeae3
6 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
_include/include_presence.php
View File

@@ -15,7 +15,7 @@ if ($this->is_id()) {
$presence_query = "SELECT * FROM user_kid ORDER BY uk_name;";
$presence_assoc_array = $sql->assoc_array($presence_query);
//végig kell menni rajta h legeneráljuk az usereket
$users = array();
//var_dump($presence_assoc_array);
/*
@@ -29,7 +29,7 @@ if ($this->is_id()) {
//training data
$training = new training();
$training->set_training_data_by_id($this->get_id());
//SZŰRÉS
$tr_ids = array();
for ($i=1; $i <=4 ; $i++) {
@@ -44,13 +44,13 @@ if ($this->is_id()) {
FROM `presence`
JOIN user_kid ON uk_id = pr_user_kid_uk_id
JOIN training ON tr_id = pr_training_tr_id
WHERE `pr_training_tr_id`
IN ( " . implode(',', $tr_ids) . " )
AND `uk_deleted` = 0
WHERE `pr_training_tr_id`".
(!empty($tr_ids)?"IN ( " . implode(',', $tr_ids) . " ) ":" ")
."AND `uk_deleted` = 0
AND `tr_deleted` = 0
AND `uk_is_active` = 1
GROUP BY `pr_user_kid_uk_id`
ORDER BY count( `pr_id` ) DESC, uk_name ASC;
ORDER BY count( `pr_id` ) DESC, uk_name ASC;
";
//echo $presence_query;
//echo $presence_query;
@@ -71,7 +71,7 @@ if ($this->is_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 ORDER BY uk_name;"; //ha nincsenek 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_assoc_array = $sql->assoc_array($rest_user_query);
foreach ($rest_user_assoc_array as $rest_user) {
$user = new user_kid();
@@ -102,7 +102,7 @@ if ($this->is_id()) {
}
//var_dump($users);
//headcount
$headcount_query = "SELECT * FROM presence WHERE pr_training_tr_id = " . $this->get_id() . ";";
$headcount = $sql->num_of_rows($headcount_query);
@@ -116,7 +116,7 @@ if ($this->is_id()) {
JOIN user_kid ON uk_id = pr_user_kid_uk_id
WHERE `pr_training_tr_id` = ".$this->get_id()."
AND uk_deleted = 0
ORDER BY uk_name ASC;
ORDER BY uk_name ASC;
";
@@ -126,7 +126,7 @@ if ($this->is_id()) {
$s_user->set_user_data_by_id($presence['pr_user_kid_uk_id']);
$s_users[] = $s_user;
}
$smarty->assign('training', $training);
@@ -139,7 +139,7 @@ if ($this->is_id()) {
$smarty->assign('sorted_users', $s_users);
$smarty->assign('rest_users', $rest_users);
$smarty->assign('tr_id', $this->get_id());
$smarty->display("presence.tpl");
}
@@ -159,11 +159,11 @@ else {
$smarty->assign("training_array", $training_array);
$smarty->display("presence_list.tpl");
}
?>
?>