forked from DGNum/gestioCOF
Style/Mise en page
This commit is contained in:
Aurélien Delobelle
parent
e96bbe3c50
commit
a59dabd114
10 changed files with 209 additions and 100 deletions
|
|
@ -13,6 +13,10 @@ h1,h2,h3,h4,h5,h6 {
|
|||
font-family:Oswald;
|
||||
}
|
||||
|
||||
a {
|
||||
color:#333;
|
||||
}
|
||||
|
||||
a:focus, a:hover {
|
||||
color:#C8102E;
|
||||
}
|
||||
|
|
@ -21,6 +25,50 @@ a:focus, a:hover {
|
|||
outline:none;
|
||||
}
|
||||
|
||||
textarea {
|
||||
font-family:'Roboto Mono';
|
||||
border-radius:0 !important;
|
||||
}
|
||||
|
||||
.table {
|
||||
margin-bottom:0;
|
||||
}
|
||||
|
||||
.table {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
.table td {
|
||||
vertical-align:middle !important;
|
||||
}
|
||||
|
||||
.table td.no-padding {
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.table thead {
|
||||
background:#c8102e;
|
||||
color:#fff;
|
||||
font-weight:bold;
|
||||
font-size:16px;
|
||||
}
|
||||
|
||||
.table thead td {
|
||||
padding:8px !important;
|
||||
}
|
||||
|
||||
.table tr.section {
|
||||
background:rgba(200,16,46,0.9);
|
||||
color:#fff;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
.table tr.section td {
|
||||
border-top:0;
|
||||
font-size:16px;
|
||||
padding:8px 30px;
|
||||
}
|
||||
|
||||
.btn, .btn-lg, .btn-group-lg>.btn {
|
||||
border-radius:0;
|
||||
}
|
||||
|
|
@ -141,13 +189,3 @@ a:focus, a:hover {
|
|||
padding-left: 20px;
|
||||
font-size:25px;
|
||||
}
|
||||
|
||||
.content-right-block table {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
.content-right-block table thead {
|
||||
background:#c8102e;
|
||||
color:#fff;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,14 +26,37 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des comptes</h2>
|
||||
<div>
|
||||
<ul>
|
||||
{% for account in accounts %}
|
||||
<li>
|
||||
<a href="{% url 'kfet.account.read' account.trigramme %}">{{ account }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>Trigramme</td>
|
||||
<td>Nom</td>
|
||||
<td>Balance</td>
|
||||
<td>COF</td>
|
||||
<td>Dpt</td>
|
||||
<td>Promo</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for account in accounts %}
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'kfet.account.read' account.trigramme %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ account.trigramme }}</td>
|
||||
<td>{{ account.name }}</td>
|
||||
<td class="text-right">{{ account.balance }}€</td>
|
||||
<td>{{ account.is_cof }}</td>
|
||||
<td>{{ account.departement }}</td>
|
||||
<td>{{ account.promo }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -32,40 +32,44 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des comptes en négatifs</h2>
|
||||
<div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<tr style="font-weight:bold;">
|
||||
<td></td>
|
||||
<td>Tri</td>
|
||||
<td>Nom</td>
|
||||
<td>Balance</td>
|
||||
<td>Réelle</td>
|
||||
<td>Début</td>
|
||||
<td>Découvert autorisé</td>
|
||||
<td>Jusqu'au</td>
|
||||
<td>Balance offset</td>
|
||||
</tr>
|
||||
{% for neg in negatives %}
|
||||
<thead>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'kfet.account.update' neg.account.trigramme %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ neg.account.trigramme }}</td>
|
||||
<td>{{ neg.account.name }}</td>
|
||||
<td class="text-right">{{ neg.account.balance|floatformat:2 }}€</td>
|
||||
<td class="text-right">
|
||||
{% if neg.account.balance_offset %}
|
||||
{{ neg.account.real_balance|floatformat:2 }}€
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{ neg.start|date:'d/m/Y H:i:s'}}</td>
|
||||
<td>{{ neg.authz_overdraft_amount|default_if_none:'' }}</td>
|
||||
<td>{{ neg.authz_overdrafy_until|default_if_none:'' }}</td>
|
||||
<td>{{ neg.balance_offset|default_if_none:'' }}</td>
|
||||
<td></td>
|
||||
<td>Tri</td>
|
||||
<td>Nom</td>
|
||||
<td>Balance</td>
|
||||
<td>Réelle</td>
|
||||
<td>Début</td>
|
||||
<td>Découvert autorisé</td>
|
||||
<td>Jusqu'au</td>
|
||||
<td>Balance offset</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for neg in negatives %}
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'kfet.account.update' neg.account.trigramme %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ neg.account.trigramme }}</td>
|
||||
<td>{{ neg.account.name }}</td>
|
||||
<td class="text-right">{{ neg.account.balance|floatformat:2 }}€</td>
|
||||
<td class="text-right">
|
||||
{% if neg.account.balance_offset %}
|
||||
{{ neg.account.real_balance|floatformat:2 }}€
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{ neg.start|date:'d/m/Y H:i:s'}}</td>
|
||||
<td>{{ neg.authz_overdraft_amount|default_if_none:'' }}</td>
|
||||
<td>{{ neg.authz_overdrafy_until|default_if_none:'' }}</td>
|
||||
<td>{{ neg.balance_offset|default_if_none:'' }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -24,36 +24,36 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des articles</h2>
|
||||
<div>
|
||||
<table class="table">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>Nom</td>
|
||||
<td>Prix</td>
|
||||
<td>Stock</td>
|
||||
<td>En vente</td>
|
||||
<td>Dernier inventaire</td>
|
||||
<td class="text-right">Prix</td>
|
||||
<td class="text-right">Stock</td>
|
||||
<td class="text-right">En vente</td>
|
||||
<td class="text-right">Dernier inventaire</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for article in articles %}
|
||||
{% ifchanged article.category %}
|
||||
<tr>
|
||||
<tr class="section">
|
||||
<td colspan="6">{{ article.category.name }}</td>
|
||||
</tr>
|
||||
{% endifchanged %}
|
||||
<tr>
|
||||
<td>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'kfet.article.read' article.pk %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ article.name }}</td>
|
||||
<td>{{ article.price }}</td>
|
||||
<td>{{ article.stock }}</td>
|
||||
<td>{{ article.is_sold }}</td>
|
||||
<td>{{ article.inventory.0.at }}</td>
|
||||
<td class="text-right">{{ article.price }}€</td>
|
||||
<td class="text-right">{{ article.stock }}</td>
|
||||
<td class="text-right">{{ article.is_sold }}</td>
|
||||
<td class="text-right">{{ article.inventory.0.at }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
{# CSS #}
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<link href='https://fonts.googleapis.com/css?family=Roboto|Oswald:400,700|Roboto+Mono:400,700' rel='stylesheet' type='text/css'>
|
||||
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700|Oswald:400,700|Roboto+Mono:400,700' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/jquery-confirm.css' %}">
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}">
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
<div class="col-sm-4 col-md-3 col-content-left">
|
||||
<div class="content-left">
|
||||
<div class="content-left-top text-center">
|
||||
<div class="line">{{ checkouts|length }} caisses</div>
|
||||
<div class="line line-big">{{ checkouts|length }}</div>
|
||||
<div class="line line-bigsub">caisse{{ checkouts|length|pluralize }}</div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<a class="btn btn-primary btn-lg" href="{% url 'kfet.checkout.create' %}">Créer une caisse</a>
|
||||
|
|
@ -21,12 +22,35 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des caisses</h2>
|
||||
<div>
|
||||
<ul>
|
||||
{% for checkout in checkouts %}
|
||||
<li><a href="{% url 'kfet.checkout.read' checkout.pk %}">{{ checkout }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>Nom</td>
|
||||
<td class="text-right">Balance</td>
|
||||
<td class="text-right">Déb. valid.</td>
|
||||
<td class="text-right">Fin valid.</td>
|
||||
<td class="text-right">Protégée</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for checkout in checkouts %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'kfet.checkout.read' checkout.pk %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ checkout.name }}</td>
|
||||
<td class="text-right">{{ checkout.balance}}€</td>
|
||||
<td class="text-right">{{ checkout.valid_from }}</td>
|
||||
<td class="text-right">{{ checkout.valid_to }}</td>
|
||||
<td class="text-right">{{ checkout.is_protected }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -49,8 +49,10 @@
|
|||
</div>
|
||||
<div class="content-right-block">
|
||||
<h2>Opérations</h2>
|
||||
<table id="history">
|
||||
</table>
|
||||
<div>
|
||||
<table id="history" class="table">
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,11 +22,12 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des inventaires</h2>
|
||||
<div>
|
||||
<table class="table">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead class="thead-default">
|
||||
<tr>
|
||||
<td>Date/Heure</td>
|
||||
<td></td>
|
||||
<td>Date</td>
|
||||
<td>Par</td>
|
||||
<td>Nb articles</td>
|
||||
<td>Commande</td>
|
||||
|
|
@ -35,6 +36,11 @@
|
|||
<tbody>
|
||||
{% for inventory in inventories %}
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<a href="">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ inventory.at }}</td>
|
||||
<td>{{ inventory.by.trigramme }}</td>
|
||||
<td>{{ inventory.nb_articles }}</td>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Fournisseurs</h2>
|
||||
<div>
|
||||
<table class="table">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td></td>
|
||||
|
|
@ -33,12 +33,12 @@
|
|||
<tbody>
|
||||
{% for supplier in suppliers %}
|
||||
<tr>
|
||||
<td>
|
||||
<td class="no-padding">
|
||||
<a href="{% url 'kfet.order.new' supplier.pk %}" class="btn btn-primary">
|
||||
Passer une commande
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'kfet.order.supplier.update' supplier.pk %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
|
|
@ -56,26 +56,38 @@
|
|||
</div>
|
||||
<div class="content-right-block">
|
||||
<h2>Liste des commandes</h2>
|
||||
<div>
|
||||
<table>
|
||||
{% for order in orders %}
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{% url 'kfet.order.read' order.pk %}">
|
||||
{{ order.at }}
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ order.supplier }}</td>
|
||||
<td>
|
||||
{% if order.inventory %}
|
||||
<a href="">Inventaire associé</a>
|
||||
{% else %}
|
||||
<a href="{% url 'kfet.order.to_inventory' order.pk %}">
|
||||
Maj stock
|
||||
</a>
|
||||
{% endif %}
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Date</td>
|
||||
<td>Fournisseur</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for order in orders %}
|
||||
<tr>
|
||||
<td class="no-padding">
|
||||
{% if order.inventory %}
|
||||
<a href="" class="btn btn-primary">Inventaire</a>
|
||||
{% else %}
|
||||
<a href="{% url 'kfet.order.to_inventory' order.pk %}" class="btn btn-primary">
|
||||
Générer inventaire
|
||||
</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{% url 'kfet.order.read' order.pk %}">
|
||||
<span class="glyphicon glyphicon-cog"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ order.at }}</td>
|
||||
<td>{{ order.supplier }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
<div class="content-right">
|
||||
<div class="content-right-block">
|
||||
<h2>Détails</h2>
|
||||
<div>
|
||||
<table class="table">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Article</td>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<tbody>
|
||||
{% for orderart in orderarts %}
|
||||
{% ifchanged orderart.article.category %}
|
||||
<tr>
|
||||
<tr class="section">
|
||||
<td colspan="4">{{ orderart.article.category.name }}</td>
|
||||
</tr>
|
||||
{% endifchanged %}
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<div class="content-right-block">
|
||||
<h2>Mail</h2>
|
||||
<div>
|
||||
<textarea>{{ mail }}</textarea>
|
||||
<textarea class="form-control" style="height:500px;">{{ mail }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue