phyks/bouffeatulm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small improvements on template

Browse Source
This commit is contained in:
Phyks 2013-09-08 16:29:55 +02:00
parent 533a1cfe9a
commit 9c13305080
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.php
View File

@ -376,8 +376,7 @@
$date_year = $invoice->getDate('Y'); $date_year = $invoice->getDate('Y');
$amount = $invoice->getAmount(); $amount = $invoice->getAmount();
$what = $invoice->getWhat(); $what = $invoice->getWhat();
$users_in = explode(',', $invoice->getUsersIn()); $users_in = $invoice->getUsersIn()->get();
$guests = array();
} }
if(!empty($_POST['what'])) $what = $_POST['what']; if(!empty($_POST['what'])) $what = $_POST['what'];
@ -385,7 +384,12 @@
if(!empty($_POST['date_day'])) $date_day = $_POST['date_day']; if(!empty($_POST['date_day'])) $date_day = $_POST['date_day'];
if(!empty($_POST['date_month'])) $date_month = $_POST['date_month']; if(!empty($_POST['date_month'])) $date_month = $_POST['date_month'];
if(!empty($_POST['date_year'])) $date_year = $_POST['date_year']; if(!empty($_POST['date_year'])) $date_year = $_POST['date_year'];
if(!empty($_POST['users_in'])) $users_in = $_POST['users_in']; if(!empty($_POST['users_in'])) {
$users_in = array();
foreach($_POST['users_in'] as $user) {
$users_in[(int) $user] = (int) $_POST['guest_user_'.$user];
}
}
if(!empty($_POST['what']) && !empty($_POST['amount']) && (float) $_POST['amount'] != 0 && !empty($_POST['date_hour']) && !empty($_POST['date_day']) && !empty($_POST['date_month']) && !empty($_POST['date_year']) && !empty($_POST['users_in'])) { if(!empty($_POST['what']) && !empty($_POST['amount']) && (float) $_POST['amount'] != 0 && !empty($_POST['date_hour']) && !empty($_POST['date_day']) && !empty($_POST['date_month']) && !empty($_POST['date_year']) && !empty($_POST['users_in'])) {
if(check_token(600, 'new_invoice')) { if(check_token(600, 'new_invoice')) {
@ -403,10 +407,7 @@
$invoice->setBuyer($current_user->getId()); $invoice->setBuyer($current_user->getId());
$invoice->setDate(0, int2ampm($_POST['date_hour']), $_POST['date_day'], $_POST['date_month'], $_POST['date_year']); $invoice->setDate(0, int2ampm($_POST['date_hour']), $_POST['date_day'], $_POST['date_month'], $_POST['date_year']);
$users_in = array();
foreach($_POST['users_in'] as $user) {
$users_in[(int) $user] = (int) $_POST['guest_user_'.$user];
}
$invoice->setUsersIn($users_in); $invoice->setUsersIn($users_in);
$invoice->save(); $invoice->save();
@ -441,7 +442,6 @@
$tpl->assign('what_post', (!empty($what) ? htmlspecialchars($what) : '')); $tpl->assign('what_post', (!empty($what) ? htmlspecialchars($what) : ''));
$tpl->assign('users', secureDisplay($users_list)); $tpl->assign('users', secureDisplay($users_list));
$tpl->assign('users_in', (!empty($users_in) ? $users_in : array())); $tpl->assign('users_in', (!empty($users_in) ? $users_in : array()));
$tpl->assign('guests', (!empty($guests) ? $guests : array()));
$tpl->assign('id', (!empty($_GET['id']) ? (int) $_GET['id'] : 0)); $tpl->assign('id', (!empty($_GET['id']) ? (int) $_GET['id'] : 0));
$tpl->assign('token', generate_token('new_invoice')); $tpl->assign('token', generate_token('new_invoice'));
$tpl->draw('new_invoice'); $tpl->draw('new_invoice');

7
tpl/default_en/js/main.js
View File

@ -57,4 +57,11 @@ $(document).ready(function() {
var col = $(this).index()+1; var col = $(this).index()+1;
$(this).closest('table').find('tr :nth-child('+col+')').removeClass('highlight_td'); $(this).closest('table').find('tr :nth-child('+col+')').removeClass('highlight_td');
}); });
if($('#invoice_form').length) {
$('#invoice_form input[id^=users_in]').each(function () {
var id = $(this).attr('id').replace('users_in_', '');
guest_user_label(id);
});
}
}); });

2
tpl/default_en/new_invoice.html
View File

@ -43,7 +43,7 @@
<fieldset> <fieldset>
<legend>Users in ?</legend> <legend>Users in ?</legend>
{loop="users"} {loop="users"}
<br/><input type="checkbox" name="users_in[]" value="{$value->getId()}" id="users_in_{$value->getId()}" {if condition="$current_user->getId() == $value->getId() || in_array($value->getId(), $users_in)"} checked {/if}/> <label for="users_in_{$value->getId()}">{$value->getDisplayName()}</label> and <input type="text" name="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}" size="1" {if condition="in_array($value->getId(), $users_in)"} value="{$guests[$value->getId()]}" {else} value="0" {/if} onkeyup="guest_user_label({$value->getId()});"/><label for="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}_label"> guest</label>. <input type="checkbox" name="users_in[]" value="{$value->getId()}" id="users_in_{$value->getId()}" {if condition="($current_user->getId() == $value->getId() && empty($users_in)) || in_array($value->getId(), array_keys($users_in))"} checked {/if}/> <label for="users_in_{$value->getId()}">{$value->getDisplayName()}</label> and <input type="text" name="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}" size="1" {if condition="in_array($value->getId(), array_keys($users_in))"} value="{$users_in[$value->getId()]}" {else} value="0" {/if} onkeyup="guest_user_label({$value->getId()});"/><label for="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}_label"> guest</label>.<br/>
{/loop} {/loop}
</fieldset> </fieldset>
<p class="center"> <p class="center">