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

updates and restart camps

Browse Source
This commit is contained in:
Tóth Richárd
2018-05-03 20:27:35 +02:00
parent 392b484666
commit a249c20433
38 changed files with 1153 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
_include/include_create.php Executable file → Normal file
View File

@@ -133,6 +133,9 @@ switch ($this->get_id()) {
$moxc_array[] = $new_moxc;
}
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
$smarty->assign('pt_assoc_array', $pt_assoc_array);
$smarty->assign('moxc_array', $moxc_array);
$smarty->display('money_expense_create.tpl');
break;
@@ -140,6 +143,26 @@ switch ($this->get_id()) {
# ÚJ KIADÁS KATEGÓRIA
$smarty->display('money_expense_category_create.tpl');
break;
case 'money_income_category':
# ÚJ BEVÉTEL KATEGÓRIA
$smarty->display('money_income_category_create.tpl');
break;
case 'money_income':
# ÚJ KIADÁS
$mic_assoc_array = $sql->assoc_array('SELECT * FROM money_income_category WHERE mic_deleted = 0 AND mic_id != 4 ORDER BY mic_name ASC;');
$mic_array = array();
foreach ($mic_assoc_array as $key => $mic) {
$new_mic = new money_income_category();
$new_mic->set_mic_data_by_id($mic['mic_id']);
$mic_array[] = $new_mic;
}
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
$smarty->assign('pt_assoc_array', $pt_assoc_array);
$smarty->assign('mic_array', $mic_array);
$smarty->display('money_income_create.tpl');
break;
case 'backup':
# BACKUP
//létrehozzá, és hozzáfűzi az ID-t a dátumhoz

11
_include/include_delete_money_deposit.php
View File

@@ -1,13 +1,14 @@
<?php
if ($this->is_id()) {
$sql->update_table('money_deposit', array('mod_deleted' => 1), array('mod_id' => $this->get_id()));
$new_mod = new money_deposit();
$new_mod->set_mod_data_by_id($this->get_id());
$sql->update_table('money_deposit', array('mod_deleted' => 1), array('mod_id' => $this->get_id()));
$new_mod = new money_deposit();
$new_mod->set_mod_data_by_id($this->get_id());
$sql->update_table('money_income', array('mi_deleted' => 1), array('mi_id' => $new_mod->get_mod_money_income_mi_id()));
//log::register('update_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')');
log::register('delete_money_deposit', $new_mod->get_mod_user_kid()->get_uk_name() . ': ' . $new_mod->get_mod_sum() . ' Ft (' . $new_mod->get_mod_date() . ')');
log::register('delete_money_deposit', $new_mod->get_mod_user_kid()->get_uk_name() . ': ' . $new_mod->get_mod_money_income()->get_mi_sum() . ' Ft (' . $new_mod->get_mod_money_income()->get_mi_date() . ')');
header("Location: /admin/money_deposit");
}
?>
?>

12
_include/include_delete_money_income.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
if ($this->is_id()) {
$sql->update_table('money_income', array('mi_deleted' => 1), array('mi_id' => $this->get_id()));
$mi = new money_income();
$mi->set_mi_data_by_id($this->get_id());
log::register('delete_mi', $mi->get_mi_item() . ": " . $mi->get_mi_sum() . " Ft");
header("Location: /admin/money_income");
}
?>

18
_include/include_delete_money_income_category.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
if ($this->is_id()) {
$sql->update_table('money_income_category', array('mic_deleted' => 1), array('mic_id' => $this->get_id()));
log::register('delete_mic', $this->get_id());
//akiknek ez a mic_id van beállítva, azoknál null-ra állítjuk
$mi_query = "SELECT mi_id FROM money_income WHERE mi_money_income_category_mic_id = " . $this->get_id();
$mi_assoc_array = $sql->assoc_array($mi_query);
foreach ($mi_assoc_array as $uk_id) {
$sql->update_table('money_income', array('mi_money_income_category_mic_id' => 'null'), array('mi_id' => $uk_id['mi_id']));
}
header("Location: /admin/money_income_category");
}
?>

30
_include/include_diary.php
View File

@@ -3,11 +3,11 @@
$action_list_query = "
SELECT
SELECT
object_id,
timestamp(object_date) as object_date,
object_type,
(SELECT
(SELECT
count(distinct date(tr_date))
FROM
presence
@@ -18,12 +18,12 @@
AND MONTH(tr_date) = MONTH(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_date > (select
AND tr_date > (select
if(max(trd) is null,
'1900-01-01',
max(trd))
from
(select
(select
tr_date trd
from
presence
@@ -31,7 +31,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT
and tr_date >= (SELECT
tr_date
from
presence
@@ -44,7 +44,7 @@
limit 1)
order by tr_date ASC
limit 2) as elso_ket_edzes)) as 'training_per_month',
(SELECT
(SELECT
count(pr_id)
FROM
presence
@@ -54,12 +54,12 @@
DATE(tr_date) = DATE(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user->get_uk_id().") as 'training_per_day',
(select
(select
if(sum(if(trd = object_date, 1, 0)) > 0,
1,
0)
from
(select
(select
tr_date trd
from
presence
@@ -67,7 +67,7 @@
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user->get_uk_id()."
and tr_date >= (SELECT
and tr_date >= (SELECT
tr_date
from
presence
@@ -81,7 +81,7 @@
order by tr_date ASC
limit 2) elso2edzes) as 'first_two'
FROM
((SELECT
((SELECT
pr_training_tr_id as object_id,
timestamp(tr_date) as object_date,
if(pr_training_tr_id is not null, 'training', null) as object_type
@@ -90,12 +90,14 @@ FROM
JOIN training ON tr_id = pr_training_tr_id
WHERE
pr_user_kid_uk_id = ".$user->get_uk_id()."
AND tr_deleted = 0) UNION (SELECT
AND tr_deleted = 0) UNION (SELECT
mod_id,
timestamp(mod_date),
timestamp(mi_date),
if(mod_id is not null, 'money_deposit', null) as object_type
FROM
money_deposit
JOIN
money_income ON mi_id = mod_money_income_mi_id
WHERE
mod_user_kid_uk_id = ".$user->get_uk_id()."
and mod_deleted = 0)) actions
@@ -134,7 +136,7 @@ order by object_date ASC;
$smarty->assign('actions', $de_array);
//$smarty->assign('balance', $balance);
$smarty->display('user_diary.tpl');
?>
?>

158
_include/include_diary_report.php Normal file
View File

@@ -0,0 +1,158 @@
<?php
$res = array();
$users_q = "SELECT * FROM user_kid WHERE uk_deleted = 0 AND uk_is_active = 1 ORDER BY uk_name ASC";
$users = $sql->assoc_array($users_q);
foreach ($users as $key => $user) {
# code...
$action_list_query = "
SELECT
object_id,
timestamp(object_date) as object_date,
object_type,
(SELECT
count(distinct date(tr_date))
FROM
presence
JOIN
training ON tr_id = pr_training_tr_id
WHERE
YEAR(tr_date) = YEAR(object_date)
AND MONTH(tr_date) = MONTH(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user['uk_id']."
AND tr_date > (select
if(max(trd) is null,
'1900-01-01',
max(trd))
from
(select
tr_date trd
from
presence
join training ON tr_id = pr_training_tr_id
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user['uk_id']."
and tr_date >= (SELECT
tr_date
from
presence
join training ON tr_id = pr_training_tr_id
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user['uk_id']."
and date(tr_date) = uk_first_training
ORDER BY tr_date ASC
limit 1)
order by tr_date ASC
limit 2) as elso_ket_edzes)) as 'training_per_month',
(SELECT
count(pr_id)
FROM
presence
JOIN
training ON tr_id = pr_training_tr_id
WHERE
DATE(tr_date) = DATE(object_date)
AND tr_date <= object_date
AND pr_user_kid_uk_id = ".$user['uk_id'].") as 'training_per_day',
(select
if(sum(if(trd = object_date, 1, 0)) > 0,
1,
0)
from
(select
tr_date trd
from
presence
join training ON tr_id = pr_training_tr_id
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user['uk_id']."
and tr_date >= (SELECT
tr_date
from
presence
join training ON tr_id = pr_training_tr_id
join user_kid ON uk_id = pr_user_kid_uk_id
where
pr_user_kid_uk_id = ".$user['uk_id']."
and date(tr_date) = uk_first_training
ORDER BY tr_date ASC
limit 1)
order by tr_date ASC
limit 2) elso2edzes) as 'first_two'
FROM
((SELECT
pr_training_tr_id as object_id,
timestamp(tr_date) as object_date,
if(pr_training_tr_id is not null, 'training', null) as object_type
FROM
presence
JOIN training ON tr_id = pr_training_tr_id
WHERE
pr_user_kid_uk_id = ".$user['uk_id']."
AND tr_deleted = 0) UNION (SELECT
mod_id,
timestamp(mi_date),
if(mod_id is not null, 'money_deposit', null) as object_type
FROM
money_deposit
JOIN
money_income ON mi_id = mod_money_income_mi_id
WHERE
mod_user_kid_uk_id = ".$user['uk_id']."
and mod_deleted = 0)) actions
order by object_date ASC;
";
$action_assoc_array = $sql->assoc_array($action_list_query);
$actions = array();
$de_array = array();
foreach ($action_assoc_array as $action) {
if ($action['object_type'] == 'training') {
$new_training = new training;
$new_training->set_training_data_by_id($action['object_id']);
//$actions[] = $new_training;
$new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], $action['training_per_month'], $action['training_per_day'], $action['first_two'], $new_training);
}
elseif ($action['object_type'] == 'money_deposit') {
$new_mod = new money_deposit;
$new_mod->set_mod_data_by_id($action['object_id']);
//$actions[] = $new_mod;
$new_diary_entry = new diary_entry($action['object_id'], $action['object_date'], $action['object_type'], $action['training_per_month'], $action['training_per_day'], $action['first_two'], null, $new_mod);
}
$de_array[] = $new_diary_entry;
//var_dump($de_array);
}
$user_obj = new user_kid();
$user_obj->set_user_data_by_id($user['uk_id']);
$user_obj->calculate_balance($de_array, $user_obj, false);
$res[$user['uk_name']] = $de_array;
}
//itt csak hivatkozással adjuk át a tömböt, a calculate_balance kiszámolja, belerakja és visszadja
//$user->calculate_balance($de_array, $user);
//var_dump($de_array);
//$smarty->assign('actions', $actions);
$de_array = array_reverse($de_array);
$smarty->assign('actions', $de_array);
$smarty->assign('res', $res);
//$smarty->assign('balance', $balance);
//$smarty->display('user_diary.tpl');
$smarty->display('diary_report.tpl');
?>

2
_include/include_money_deposit.php
View File

@@ -32,7 +32,7 @@ if ($this->is_id()) {
}
else {
# BEFIZETÉS LISTA
$mod_query = "SELECT * FROM money_deposit WHERE mod_deleted = 0 ORDER BY mod_date DESC, mod_id DESC;";
$mod_query = "SELECT * FROM money_deposit JOIN money_income ON mod_money_income_mi_id = mi_id WHERE mod_deleted = 0 ORDER BY mi_date DESC, mi_id DESC;";
$mod_array = array();
$mod_assoc_array = $sql->assoc_array($mod_query);

14
_include/include_money_expense.php
View File

@@ -9,7 +9,7 @@
if ($this->is_id()) {
# ADOTT KIADÁS ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
$new_mox = new money_expense();
$new_mox->set_mox_data_by_id($this->get_id());
@@ -21,14 +21,16 @@ if ($this->is_id()) {
$new_moxc = new money_expense_category();
$new_moxc->set_moxc_data_by_id($mox['moxc_id']);
$moxc_array[] = $new_moxc;
}
}
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
$smarty->assign("moxc_array", $moxc_array);
$smarty->assign('pt_assoc_array', $pt_assoc_array);
$smarty->assign("mox", $new_mox);
$smarty->display("money_expense_data_edit.tpl");
}
else {
# KIADÁS LISTA
@@ -40,11 +42,11 @@ else {
$new_mox = new money_expense();
$new_mox->set_mox_data_by_id($mod['mox_id']);
$mox_array[] = $new_mox;
}
}
$smarty->assign("mox_array", $mox_array);
$smarty->display("money_expense.tpl");
}
?>
?>

16
_include/include_money_expense_category.php
View File

@@ -1,24 +1,24 @@
<?php
# HA NINCS ID, AKKOR KIADÁS KATEGÓRIA LISTA
# HA VAN ID, AKKOR KIADÁS KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
# HA NINCS ID, AKKOR BEVÉTEL KATEGÓRIA LISTA
# HA VAN ID, AKKOR BEVÉTEL KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
if ($this->is_id()) {
# ADOTT KIADÁS KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
# ADOTT BEVÉTEL KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
$new_moxc = new money_expense_category();
$new_moxc->set_moxc_data_by_id($this->get_id());
$smarty->assign("moxc", $new_moxc);
$smarty->display("money_expense_category_data_edit.tpl");
$smarty->display("money_expense_category_data_edit.tpl");
}
else {
# KIADÁS KATEGÓRIA LISTA
# BEVÉTEL KATEGÓRIA LISTA
$moxc_query = "SELECT * FROM money_expense_category WHERE moxc_deleted = 0 ORDER BY moxc_name ASC;";
$moxc_array = array();
$moxc_assoc_array = $sql->assoc_array($moxc_query);
@@ -27,11 +27,11 @@ else {
$new_moxc = new money_expense_category();
$new_moxc->set_moxc_data_by_id($mox['moxc_id']);
$moxc_array[] = $new_moxc;
}
}
$smarty->assign("moxc_assoc_array", $moxc_array);
$smarty->display("money_expense_category.tpl");
}
?>
?>

52
_include/include_money_income.php Normal file
View File

@@ -0,0 +1,52 @@
<?php
# HA NINCS ID, AKKOR BEVÉTEL LISTA
# HA VAN ID, AKKOR BEVÉTEL ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
if ($this->is_id()) {
# ADOTT BEVÉTEL ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
$new_mi = new money_income();
$new_mi->set_mi_data_by_id($this->get_id());
$mic_query = "SELECT * FROM money_income_category WHERE mic_deleted = 0 AND mic_id != 4 ORDER BY mic_name ASC;";
$mic_array = array();
$mic_assoc_array = $sql->assoc_array($mic_query);
foreach ($mic_assoc_array as $mi) {
$new_mic = new money_income_category();
$new_mic->set_mic_data_by_id($mi['mic_id']);
$mic_array[] = $new_mic;
}
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
$smarty->assign("mic_array", $mic_array);
$smarty->assign('pt_assoc_array', $pt_assoc_array);
$smarty->assign("mi", $new_mi);
$smarty->display("money_income_data_edit.tpl");
}
else {
# BEVÉTEL LISTA
$mi_query = "SELECT * FROM money_income WHERE mi_deleted = 0 AND mi_money_income_category_mic_id != 4 ORDER BY mi_date DESC, mi_id DESC;";
$mi_array = array();
$mi_assoc_array = $sql->assoc_array($mi_query);
foreach ($mi_assoc_array as $mod) {
$new_mi = new money_income();
$new_mi->set_mi_data_by_id($mod['mi_id']);
$mi_array[] = $new_mi;
}
$smarty->assign("mi_array", $mi_array);
$smarty->display("money_income.tpl");
}
?>

37
_include/include_money_income_category.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
# HA NINCS ID, AKKOR BEVÉTEL KATEGÓRIA LISTA
# HA VAN ID, AKKOR BEVÉTEL KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
if ($this->is_id()) {
# ADOTT BEVÉTEL KATEGÓRIA ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
$new_mic = new money_income_category();
$new_mic->set_mic_data_by_id($this->get_id());
$smarty->assign("mic", $new_mic);
$smarty->display("money_income_category_data_edit.tpl");
}
else {
# BEVÉTEL KATEGÓRIA LISTA
$mic_query = "SELECT * FROM money_income_category WHERE mic_deleted = 0 AND mic_id != 4 ORDER BY mic_name ASC;";
$mic_array = array();
$mic_assoc_array = $sql->assoc_array($mic_query);
foreach ($mic_assoc_array as $mi) {
$new_mic = new money_income_category();
$new_mic->set_mic_data_by_id($mi['mic_id']);
$mic_array[] = $new_mic;
}
$smarty->assign("mic_assoc_array", $mic_array);
$smarty->display("money_income_category.tpl");
}
?>

37
_include/include_stats.php
View File

@@ -10,12 +10,31 @@ if ($this->is_id()) {
# todo: stat_group-ok és stat_value-k
if (1 == $this->get_id()) {
/* adatok:
bevétel kp + utalás
kiadás kp + utalás
összebevétel
összkiadás
totál balance
*/
$in_cash_query = "SELECT sum(mi_sum) FROM money_income WHERE mi_deleted = 0 AND mi_payment_type_pt_id = 1";
$in_transfer_query = "SELECT sum(mi_sum) FROM money_income WHERE mi_deleted = 0 AND mi_payment_type_pt_id = 2";
$out_cash_query = "SELECT sum(mox_sum) FROM money_expense WHERE mox_deleted = 0 AND mox_payment_type_pt_id = 1";
$out_transfer_query = "SELECT sum(mox_sum) FROM money_expense WHERE mox_deleted = 0 AND mox_payment_type_pt_id = 2";
$in_cash = $sql->single_variable($in_cash_query);
$out_cash = $sql->single_variable($out_cash_query);
$in_transfer = $sql->single_variable($in_transfer_query);
$out_transfer = $sql->single_variable($out_transfer_query);
$balance_query = "
select
(select
sum(mod_sum)
select
(select
sum(mi_sum)
from
money_deposit where mod_deleted = 0) - (select
money_income where mi_deleted = 0) - (select
sum(mox_sum)
from
money_expense where mox_deleted = 0) as diff
@@ -24,6 +43,10 @@ if ($this->is_id()) {
$balance = $sql->single_variable($balance_query);
$smarty->assign('in_cash',$in_cash);
$smarty->assign('out_cash',$out_cash);
$smarty->assign('in_transfer',$in_transfer);
$smarty->assign('out_transfer',$out_transfer);
$smarty->assign('balance',$balance);
$smarty->display('stat_balance.tpl');
}
@@ -31,7 +54,7 @@ if ($this->is_id()) {
}
else {
# STAT LISTA
$stat_query = "SELECT * FROM statistics WHERE stat_deleted = 0 ORDER BY stat_order ASC;";
@@ -46,11 +69,11 @@ else {
$smarty->assign('stats',$stats);
$smarty->display('stat_list.tpl');
}
?>
?>