updates and restart camps

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

View File

@@ -11,12 +11,12 @@
!$action@first &&
$actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' &&
$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_date()|substr:5:2
$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2
}
</div>
<span onclick="block_action('block_{$action->get_de_training()->get_tr_date()|substr:0:4}{$action->get_de_training()->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}.
<span onclick="block_action('block_{$action->get_de_training()->get_tr_date()|substr:0:4}{$action->get_de_training()->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés)
<div class="diary_header">
@@ -27,7 +27,7 @@
<div id="block_{$action->get_de_training()->get_tr_date()|substr:0:4}{$action->get_de_training()->get_tr_date()|substr:5:2}" class="month_block">
{elseif $action@first}
<span onclick="block_action('block_{$action->get_de_training()->get_tr_date()|substr:0:4}{$action->get_de_training()->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}.
<span onclick="block_action('block_{$action->get_de_training()->get_tr_date()|substr:0:4}{$action->get_de_training()->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_training()->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_training()->get_tr_date()|substr:0:4},{$action->get_de_training()->get_tr_date()|substr:5:2})} edzés)
<div class="diary_header">
@@ -41,15 +41,15 @@
<div class="row">
<div class="list_item line_height14 bigger_space">
<span class="size20 bold">
{$action->get_de_training()->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]}
{$action->get_de_training()->get_tr_date_day()}.
{$days[$action->get_de_training()->get_tr_date_day_of_week()]}
{$action->get_de_training()->get_tr_date_time()}
{$action->get_de_training()->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_training()->get_tr_date()|substr:5:2]}
{$action->get_de_training()->get_tr_date_day()}.
{$days[$action->get_de_training()->get_tr_date_day_of_week()]}
{$action->get_de_training()->get_tr_date_time()}
</span>
<br>
{if $action->get_de_training()->get_tr_training_type_trt_id()}{$action->get_de_training()->get_tr_type_name_by_id()} edzés{/if}
{$action->get_de_training()->get_tr_duration()} p
{if $action->get_de_training()->get_tr_training_type_trt_id()}{$action->get_de_training()->get_tr_type_name_by_id()} edzés{/if}
{$action->get_de_training()->get_tr_duration()} p
{if $action->get_de_training()->is_coach()}
{foreach $action->get_de_training()->get_tr_coaches_name() as $coach_name}
{if $coach_name@first}({/if}{$coach_name}{if $coach_name@last}){else}, {/if}
@@ -74,7 +74,7 @@
</div>
<div class="side_block">
<span class="bold" style="font-size: 20px;">{if $action->get_de_balance()>0}+{/if}{$action->get_de_balance()|number_format:0:'':' '} Ft</span><br>{$discount}
</div>
@@ -85,44 +85,44 @@
{if !$action@first &&
$actions[$action@index-1]->get_de_training()|is_a:'training' &&
$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2
$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_training()->get_tr_date()|substr:5:2
||
!$action@first &&
$actions[$action@index-1]->get_de_money_deposit()|is_a:'money_deposit' &&
$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_date()|substr:5:2
$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2 != $actions[$action@index-1]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2
}
</div>
<span onclick="block_action('block_{$action->get_de_money_deposit()->get_mod_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_date()|substr:5:2})} edzés)
<span onclick="block_action('block_{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés)
<img src="/_image/open_folder.png">
</span>
<div id="block_{$action->get_de_money_deposit()->get_mod_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_date()|substr:5:2}" class="month_block">
<div id="block_{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2}" class="month_block">
{elseif $action@first}
<span onclick="block_action('block_{$action->get_de_money_deposit()->get_mod_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_date()|substr:5:2})} edzés)
<span onclick="block_action('block_{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]}
({$user_login->get_training_number_in_month({$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4},{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2})} edzés)
<img src="/_image/open_folder.png">
</span>
<div id="block_{$action->get_de_money_deposit()->get_mod_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_date()|substr:5:2}" class="month_block">
<div id="block_{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2}" class="month_block">
{/if}
<div class="row">
<div class="list_item line_height14 bigger_space money_deposit">
<span class="size20 bold">
{$action->get_de_money_deposit()->get_mod_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_date()|substr:5:2]}
{$action->get_de_money_deposit()->get_mod_date_day()}.
{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:0:4}.
{$months[$actions[$action@index]->get_de_money_deposit()->get_mod_money_income()->get_mi_date()|substr:5:2]}
{$action->get_de_money_deposit()->get_mod_money_income()->get_mi_date_day()}.
</span>
<br>
befizetés: {$action->get_de_money_deposit()->get_mod_sum(true)} Ft
befizetés: {$action->get_de_money_deposit()->get_mod_money_income()->get_mi_sum(true)} Ft
</div>
<div class="side_block">
@@ -171,8 +171,8 @@ $( document ).ready(function() {
var div_list = $( ".list" ).find( divs );
open_block(div_list[0].id);
});
</script>
</script>