added money_expense to coach preview

This commit is contained in:
Ricsi
2017-04-30 00:31:26 +02:00
parent f1d6e2f002
commit 7bd93e1730
6 changed files with 133 additions and 53 deletions

View File

@@ -1,43 +1,87 @@
<div class="list half_width">
{foreach $trainings as $training}
{if
$training@first ||
(
$trainings[$training@index]->get_tr_date()|substr:5:2 != $trainings[$training@index-1]->get_tr_date()|substr:5:2
)
}
{if !$training@first &&
$trainings[$training@index]->get_tr_date()|substr:5:2 != $trainings[$training@index-1]->get_tr_date()|substr:5:2
}
</div>
{/if}
<span onclick="block_action('block_{$training->get_tr_date()|substr:0:4}{$training->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$trainings[$training@index]->get_tr_date()|substr:0:4}.
{$months[$trainings[$training@index]->get_tr_date()|substr:5:2]} ({$user_login->get_training_count_in_month($training->get_tr_date()|substr:0:4,$training->get_tr_date()|substr:5:2)})
<img src="/_image/open_folder.png">
</span>
<div id="block_{$training->get_tr_date()|substr:0:4}{$training->get_tr_date()|substr:5:2}" class="month_block">
{/if}
<div class="list_item line_height14 bigger_space">
<span class="size20 bold">
{$training->get_tr_date()|substr:0:4}.
{$months[$trainings[$training@index]->get_tr_date()|substr:5:2]}
{$training->get_tr_date_day()}.
{$days[$training->get_tr_date_day_of_week()]}
{$training->get_tr_date_time()}
{foreach $actions as $action}
{if $actions[$action@index]|is_a:'training'}
{if !$action@first &&
$actions[$action@index-1]|is_a:'training' &&
$actions[$action@index]->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_tr_date()|substr:5:2
||
!$action@first &&
$actions[$action@index-1]|is_a:'money_expense' &&
$actions[$action@index]->get_tr_date()|substr:5:2 != $actions[$action@index-1]->get_mox_date()|substr:5:2
}
</div>
<span onclick="block_action('block_{$action->get_tr_date()|substr:0:4}{$action->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_tr_date()|substr:5:2]} ({$user_login->get_training_count_in_month($action->get_tr_date()|substr:0:4,$action->get_tr_date()|substr:5:2)} edzés)
<img src="/_image/open_folder.png">
</span>
<br>
{if $training->get_tr_training_type_trt_id()}{$training->get_tr_type_name_by_id()} edzés{/if}
{$training->get_tr_duration()} p
{if $training->is_coach()}
{foreach $training->get_tr_coaches_name() as $coach_name}
{if $coach_name@first}({/if}{$coach_name}{if $coach_name@last}){else}, {/if}
{/foreach}
<div id="block_{$action->get_tr_date()|substr:0:4}{$action->get_tr_date()|substr:5:2}" class="month_block">
{elseif $action@first}
<span onclick="block_action('block_{$action->get_tr_date()|substr:0:4}{$action->get_tr_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_tr_date()|substr:5:2]} ({$user_login->get_training_count_in_month($action->get_tr_date()|substr:0:4,$action->get_tr_date()|substr:5:2)} edzés)
<img src="/_image/open_folder.png">
</span>
<div id="block_{$action->get_tr_date()|substr:0:4}{$action->get_tr_date()|substr:5:2}" class="month_block">
{/if}
<div class="list_item line_height14 bigger_space">
<span class="size20 bold">
{$action->get_tr_date()|substr:0:4}.
{$months[$actions[$action@index]->get_tr_date()|substr:5:2]}
{$action->get_tr_date_day()}.
{$days[$action->get_tr_date_day_of_week()]}
{$action->get_tr_date_time()}
</span>
<br>
{if $action->get_tr_training_type_trt_id()}{$action->get_tr_type_name_by_id()} edzés{/if}
{$action->get_tr_duration()} p
{if $action->is_coach()}
{foreach $action->get_tr_coaches_name() as $coach_name}
{if $coach_name@first}({/if}{$coach_name}{if $coach_name@last}){else}, {/if}
{/foreach}
{/if}
</div>
{elseif $actions[$action@index]|is_a:'money_expense'}
{if !$action@first &&
$actions[$action@index-1]|is_a:'training' &&
$actions[$action@index]->get_mox_date()|substr:5:2 != $actions[$action@index-1]->get_tr_date()|substr:5:2
||
</div>
{if $training@last}
!$action@first &&
$actions[$action@index-1]|is_a:'money_expense' &&
$actions[$action@index]->get_mox_date()|substr:5:2 != $actions[$action@index-1]->get_mox_date()|substr:5:2
}
</div>
<span onclick="block_action('block_{$action->get_mox_date()|substr:0:4}{$action->get_mox_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_mox_date()|substr:0:4}.
{$months[$actions[$action@index]->get_mox_date()|substr:5:2]} ({$user_login->get_training_count_in_month($action->get_mox_date()|substr:0:4,$action->get_mox_date()|substr:5:2)} edzés)
<img src="/_image/open_folder.png">
</span>
<div id="block_{$action->get_mox_date()|substr:0:4}{$action->get_mox_date()|substr:5:2}" class="month_block">
{elseif $action@first}
<span onclick="block_action('block_{$action->get_mox_date()|substr:0:4}{$action->get_mox_date()|substr:5:2}');" class="date_separator clickable">{$actions[$action@index]->get_mox_date()|substr:0:4}.
{$months[$actions[$action@index]->get_mox_date()|substr:5:2]} ({$user_login->get_training_count_in_month($action->get_mox_date()|substr:0:4,$action->get_mox_date()|substr:5:2)} edzés)
<img src="/_image/open_folder.png">
</span>
<div id="block_{$action->get_mox_date()|substr:0:4}{$action->get_mox_date()|substr:5:2}" class="month_block">
{/if}
<div class="list_item line_height14 bigger_space money_deposit">
<span class="size20 bold">
{$action->get_mox_date()|substr:0:4}.
{$months[$actions[$action@index]->get_mox_date()|substr:5:2]}
{$action->get_mox_date_day()}.
</span>
<br>
{$action->get_mox_item()}
<br>
{$action->get_mox_sum()|number_format:0:'':' '} Ft
</div>
{/if}
{if $action@last}
</div>
{/if}
{/foreach}

