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

16
_include/ajax/update_presence.php
View File

@@ -1,16 +0,0 @@
<?php
//ini_set('include_path', '/opt/lampp/htdocs/badminton_coach/_class');
//include('class_sql.php');
echo "juhuuu";
foreach ($_POST as $key => $value) {
trigger_error($key, E_USER_NOTICE);
}
if ($_POST['checked'] == true) {
//$sql = new sql('localhost','root','','badminton_coach');
$sql->insert_into('presence', array('pr_user_kid_uk_id' => $_POST['user_id'], 'pr_training_tr_id' => $_POST['tr_id']));
}
else {
$sql->execute_query('delete from presence where pr_user_kid_uk_id = ' . $_POST['user_id'] . ' AND pr_training_tr_id = ' . $_POST['tr_id']);
}
?>

2
_include/include_cities.php
View File

@@ -14,7 +14,7 @@ else {
# VÁROS LISTA
$scc_query = "SELECT * FROM school_city ORDER BY scc_city ASC";
$scc_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY scc_city ASC";
$scc_assoc_array = $sql->assoc_array($scc_query);
$smarty->assign('scc_assoc_array',$scc_assoc_array);

2
_include/include_coaches.php
View File

@@ -16,7 +16,7 @@ if ($this->is_id()) {
else {
# TAG LISTA
$user_list_query = "SELECT * FROM user_coach ORDER BY ua_name ASC;";
$user_list_query = "SELECT * FROM user_coach WHERE ua_deleted = 0 ORDER BY ua_name ASC;";
$user_list_assoc_array = $sql->assoc_array($user_list_query);
//végigmegyünk a tömbbön, objektumot csinálunk belőlük, és átadjuk egy array-ben a template-nek
$user_array = array();

15
_include/include_delete_city.php
View File

@@ -1,8 +1,19 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM school_city WHERE scc_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM school_city WHERE scc_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//akiknek ez a city_id van beállítva, azoknál null-ra állítjuk
$school_city_query = "SELECT uk_id FROM user_kid WHERE uk_school_city_scc_id = " . $this->get_id();
$school_city_assoc_array = $sql->assoc_array($school_city_query);
foreach ($school_city_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_school_city_scc_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$sql->update_table('school_city', array('scc_deleted' => 1), array('scc_id' => $this->get_id()));
log::register('delete_city', $this->get_id());
header("Location: /admin/cities");
}

6
_include/include_delete_coach.php
View File

@@ -1,8 +1,10 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM user_coach WHERE ua_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM user_coach WHERE ua_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
$sql->update_table('user_coach', array('ua_deleted' => 1), array('ua_id' => $this->get_id()));
log::register('delete_coach', $this->get_id());
header("Location: /admin/coaches");
}

6
_include/include_delete_member.php
View File

@@ -1,8 +1,10 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM user_kid WHERE uk_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM user_kid WHERE uk_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
$sql->update_table('user_kid', array('uk_deleted' => 1), array('uk_id' => $this->get_id()));
log::register('delete_member', $this->get_id());
header("Location: /admin/members");
}

21
_include/include_delete_parent.php
View File

@@ -1,8 +1,25 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM user_parent WHERE up_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM user_parent WHERE up_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//kigayűjtük azokat a gyerek ID-kat (a törölteket is!), akiknél ez a szülő van beállítva első vagy második helyen
$parent_1_query = "SELECT uk_id FROM user_kid WHERE uk_parent_1 = " . $this->get_id();
$parent1_assoc_array = $sql->assoc_array($parent_1_query);
foreach ($parent1_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_parent_1' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$parent_2_query = "SELECT uk_id FROM user_kid WHERE uk_parent_2 = " . $this->get_id();
$parent2_assoc_array = $sql->assoc_array($parent_2_query);
foreach ($parent2_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_parent_2' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$sql->update_table('user_parent', array('up_deleted' => 1), array('up_id' => $this->get_id()));
log::register('delete_parent', $this->get_id());
header("Location: /admin/parents");
}

15
_include/include_delete_region.php
View File

@@ -1,8 +1,19 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM region WHERE reg_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM region WHERE reg_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//akiknek ez a school_id van beállítva, azoknál null-ra állítjuk
$region_query = "SELECT uk_id FROM user_kid WHERE uk_region_reg_id = " . $this->get_id();
$region_assoc_array = $sql->assoc_array($region_query);
foreach ($region_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_region_reg_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$sql->update_table('region', array('reg_deleted' => 1), array('reg_id' => $this->get_id()));
log::register('delete_region', $this->get_id());
header("Location: /admin/regions");
}

15
_include/include_delete_school.php
View File

@@ -1,8 +1,19 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM school WHERE sc_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM school WHERE sc_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//akiknek ez a school_id van beállítva, azoknál null-ra állítjuk
$school_query = "SELECT uk_id FROM user_kid WHERE uk_school_sc_id = " . $this->get_id();
$school_assoc_array = $sql->assoc_array($school_query);
foreach ($school_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_school_sc_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$sql->update_table('school', array('sc_deleted' => 1), array('sc_id' => $this->get_id()));
log::register('delete_school', $this->get_id());
header("Location: /admin/schools");
}

15
_include/include_delete_shirt.php
View File

@@ -1,8 +1,19 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM shirt WHERE shirt_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM shirt WHERE shirt_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//akiknek ez a shirt_id van beállítva, azoknál null-ra állítjuk
$shirt_query = "SELECT uk_id FROM user_kid WHERE uk_shirt_size_ss_id = " . $this->get_id();
$shirt_assoc_array = $sql->assoc_array($shirt_query);
foreach ($shirt_assoc_array as $uk_id) {
$sql->update_table('user_kid', array('uk_shirt_size_ss_id' => 'null'), array('uk_id' => $uk_id['uk_id']));
}
$sql->update_table('shirt', array('shirt_deleted' => 1), array('shirt_id' => $this->get_id()));
log::register('delete_shirt', $this->get_id());
header("Location: /admin/shirts");
}

12
_include/include_delete_training.php
View File

@@ -2,10 +2,14 @@
if ($this->is_id()) {
//először ki kell törölni a coachokat
$delete_coach_query = "DELETE FROM training_coach WHERE trc_training_tr_id = " . $this->get_id() . ";";
$sql->execute_query($delete_coach_query);
$delete_query = "DELETE FROM training WHERE tr_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_coach_query = "DELETE FROM training_coach WHERE trc_training_tr_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_coach_query);
//$delete_query = "DELETE FROM training WHERE tr_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
$sql->update_table('training', array('tr_deleted' => 1), array('tr_id' => $this->get_id()));
log::register('delete_training', $this->get_id());
header("Location: /admin/trainings");
}

16
_include/include_delete_training_type.php
View File

@@ -1,8 +1,20 @@
<?php
if ($this->is_id()) {
$delete_query = "DELETE FROM training_type WHERE trt_id = " . $this->get_id() . ";";
$sql->execute_query($delete_query);
//$delete_query = "DELETE FROM training_type WHERE trt_id = " . $this->get_id() . ";";
//$sql->execute_query($delete_query);
//ahol ez a trt_id van beállítva, ott null-ra állítjuk
$training_query = "SELECT tr_id FROM training WHERE tr_training_type_trt_id = " . $this->get_id();
$training_assoc_array = $sql->assoc_array($training_query);
foreach ($training_assoc_array as $tr_id) {
$sql->update_table('training', array('tr_training_type_trt_id' => 'null'), array('tr_id' => $tr_id['tr_id']));
}
$sql->update_table('training_type', array('trt_deleted' => 1), array('trt_id' => $this->get_id()));
log::register('delete_training_type', $this->get_id());
header("Location: /admin/training_types");
}

1
_include/include_diary.php
View File

@@ -12,6 +12,7 @@ else {
JOIN training ON tr_id = pr_training_tr_id
WHERE
pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_deleted = 0
ORDER BY tr_date DESC;
";

1
_include/include_lock_training.php
View File

@@ -15,6 +15,7 @@ if ($this->is_id()) {
'tr_id' => $this->get_id()
)
);
log::register(($locked?'training_open':'training_close'), $this->get_id());
header('Location: /admin/presence/' . $this->get_id());
}

23
_include/include_log.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
if ($this->is_id()) {
# LOG DEATAILS
}
else {
# LOG LIST
$log_query = "SELECT * FROM log ORDER BY log_date DESC LIMIT 50;";
$log_assoc_array = $sql->assoc_array($log_query);
$log_array = array();
foreach ($log_assoc_array as $log_list_array) {
$current_log = new log();
$current_log->set_log_data_by_id($log_list_array['log_id']);
$log_array[] = $current_log;
}
$smarty->assign('log_array', $log_array);
$smarty->display('log.tpl');
}
?>

8
_include/include_logout.php
View File

@@ -1,5 +1,13 @@
<?php
if ($from == 'coach') {
$log_c = 'admin_logout';
}
elseif ($from == 'parent') {
$log_c = 'kid_logout';
}
log::register($log_c, $_COOKIE['badminton_'.$from.'_user']);
setcookie('badminton_'.$from.'_user', 'null', time()-60*60*72, '/');
unset($_COOKIE['badminton_'.$from.'_user']);
header('Location: http://' . $_SERVER['HTTP_HOST']);

12
_include/include_members.php
View File

@@ -8,19 +8,19 @@ if ($this->is_id()) {
$user_data_query = "SELECT * FROM user_kid WHERE uk_id = " . $this->get_id();
$user_data_assoc_array = $sql->assoc_array($user_data_query);
//pólóméret array
$shirt_size_query = "SELECT * FROM shirt;";
$shirt_size_query = "SELECT * FROM shirt WHERE shirt_deleted = 0;";
$shirt_size_assoc_array = $sql->assoc_array($shirt_size_query);
//szülő array
$parent_query = "SELECT * FROM user_parent ORDER BY up_name ASC;";
$parent_query = "SELECT * FROM user_parent WHERE up_deleted = 0 ORDER BY up_name ASC;";
$parent_assoc_array = $sql->assoc_array($parent_query);
//SCHOOL ARRAY
$school_query = "SELECT * FROM school ORDER BY sc_name ASC;";
$school_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC;";
$school_assoc_array = $sql->assoc_array($school_query);
//SCHOOL CITY ARRAY
$school_city_query = "SELECT * FROM school_city ORDER BY scc_city ASC;";
$school_city_query = "SELECT * FROM school_city WHERE scc_deleted = 0 ORDER BY scc_city ASC;";
$school_city_assoc_array = $sql->assoc_array($school_city_query);
//REGION ARRAY
$region_query = "SELECT * FROM region ORDER BY reg_name ASC;";
$region_query = "SELECT * FROM region WHERE reg_deleted = 0 ORDER BY reg_name ASC;";
$region_assoc_array = $sql->assoc_array($region_query);
//smarty thingz
$smarty->assign('school_assoc_array', $school_assoc_array);
@@ -34,7 +34,7 @@ if ($this->is_id()) {
else {
# TAG LISTA
$user_list_query = "SELECT * FROM user_kid ORDER BY uk_name ASC;";
$user_list_query = "SELECT * FROM user_kid WHERE uk_deleted = 0 ORDER BY uk_name ASC;";
$user_list_assoc_array = $sql->assoc_array($user_list_query);
//végigmegyünk a tömbbön, objektumot csinálunk belőlük, és átadjuk egy array-ben a template-nek
$user_array = array();

2
_include/include_parents.php
View File

@@ -16,7 +16,7 @@ if ($this->is_id()) {
else {
# SZÜLŐ LISTA
$parent_query = "SELECT * FROM user_parent ORDER BY up_name ASC;";
$parent_query = "SELECT * FROM user_parent WHERE up_deleted = 0 ORDER BY up_name ASC;";
$parent_assoc_array = $sql->assoc_array($parent_query);
$parent_array = array();
foreach ($parent_assoc_array as $parent) {

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();

2
_include/include_regions.php
View File

@@ -14,7 +14,7 @@ else {
# RÉGIÓ LISTA
$reg_query = "SELECT * FROM region ORDER BY reg_name ASC";
$reg_query = "SELECT * FROM region WHERE reg_deleted = 0 ORDER BY reg_name ASC";
$reg_assoc_array = $sql->assoc_array($reg_query);
$smarty->assign('reg_assoc_array',$reg_assoc_array);

2
_include/include_schools.php
View File

@@ -14,7 +14,7 @@ else {
# ISKOLA LISTA
$tr_type_query = "SELECT * FROM school ORDER BY sc_name ASC";
$tr_type_query = "SELECT * FROM school WHERE sc_deleted = 0 ORDER BY sc_name ASC";
$tr_type_assoc_array = $sql->assoc_array($tr_type_query);
$smarty->assign('school_assoc_array',$tr_type_assoc_array);

2
_include/include_shirts.php
View File

@@ -17,7 +17,7 @@ else {
# PÓLÓ LISTA
$shirt_query = "SELECT * FROM shirt ORDER BY shirt_name ASC";
$shirt_query = "SELECT * FROM shirt WHERE shirt_deleted = 0 ORDER BY shirt_name ASC";
$shirt_assoc_array = $sql->assoc_array($shirt_query);
$smarty->assign('shirt_assoc_array',$shirt_assoc_array);

2
_include/include_training_types.php
View File

@@ -14,7 +14,7 @@ else {
# EDZÉS TÍPUS LISTA
$tr_type_query = "SELECT * FROM training_type ORDER BY trt_name ASC";
$tr_type_query = "SELECT * FROM training_type WHERE trt_deleted = 0 ORDER BY trt_name ASC";
$tr_type_assoc_array = $sql->assoc_array($tr_type_query);
$smarty->assign('tr_type_assoc_array',$tr_type_assoc_array);

6
_include/include_trainings.php
View File

@@ -11,11 +11,11 @@ if ($this->is_id()) {
$training_data_assoc_array = $sql->assoc_array($training_data_query);
$smarty->assign('training_data', $training_data_assoc_array[0]);
//TRAINING TYPE ARRAY
$training_type_query = "SELECT * FROM training_type ORDER BY trt_name ASC;";
$training_type_query = "SELECT * FROM training_type WHERE trt_deleted = 0 ORDER BY trt_name ASC;";
$training_type_assoc_array = $sql->assoc_array($training_type_query);
$smarty->assign("training_type_assoc_array", $training_type_assoc_array);
//COACH ARRAY
$coach_data_query = "SELECT * FROM user_coach ORDER BY ua_id ASC;";
$coach_data_query = "SELECT * FROM user_coach WHERE ua_deleted = 0 ORDER BY ua_id ASC;";
$coach_data_assoc_array = $sql->assoc_array($coach_data_query);
$coach_array = array();
foreach ($coach_data_assoc_array as $coach_data) {
@@ -46,7 +46,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();