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

Zoli requests

Browse Source
This commit is contained in:
Tóth Richárd
2018-09-03 18:19:21 +02:00
parent a50eab7528
commit 180e9af3ff
9 changed files with 134 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
_class/class_user_kid.php
View File

@@ -38,6 +38,7 @@ class user_kid extends user_parent {
private $user_official_age_category;
private $user_contact;
private $user_other;
private $user_balance_transfer;
private $user_deleted;
public function set_uk_id($_uid) {
@@ -263,6 +264,12 @@ class user_kid extends user_parent {
public function get_uk_balance() {
return $this->user_balance;
}
public function set_uk_balance_transfer($_balance_transfer) {
$this->user_balance_transfer = $_balance_transfer;
}
public function get_uk_balance_transfer() {
return $this->user_balance_transfer;
}
public function is_logged_in() {
//leellenőrzi cookie alapján h be vagyunk-e jelentkezve
//JAVÍTVA: adja vissza az adattag igazságértékét
@@ -476,14 +483,29 @@ class user_kid extends user_parent {
global $sql;
//kezdetben 0
$balance = 0;
if (is_object($_user_obj)) {
if (null == $_user_obj->get_uk_balance_transfer()) {
$balance = 0;
}
else {
$balance = $_user_obj->get_uk_balance_transfer();
}
}
else {
if (null == $this->get_uk_balance_transfer()) {
$balance = 0;
}
else {
$balance = $this->get_uk_balance_transfer();
}
}
foreach ($_de_obj_array as $i => $_de) {
//minden lépésben az balance-t be kell állítani az előző lépésben updatelt balance-ra
if (isset($_de_obj_array[$i-1])) {
$_de->set_de_balance($_de_obj_array[$i-1]->get_de_balance());
}
if ($_de->get_de_type() == 'training') {
//ha edzés, akkor -1000 levonás, kivéve, ha kedvezményes:
//ha edzés, akkor -1200 levonás, kivéve, ha kedvezményes:
//1-nél több edzés / nap
//8-nál több edzés / hónap
//első két alkalom egyike
@@ -498,13 +520,18 @@ class user_kid extends user_parent {
//TODO: ha van már havi 8+ akk ne nézze a duplázót!
if ($_de->get_de_first_two() > 0) $_de->set_de_discount_id(1);
if ($_de->get_de_training_per_day() > 1) $_de->set_de_discount_id(3);
if ($_de->get_de_training_per_month() > 8) $_de->set_de_discount_id(2);
if ($_de->get_de_training_per_month() > 10) $_de->set_de_discount_id(2);
}
else {
//$balance -= 1000;
$_de->set_de_transaction(-1000); //beállítjuk, mennyivel csökken az egyenleg
$_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction()); //beállítjuk az új egyenleget
//echo $_de->get_de_date() . " minusz 1000<br><br>";
//$balance -= 1200;
$_de->set_de_transaction(-1200); //beállítjuk, mennyivel csökken az egyenleg
if (0 == $i) {
$_de->set_de_balance($balance+$_de->get_de_transaction()); //beállítjuk az új egyenleget
}
else {
$_de->set_de_balance($_de->get_de_balance()+$_de->get_de_transaction()); //beállítjuk az új egyenleget
}
//echo $_de->get_de_date() . " minusz 1200<br><br>";
}
}
elseif ($_de->get_de_type() == 'money_deposit') {

21
_include/include_diary.php
View File

@@ -128,12 +128,23 @@ order by object_date ASC;
}
//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);
//itt csak hivatkozással adjuk át a tömböt, a calculate_balance kiszámolja, belerakja és visszadja
$user->calculate_balance($de_array, $user);
//lekérjük az áthozatot, és felvesszük entryként
$balance_transfer = $user->get_uk_balance_transfer();
if (null == $balance_transfer) {
$balance_transfer = 0;
}
$de_array = array_reverse($de_array);
$smarty->assign('actions', $de_array);
//$de_array[] = $first_entry;
//var_dump($de_array);
//var_dump($de_array);
//$smarty->assign('actions', $actions);
$smarty->assign('actions', $de_array);
$smarty->assign('balance_transfer', $balance_transfer);
//$smarty->assign('balance', $balance);
$smarty->display('user_diary.tpl');

9
_include/include_stats.php
View File

@@ -20,15 +20,22 @@ if ($this->is_id()) {
$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";
$cash_previous_query = "SELECT setv_int FROM setting_value JOIN setting on set_id = setv_setting_set_id WHERE set_name = 'Áthozat (kp)';";
$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";
$transfer_previous_query = "SELECT setv_int FROM setting_value JOIN setting on set_id = setv_setting_set_id WHERE set_name = 'Áthozat (utalás)';";
$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);
$cash_previous = $sql->single_variable($cash_previous_query);
$transfer_previous = $sql->single_variable($transfer_previous_query);
$balance_query = "
select
(select
@@ -43,6 +50,8 @@ if ($this->is_id()) {
$balance = $sql->single_variable($balance_query);
$smarty->assign('cash_previous',$cash_previous);
$smarty->assign('transfer_previous',$transfer_previous);
$smarty->assign('in_cash',$in_cash);
$smarty->assign('out_cash',$out_cash);
$smarty->assign('in_transfer',$in_transfer);

7
template/templates/diary_report.tpl
View File

@@ -2,10 +2,7 @@
{foreach $resi as $key_ => $resii}
{if $resii->get_de_training()|is_a:'training'}
{$key}<br>
{$resii->get_de_training()->get_tr_date()}<br>
{$resii->get_de_training()->get_tr_type_name_by_id()}<br>
{$resii->get_de_training()->get_tr_duration()} perc<br>
{$key};{$resii->get_de_training()->get_tr_date()};{$resii->get_de_training()->get_tr_id()};{$resii->get_de_training()->get_tr_type_name_by_id()};{$resii->get_de_training()->get_tr_duration()} perc;
{if $resii->get_de_has_discount()}
{if $resii->get_de_discount_id() == 1}
Próba kedvezmény<br>
@@ -16,7 +13,7 @@
{/if}
{else}
Fizetős<br>
Fizetős<br>
{/if}
{/if}

22
template/templates/setting_data_edit.tpl
View File

@@ -75,6 +75,28 @@
{/foreach}
</div>
{elseif $setting->get_setv_setting()->get_set_setting_type_st_id() == 4}
<div class="full_width">
<form method="post">
<input type="hidden" name="action" value="settings_data_edit">
<input type="hidden" name="set_id" value="{$setting->get_setv_setting_set_id()}">
<input type="hidden" name="setv_id" value="{$setting->get_setv_id()}">
<input type="hidden" name="st_name" value="{$setting->get_setv_setting()->get_set_setting_type()->get_st_setting_data_type()}">
<div>
<div class="full_width">
<label class="desc" for="uk_birth_year">{$setting->get_setv_setting()->get_set_name()}:</label>
<input name="set_val" id="set_val" value="{$setting->get_setv_int()}">
</div>
</div>
<div>
<div class="right">
<input class="button black" type="submit" value="Mentés">
</div>
</div>
</form>
</div>
{/if}

14
template/templates/stat_balance.tpl
View File

@@ -15,7 +15,11 @@
</div>
<div class="list_item">
<img src="/_image/stat.png">
Készpénz egyenleg: {($in_cash - $out_cash)|number_format:0:'':' '} Ft
Készpénz áthozat: {$cash_previous|number_format:0:'':' '} Ft
</div>
<div class="list_item">
<img src="/_image/stat.png">
Készpénz egyenleg: {($in_cash - $out_cash + $cash_previous)|number_format:0:'':' '} Ft
</div>
</a>
</div>
@@ -32,7 +36,11 @@
</div>
<div class="list_item">
<img src="/_image/stat.png">
Utalás egyenleg: {($in_transfer - $out_transfer)|number_format:0:'':' '} Ft
Utalás áthozat: {$transfer_previous|number_format:0:'':' '} Ft
</div>
<div class="list_item">
<img src="/_image/stat.png">
Utalás egyenleg: {($in_transfer - $out_transfer + $transfer_previous)|number_format:0:'':' '} Ft
</div>
</a>
</div>
@@ -41,7 +49,7 @@
<a href="#">
<div class="list_item">
<img src="/_image/stat.png">
Egyenleg: {(($in_cash + $in_transfer)-($out_cash + $out_transfer))|number_format:0:'':' '} Ft
Egyenleg: {(($in_cash + $in_transfer)-($out_cash + $out_transfer) + $cash_previous + $transfer_previous)|number_format:0:'':' '} Ft
</div>
</a>
</div>

27
template/templates/user_data_create.tpl
View File

@@ -5,7 +5,7 @@
<label class="desc" for="uk_name">Név:</label>
<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" required></div>
</div>
<div>
<label class="desc" for="uk_is_active">Aktív:</label>
@@ -33,7 +33,7 @@
<label class="choice" for="r_02">Lány</label>
</div>
</div>
<div>
<label class="desc" for="uk_birth_date">Születési dátum:</label>
<div><input type="text" name="uk_birth_date" id="uk_birth_date"></div>
@@ -68,7 +68,7 @@
<div><input type="text" name="uk_beforehand" id="uk_beforehand"></div>
</div>
<div>
<legend class="desc" for="uk_hand">Kéz: </legend>
<div>
@@ -85,8 +85,8 @@
<label class="desc" for="uk_level">Szint:</label>
<div><input type="text" name="uk_level" id="uk_level"></div>
</div>
<div>
<label class="desc" for="uk_email">E-mail cím:</label>
<div><input type="email" name="uk_email" id="uk_email"></div>
@@ -136,7 +136,7 @@
</div>
<div>
<label class="desc" for="uk_region_reg_id">Diákolimpia körzet:</label>
@@ -181,6 +181,11 @@
<div><input type="text" name="uk_shirt_note" id="uk_shirt_note"></div>
</div>
<div>
<label class="desc" for="uk_balance_transfer">Áthozat (Ft):</label>
<div><input type="text" name="uk_balance_transfer" id="uk_balance_transfer"></div>
</div>
<div>
<label class="desc" for="uk_parent_1">Szülő:</label>
<div>
@@ -248,7 +253,7 @@
<div><input type="text" name="parent_2_facebook" id="parent_2_facebook"></div>
</div>
<br>
<div>
@@ -256,7 +261,7 @@
<div><textarea rows="7" name="uk_contact" id="uk_contact"></textarea></div>
</div>
<br>
<br>
<div>
<label class="desc" id="title2" for="uk_other">Egyéb:</label>
@@ -264,14 +269,14 @@
</div>
<br>
<div>
<div>
<input class="button black" type="submit" value="Létrehozás">
</div>
</div>
</form>
</div>
@@ -290,4 +295,4 @@ $('#uk_school_sc_id').change(function() {
$(".add_school").toggle(this.value == 'null');
});
</script>
</script>

34
template/templates/user_data_edit.tpl
View File

@@ -11,7 +11,7 @@
<label class="desc" for="uk_name">Név:</label>
<div><input type="text" name="uk_name" id="uk_name" size="8" class="field text fn" value="{$user_data.uk_name}" required></div>
</div>
<div>
<label class="desc" for="uk_is_active">Aktív:</label>
@@ -39,7 +39,7 @@
<label class="choice" for="r_02">Lány</label>
</div>
</div>
<div>
<label class="desc" for="uk_birth_date">Születési dátum:</label>
<div><input type="text" name="uk_birth_date" id="uk_birth_date" value="{$user_data.uk_birth_date}"></div>
@@ -73,7 +73,7 @@
<label class="desc" for="uk_beforehand">Előzmény:</label>
<div><input type="text" name="uk_beforehand" id="uk_beforehand" value="{$user_data.uk_beforehand}"></div>
</div>
<div>
<legend class="desc" for="uk_hand">Kéz: </legend>
<div>
@@ -90,8 +90,8 @@
<label class="desc" for="uk_level">Szint:</label>
<div><input type="text" name="uk_level" id="uk_level" value="{$user_data.uk_level}"></div>
</div>
<div>
<label class="desc" for="uk_email">E-mail cím:</label>
<div><input type="email" name="uk_email" id="uk_email" value="{$user_data.uk_email}"></div>
@@ -126,6 +126,10 @@
<div><input type="text" name="uk_shirt_note" id="uk_shirt_note" value="{$user_data.uk_shirt_note}"></div>
</div>
<div>
<label class="desc" for="uk_balance_transfer">Áthozat (Ft):</label>
<div><input type="text" name="uk_balance_transfer" id="uk_balance_transfer" value="{$user_data.uk_balance_transfer}"></div>
</div>
<div>
<label class="desc" for="uk_school_sc_id">Iskola neve:</label>
@@ -162,7 +166,7 @@
</div>
<div>
<label class="desc" for="uk_region_reg_id">Diákolimpia körzet:</label>
<div>
@@ -221,7 +225,7 @@
</div>
<div>
<label class="desc" id="title2" for="uk_parent_2">Szülő:</label>
@@ -257,8 +261,8 @@
</div>
<br>
<div>
@@ -273,15 +277,15 @@
<div><textarea rows="5" name="uk_other" id="uk_other">{$user_data.uk_other}</textarea></div>
</div>
<br>
<br>
<div>
<div>
<input class="button black" type="submit" value="Mentés">
</div>
</div>
</form>
</div>
@@ -328,7 +332,7 @@
$("#parent_1_phone").val(pdata[1]);
$("#parent_1_email").val(pdata[0]);
$("#parent_1_facebook").val(pdata[2]);
}
});
});
@@ -351,9 +355,9 @@
$("#parent_2_phone").val(pdata[1]);
$("#parent_2_email").val(pdata[0]);
$("#parent_2_facebook").val(pdata[2]);
}
});
});
</script>
</script>

5
template/templates/user_diary.tpl
View File

@@ -134,6 +134,11 @@
{/if}
{if $action@last}
<div class="row">
<div class="list_item line_height14 bigger_space money_deposit">
Áthozat: <span class="bold">{$balance_transfer} Ft</span>
</div>
</div>
</div>