From 1bf71e0f5322f158f454fa941901d15d68eb5db9 Mon Sep 17 00:00:00 2001 From: Phyks Date: Fri, 4 Oct 2013 13:38:24 +0200 Subject: [PATCH] Simplified matrix for non admin users on index The balance table on the index page is smaller for non admin users and only displays necessary lines. --- TODO | 1 - tpl/default_en/index.html | 63 +++++++++++++++++++++++++++------------ tpl/default_fr/index.html | 63 +++++++++++++++++++++++++++------------ 3 files changed, 88 insertions(+), 39 deletions(-) diff --git a/TODO b/TODO index b79437c..fb159af 100755 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -* Don't display the whole balance table if not admin * Notifications by e-mail for users Improvements : diff --git a/tpl/default_en/index.html b/tpl/default_en/index.html index 6a463a4..59f9d17 100755 --- a/tpl/default_en/index.html +++ b/tpl/default_en/index.html @@ -6,29 +6,54 @@

Balance

-

Read line owes case {$currency} to column. You can click on links to confirm the payback. - - - - {loop="users"} - - {/loop} - - {loop="users"} + {if condition="$current_user->getAdmin()"} +

Read line owes case {$currency} to column. You can click on links to confirm the payback. +

Owes\To{$value->getDisplayName()}
- + {loop="users"} - {if condition="$balances[$value1->getId()][$value2->getId()] === 'X'"} - - {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} - - {else} - - {/if} + {/loop} - {/loop} -
{$value->getDisplayName()}Owes\To{$balances[$value1->getId()][$value2->getId()]}{$balances[$value1->getId()][$value2->getId()]}{$value->getDisplayName()}
+ {loop="users"} + + {$value->getDisplayName()} + {loop="users"} + {if condition="$balances[$value1->getId()][$value2->getId()] === 'X'"} + + {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} + {$balances[$value1->getId()][$value2->getId()]} + {else} + {$balances[$value1->getId()][$value2->getId()]} + {/if} + {/loop} + + {/loop} + + {else} + + + + + + + {loop="$users"} + {if condition="$balances[$value->getId()][$current_user->getId()] !== 'X' && $balances[$value->getId()][$current_user->getId()] !== '-'"} + + + + + + {elseif condition="$balances[$current_user->getId()][$value->getId()] !== 'X' && $balances[$current_user->getId()][$value->getId()] !== '-'"} + + + + + + {/if} + {/loop} +
UsersYou owe himHe owes you
{$value->getDisplayName()}-{$balances[$value->getId()][$current_user->getId()]}{$currency}
{$value->getDisplayName()}{$balances[$current_user->getId()][$value->getId()]}{$currency}-
+ {/if}

Detailed list of bills{if condition="$all == 0"} for last month{/if}

diff --git a/tpl/default_fr/index.html b/tpl/default_fr/index.html index cce237f..17cc6da 100755 --- a/tpl/default_fr/index.html +++ b/tpl/default_fr/index.html @@ -6,29 +6,54 @@

Bilan

-

Lire ligne doit case {$currency} à colonne. Vous pouvez cliquer sur les liens pour confirmer les remboursements. - - - - {loop="users"} - - {/loop} - - {loop="users"} + {if condition="$current_user->getAdmin()"} +

Lire ligne doit case {$currency} à colonne. Vous pouvez cliquer sur les liens pour confirmer les remboursements. +

Doit\À{$value->getDisplayName()}
- + {loop="users"} - {if condition="$balances[$value1->getId()][$value2->getId()] === 'X'"} - - {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} - - {else} - - {/if} + {/loop} - {/loop} -
{$value->getDisplayName()}Doit\À{$balances[$value1->getId()][$value2->getId()]}{$balances[$value1->getId()][$value2->getId()]}{$value->getDisplayName()}
+ {loop="users"} + + {$value->getDisplayName()} + {loop="users"} + {if condition="$balances[$value1->getId()][$value2->getId()] === 'X'"} + + {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} + {$balances[$value1->getId()][$value2->getId()]} + {else} + {$balances[$value1->getId()][$value2->getId()]} + {/if} + {/loop} + + {/loop} + + {else} + + + + + + + {loop="$users"} + {if condition="$balances[$value->getId()][$current_user->getId()] !== 'X' && $balances[$value->getId()][$current_user->getId()] !== '-'"} + + + + + + {elseif condition="$balances[$current_user->getId()][$value->getId()] !== 'X' && $balances[$current_user->getId()][$value->getId()] !== '-'"} + + + + + + {/if} + {/loop} +
UtilisateursVous devezIl vous doit
{$value->getDisplayName()}-{$balances[$value->getId()][$current_user->getId()]}{$currency}
{$value->getDisplayName()}{$balances[$current_user->getId()][$value->getId()]}{$currency}-
+ {/if}

Liste détaillée des dépenses{if condition="$all == 0"} du dernier mois{/if}