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

20161230

Browse Source 
sql delete replaced by delete flag
log list (simple), log categories
minor bug fixes in css
This commit is contained in:
Ricsi
2016-12-30 18:00:05 +01:00
parent 664097a976
commit 5a78b09a38
39 changed files with 557 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
_include/include_presence.php
View File

@@ -34,7 +34,7 @@ if ($this->is_id()) {
$tr_ids = array();
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_date = '" . $actual_date . "' and tr_training_type_trt_id = " . $training->get_tr_training_type_trt_id() . ";";
$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);
if ($tr_id) $tr_ids[] = $tr_id;
}
@@ -43,8 +43,11 @@ if ($this->is_id()) {
SELECT `pr_user_kid_uk_id` , count( `pr_id` ) AS 'presence'
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
AND `tr_deleted` = 0
GROUP BY `pr_user_kid_uk_id`
ORDER BY count( `pr_id` ) DESC, uk_name ASC;
";
@@ -66,8 +69,8 @@ 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) . ") ORDER BY uk_name ASC;"; //ha vannak kiemelt userek
else $rest_user_query = "SELECT * FROM user_kid ORDER BY uk_name;"; //ha nincsenek kiemelt userek
if (!empty($exeptions)) $rest_user_query = "SELECT * FROM user_kid WHERE uk_id NOT IN (" . implode(',', $exeptions) . ") AND uk_deleted = 0 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
$rest_user_assoc_array = $sql->assoc_array($rest_user_query);
foreach ($rest_user_assoc_array as $rest_user) {
$user = new user_kid();
@@ -78,7 +81,7 @@ if ($this->is_id()) {
//TRAINING-COACH ARRAY
$trc_query = "SELECT * FROM training_coach WHERE trc_helper = 0 AND trc_training_tr_id = " . $this->get_id();
$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();
$trc_assoc_array = $sql->assoc_array($trc_query);
foreach ($trc_assoc_array as $trc_data) {
@@ -88,7 +91,7 @@ if ($this->is_id()) {
}
//TRAINING-HELPER ARRAY
$trc_query = "SELECT * FROM training_coach WHERE trc_helper = 1 AND trc_training_tr_id = " . $this->get_id();
$trc_query = "SELECT * FROM training_coach JOIN user_coach ON ua_id = trc_coach_uc_id WHERE trc_helper = 1 AND ua_deleted = 0 AND trc_training_tr_id = " . $this->get_id();
$trc_helpers = array();
$trc_assoc_array = $sql->assoc_array($trc_query);
foreach ($trc_assoc_array as $trc_data) {
@@ -111,9 +114,11 @@ if ($this->is_id()) {
FROM `presence`
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;
";
$presence_assoc_array = $sql->assoc_array($presence_query);
foreach ($presence_assoc_array as $presence) {
$s_user = new user_kid();
@@ -125,7 +130,7 @@ if ($this->is_id()) {
$smarty->assign('training', $training);
$smarty->assign('trainings', $tr_ids);
$smarty->assign('headcount', $headcount);
$smarty->assign('headcount', count($presence_assoc_array));
$smarty->assign("trc_coaches", $trc_coaches);
$smarty->assign("trc_helpers", $trc_helpers);
$smarty->assign('presence_assoc_array', $presence_assoc_array);
@@ -139,7 +144,7 @@ if ($this->is_id()) {
}
else {
$traning_list_query = "SELECT * FROM training ORDER BY tr_date DESC;";
$traning_list_query = "SELECT * FROM training WHERE tr_deleted = 0 ORDER BY tr_date DESC;";
$training_list_assoc_array = $sql->assoc_array($traning_list_query);
$training_array = array();