View File

@@ -34,7 +34,9 @@
{if $mox->get_mox_money_expense_category_moxc_id()}{$mox->get_mox_moxc()->get_moxc_name()}{else}<span class="italic">nincs megadva</span>{/if}
</td>
<td class="no_mobile_show quarter_width">
{$mox->get_mox_name()}
{if $mox->get_mox_coach()|is_a:'user'}
{$mox->get_mox_coach()->get_ua_name()}
{/if}
</td>
<td class="quarter_width">
{$mox->get_mox_item()}

View File

@@ -9,9 +9,8 @@
<div>
<label for="mox_date">Dátum:</label>
<div><input type="text" name="mox_date" id="mox_date" placeholder="ÉÉÉÉ-HH-NN" required></div>
<div><input type="text" name="mox_date" id="mox_date" placeholder="ÉÉÉÉ-HH-NN" value="{$today}" required></div>
</div>
<div>
<label for="mox_item">Tétel:</label>
<div><input type="text" name="mox_item" id="mox_item" required></div>

View File

@@ -8,7 +8,7 @@
<div>
<label for="mox_name">Név:</label>
<div><input type="text" name="mox_name" id="mox_name" value="{$mox->get_mox_name()}"></div>
<div><input type="text" name="mox_name" id="mox_name" value="{if $mox->get_mox_coach()|is_a:'user'}{$mox->get_mox_coach()->get_ua_name()}{/if}"></div>
</div>
<div>