klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements in counter admin templates

Browse Source
This commit is contained in:
Skia 2016-09-04 15:49:25 +02:00
parent d93dda1c0e
commit e1ce661a04
13 changed files with 291 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/lookups.py
View File

@ -66,7 +66,8 @@ class ProductsLookup(RightManagedLookupChannel):
model = Product model = Product
def get_query(self, q, request): def get_query(self, q, request):
return (self.model.objects.filter(name__icontains=q) | self.model.objects.filter(code__icontains=q))[:50] return (self.model.objects.filter(name__icontains=q) |
self.model.objects.filter(code__icontains=q)).filter(archived=False)[:50]
def format_item_display(self, item): def format_item_display(self, item):
return item.name return item.name

2
core/templates/core/user_tools.jinja
View File

@ -25,7 +25,7 @@
<h5>{% trans %}General management{% endtrans %}</h5> <h5>{% trans %}General management{% endtrans %}</h5>
<li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li> <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
<li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li> <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
<li><a href="{{ url('counter:producttype_list') }}">{% trans %}Products type management{% endtrans %}</a></li> <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
{% endif %} {% endif %}
{% for b in settings.SITH_COUNTER_BARS %} {% for b in settings.SITH_COUNTER_BARS %}
{% if user.is_in_group(b[1]+" admin") %} {% if user.is_in_group(b[1]+" admin") %}

19
counter/migrations/0007_product_archived.py Normal file
View File

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('counter', '0006_auto_20160831_1304'),
]
operations = [
migrations.AddField(
model_name='product',
name='archived',
field=models.BooleanField(verbose_name='archived', default=False),
),
]

3
counter/models.py
View File

@ -89,6 +89,7 @@ class Product(models.Model):
parent_product = models.ForeignKey('self', related_name='children_products', verbose_name=_("parent product"), null=True, parent_product = models.ForeignKey('self', related_name='children_products', verbose_name=_("parent product"), null=True,
blank=True, on_delete=models.SET_NULL) blank=True, on_delete=models.SET_NULL)
buying_groups = models.ManyToManyField(Group, related_name='products', verbose_name=_("buying groups"), blank=True) buying_groups = models.ManyToManyField(Group, related_name='products', verbose_name=_("buying groups"), blank=True)
archived = models.BooleanField(_("archived"), default=False)
class Meta: class Meta:
verbose_name = _('product') verbose_name = _('product')
@ -184,7 +185,7 @@ class Counter(models.Model):
return bl[random.randrange(0, len(bl))] return bl[random.randrange(0, len(bl))]
def is_open(self): def is_open(self):
return len(self.get_barmen_list()) > 0: return len(self.get_barmen_list()) > 0
def barman_list(self): def barman_list(self):
return [b.id for b in self.get_barmen_list()] return [b.id for b in self.get_barmen_list()]

40
counter/templates/counter/counter_base.jinja Normal file
View File

@ -0,0 +1,40 @@
{% extends "core/base.jinja" %}
{% block content %}
<div class="tool-bar">
<div>{% trans %}Counter administration{% endtrans %}</div>
<div class="tools">
<a href="{{ url('counter:admin_list') }}"
{%- if tab == "counters" -%}
class="selected_tab"
{%- endif -%}
>{% trans %}Counters{% endtrans %}</a>
<a href="{{ url('counter:product_list') }}"
{%- if tab == "products" -%}
class="selected_tab"
{%- endif -%}
>{% trans %}Products{% endtrans %}</a>
<a href="{{ url('counter:product_list_archived') }}"
{%- if tab == "archive" -%}
class="selected_tab"
{%- endif -%}
>{% trans %}Archived products{% endtrans %}</a>
<a href="{{ url('counter:producttype_list') }}"
{%- if tab == "product_types" -%}
class="selected_tab"
{%- endif -%}
>{% trans %}Product types{% endtrans %}</a>
</div>
<hr>
</div>
<div>
{% block admin_content %}
{% endblock %}
</div>
{% endblock %}

41
counter/templates/counter/counter_list.jinja
View File

@ -1,21 +1,46 @@
{% extends "core/base.jinja" %} {% extends "counter/counter_base.jinja" %}
{% block title %} {% block title %}
{% trans %}Counter admin list{% endtrans %} {% trans %}Counter admin list{% endtrans %}
{% endblock %} {% endblock %}
{% block content %} {% block admin_content %}
<p><a href="{{ url('counter:new') }}">{% trans %}New counter{% endtrans %}</a></p> <p><a href="{{ url('counter:new') }}">{% trans %}New counter{% endtrans %}</a></p>
{% if counter_list %} {% if counter_list %}
<h3>{% trans %}Counter admin list{% endtrans %}</h3> <h3>{% trans %}Counter admin list{% endtrans %}</h3>
<h4>{% trans %}Eboutic{% endtrans %}</h4>
<ul> <ul>
{% for c in counter_list %} {% for c in counter_list.filter(type="EBOUTIC").order_by('name') %}
<li> <li>
{% if c.type == "EBOUTIC" %} <a href="{{ url('eboutic:main') }}">{{ c }}</a> -
<a href="{{ url('eboutic:main') }}">{{ c }}</a> - {% if user.can_edit(c) %}
{% else %} <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
<a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
{% endif %} {% endif %}
{% if user.is_owner(c) %}
<a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
{% endif %}
</li>
{% endfor %}
</ul>
<h4>{% trans %}Bars{% endtrans %}</h4>
<ul>
{% for c in counter_list.filter(type="BAR").order_by('name') %}
<li>
<a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
{% if user.can_edit(c) %}
<a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
{% endif %}
{% if user.is_owner(c) %}
<a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
{% endif %}
</li>
{% endfor %}
</ul>
<h4>{% trans %}Offices{% endtrans %}</h4>
<ul>
{% for c in counter_list.exclude(type="BAR").exclude(type="EBOUTIC").order_by('name') %}
<li>
<a href="{{ url('counter:details', counter_id=c.id) }}">{{ c }}</a> -
{% if user.can_edit(c) %} {% if user.can_edit(c) %}
<a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> - <a href="{{ url('counter:admin', counter_id=c.id) }}">{% trans %}Edit{% endtrans %}</a> -
{% endif %} {% endif %}

11
counter/templates/counter/product_list.jinja
View File

@ -1,18 +1,23 @@
{% extends "core/base.jinja" %} {% extends "counter/counter_base.jinja" %}
{% block title %} {% block title %}
{% trans %}Product list{% endtrans %} {% trans %}Product list{% endtrans %}
{% endblock %} {% endblock %}
{% block content %} {% block admin_content %}
{% if tab == "products" %}
<p><a href="{{ url('counter:new_product') }}">{% trans %}New product{% endtrans %}</a></p> <p><a href="{{ url('counter:new_product') }}">{% trans %}New product{% endtrans %}</a></p>
{% endif %}
{% if product_list %} {% if product_list %}
<h3>{% trans %}Product list{% endtrans %}</h3> <h3>{% trans %}Product list{% endtrans %}</h3>
{% for t in ProductType.objects.all().order_by('name') %}
<h4>{{ t }}</h4>
<ul> <ul>
{% for p in product_list %} {% for p in product_list.filter(product_type=t).all().order_by('name') %}
<li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }}</a></li> <li><a href="{{ url('counter:product_edit', product_id=p.id) }}">{{ p }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endfor %}
{% else %} {% else %}
{% trans %}There is no products in this website.{% endtrans %} {% trans %}There is no products in this website.{% endtrans %}
{% endif %} {% endif %}

4
counter/templates/counter/producttype_list.jinja
View File

@ -1,10 +1,10 @@
{% extends "core/base.jinja" %} {% extends "counter/counter_base.jinja" %}
{% block title %} {% block title %}
{% trans %}Product type list{% endtrans %} {% trans %}Product type list{% endtrans %}
{% endblock %} {% endblock %}
{% block content %} {% block admin_content %}
<p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p> <p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p>
{% if producttype_list %} {% if producttype_list %}
<h3>{% trans %}Product type list{% endtrans %}</h3> <h3>{% trans %}Product type list{% endtrans %}</h3>

1
counter/urls.py
View File

@ -14,6 +14,7 @@ urlpatterns = [
url(r'^admin/new$', CounterCreateView.as_view(), name='new'), url(r'^admin/new$', CounterCreateView.as_view(), name='new'),
url(r'^admin/delete/(?P<counter_id>[0-9]+)$', CounterDeleteView.as_view(), name='delete'), url(r'^admin/delete/(?P<counter_id>[0-9]+)$', CounterDeleteView.as_view(), name='delete'),
url(r'^admin/product/list$', ProductListView.as_view(), name='product_list'), url(r'^admin/product/list$', ProductListView.as_view(), name='product_list'),
url(r'^admin/product/list_archived$', ProductArchivedListView.as_view(), name='product_list_archived'),
url(r'^admin/product/create$', ProductCreateView.as_view(), name='new_product'), url(r'^admin/product/create$', ProductCreateView.as_view(), name='new_product'),
url(r'^admin/product/(?P<product_id>[0-9]+)$', ProductEditView.as_view(), name='product_edit'), url(r'^admin/product/(?P<product_id>[0-9]+)$', ProductEditView.as_view(), name='product_edit'),
url(r'^admin/producttype/list$', ProductTypeListView.as_view(), name='producttype_list'), url(r'^admin/producttype/list$', ProductTypeListView.as_view(), name='producttype_list'),

32
counter/views.py
View File

@ -390,6 +390,11 @@ class CounterListView(CanViewMixin, ListView):
model = Counter model = Counter
template_name = 'counter/counter_list.jinja' template_name = 'counter/counter_list.jinja'
def get_context_data(self, **kwargs):
kwargs = super(CounterListView, self).get_context_data(**kwargs)
kwargs['tab'] = "counters"
return kwargs
class CounterEditForm(forms.ModelForm): class CounterEditForm(forms.ModelForm):
class Meta: class Meta:
model = Counter model = Counter
@ -445,6 +450,11 @@ class ProductTypeListView(CanEditPropMixin, ListView):
model = ProductType model = ProductType
template_name = 'counter/producttype_list.jinja' template_name = 'counter/producttype_list.jinja'
def get_context_data(self, **kwargs):
kwargs = super(ProductTypeListView, self).get_context_data(**kwargs)
kwargs['tab'] = "product_types"
return kwargs
class ProductTypeCreateView(CanCreateMixin, CreateView): class ProductTypeCreateView(CanCreateMixin, CreateView):
""" """
A create view for the admins A create view for the admins
@ -462,19 +472,39 @@ class ProductTypeEditView(CanEditPropMixin, UpdateView):
fields = ['name', 'description', 'icon'] fields = ['name', 'description', 'icon']
pk_url_kwarg = "type_id" pk_url_kwarg = "type_id"
class ProductArchivedListView(CanEditPropMixin, ListView):
"""
A list view for the admins
"""
model = Product
template_name = 'counter/product_list.jinja'
queryset = Product.objects.filter(archived=True)
ordering = ['name']
def get_context_data(self, **kwargs):
kwargs = super(ProductArchivedListView, self).get_context_data(**kwargs)
kwargs['tab'] = "archive"
return kwargs
class ProductListView(CanEditPropMixin, ListView): class ProductListView(CanEditPropMixin, ListView):
""" """
A list view for the admins A list view for the admins
""" """
model = Product model = Product
template_name = 'counter/product_list.jinja' template_name = 'counter/product_list.jinja'
queryset = Product.objects.filter(archived=False)
ordering = ['name'] ordering = ['name']
def get_context_data(self, **kwargs):
kwargs = super(ProductListView, self).get_context_data(**kwargs)
kwargs['tab'] = "products"
return kwargs
class ProductEditForm(forms.ModelForm): class ProductEditForm(forms.ModelForm):
class Meta: class Meta:
model = Product model = Product
fields = ['name', 'description', 'product_type', 'code', 'parent_product', 'buying_groups', 'purchase_price', fields = ['name', 'description', 'product_type', 'code', 'parent_product', 'buying_groups', 'purchase_price',
'selling_price', 'special_selling_price', 'icon', 'club', 'limit_age', 'tray'] 'selling_price', 'special_selling_price', 'icon', 'club', 'limit_age', 'tray', 'archived']
parent_product = AutoCompleteSelectField('products', show_help_text=False, label=_("Parent product"), required=False) parent_product = AutoCompleteSelectField('products', show_help_text=False, label=_("Parent product"), required=False)
buying_groups = AutoCompleteSelectMultipleField('groups', show_help_text=False, help_text="", label=_("Buying groups"), required=False) buying_groups = AutoCompleteSelectMultipleField('groups', show_help_text=False, help_text="", label=_("Buying groups"), required=False)
club = AutoCompleteSelectField('clubs', show_help_text=False) club = AutoCompleteSelectField('clubs', show_help_text=False)

BIN
locale/fr/LC_MESSAGES/django.mo
View File

Binary file not shown.

265
locale/fr/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-02 21:18+0200\n" "POT-Creation-Date: 2016-09-04 15:46+0200\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
@ -18,7 +18,7 @@ msgstr ""
#: accounting/models.py:36 accounting/models.py:55 accounting/models.py:82 #: accounting/models.py:36 accounting/models.py:55 accounting/models.py:82
#: accounting/models.py:132 club/models.py:19 counter/models.py:52 #: accounting/models.py:132 club/models.py:19 counter/models.py:52
#: counter/models.py:77 counter/models.py:111 launderette/models.py:15 #: counter/models.py:77 counter/models.py:112 launderette/models.py:15
#: launderette/models.py:60 launderette/models.py:85 #: launderette/models.py:60 launderette/models.py:85
msgid "name" msgid "name"
msgstr "nom" msgstr "nom"
@ -64,7 +64,7 @@ msgid "account number"
msgstr "numero de compte" msgstr "numero de compte"
#: accounting/models.py:58 accounting/models.py:83 club/models.py:145 #: accounting/models.py:58 accounting/models.py:83 club/models.py:145
#: counter/models.py:86 counter/models.py:112 #: counter/models.py:86 counter/models.py:113
msgid "club" msgid "club"
msgstr "club" msgstr "club"
@ -85,12 +85,12 @@ msgstr "Compte club"
msgid "%(club_account)s on %(bank_account)s" msgid "%(club_account)s on %(bank_account)s"
msgstr "%(club_account)s sur %(bank_account)s" msgstr "%(club_account)s sur %(bank_account)s"
#: accounting/models.py:130 club/models.py:146 counter/models.py:282 #: accounting/models.py:130 club/models.py:146 counter/models.py:280
#: launderette/models.py:122 #: launderette/models.py:122
msgid "start date" msgid "start date"
msgstr "date de début" msgstr "date de début"
#: accounting/models.py:131 club/models.py:147 counter/models.py:283 #: accounting/models.py:131 club/models.py:147 counter/models.py:281
msgid "end date" msgid "end date"
msgstr "date de fin" msgstr "date de fin"
@ -103,7 +103,7 @@ msgid "club account"
msgstr "compte club" msgstr "compte club"
#: accounting/models.py:135 accounting/models.py:178 counter/models.py:25 #: accounting/models.py:135 accounting/models.py:178 counter/models.py:25
#: counter/models.py:200 #: counter/models.py:198
msgid "amount" msgid "amount"
msgstr "montant" msgstr "montant"
@ -124,16 +124,16 @@ msgid "journal"
msgstr "classeur" msgstr "classeur"
#: accounting/models.py:179 core/models.py:458 core/models.py:736 #: accounting/models.py:179 core/models.py:458 core/models.py:736
#: counter/models.py:203 counter/models.py:246 counter/models.py:296 #: counter/models.py:201 counter/models.py:244 counter/models.py:294
#: eboutic/models.py:15 eboutic/models.py:48 #: eboutic/models.py:15 eboutic/models.py:48
msgid "date" msgid "date"
msgstr "date" msgstr "date"
#: accounting/models.py:180 counter/models.py:297 #: accounting/models.py:180 counter/models.py:295
msgid "comment" msgid "comment"
msgstr "commentaire" msgstr "commentaire"
#: accounting/models.py:181 counter/models.py:204 counter/models.py:247 #: accounting/models.py:181 counter/models.py:202 counter/models.py:245
#: subscription/models.py:57 #: subscription/models.py:57
msgid "payment method" msgid "payment method"
msgstr "méthode de paiement" msgstr "méthode de paiement"
@ -180,7 +180,7 @@ msgstr "Compte"
msgid "Company" msgid "Company"
msgstr "Entreprise" msgstr "Entreprise"
#: accounting/models.py:190 sith/settings.py:283 sith/settings_sample.py:272 #: accounting/models.py:190 sith/settings.py:285 sith/settings_sample.py:274
msgid "Other" msgid "Other"
msgstr "Autre" msgstr "Autre"
@ -230,7 +230,7 @@ msgstr "code"
msgid "An accounting type code contains only numbers" msgid "An accounting type code contains only numbers"
msgstr "Un code comptable ne contient que des numéros" msgstr "Un code comptable ne contient que des numéros"
#: accounting/models.py:282 accounting/models.py:308 counter/models.py:238 #: accounting/models.py:282 accounting/models.py:308 counter/models.py:236
msgid "label" msgid "label"
msgstr "intitulé" msgstr "intitulé"
@ -328,7 +328,9 @@ msgstr "Nouveau compte club"
#: club/templates/club/club_base.jinja:42 core/templates/core/file.jinja:38 #: club/templates/club/club_base.jinja:42 core/templates/core/file.jinja:38
#: core/templates/core/page.jinja:31 core/templates/core/user_base.jinja:33 #: core/templates/core/page.jinja:31 core/templates/core/user_base.jinja:33
#: core/templates/core/user_tools.jinja:33 #: core/templates/core/user_tools.jinja:33
#: counter/templates/counter/counter_list.jinja:20 #: counter/templates/counter/counter_list.jinja:17
#: counter/templates/counter/counter_list.jinja:31
#: counter/templates/counter/counter_list.jinja:45
#: launderette/templates/launderette/launderette_list.jinja:14 #: launderette/templates/launderette/launderette_list.jinja:14
msgid "Edit" msgid "Edit"
msgstr "Éditer" msgstr "Éditer"
@ -470,7 +472,7 @@ msgid "Done"
msgstr "Effectué" msgstr "Effectué"
#: accounting/templates/accounting/journal_details.jinja:34 #: accounting/templates/accounting/journal_details.jinja:34
#: counter/views.py:566 #: counter/views.py:596
msgid "Comment" msgid "Comment"
msgstr "Commentaire" msgstr "Commentaire"
@ -540,7 +542,7 @@ msgstr "Vous ne pouvez pas faire de boucles dans les clubs"
msgid "A club with that unix_name already exists" msgid "A club with that unix_name already exists"
msgstr "Un club avec ce nom UNIX existe déjà." msgstr "Un club avec ce nom UNIX existe déjà."
#: club/models.py:144 counter/models.py:280 counter/models.py:294 #: club/models.py:144 counter/models.py:278 counter/models.py:292
#: eboutic/models.py:14 eboutic/models.py:47 launderette/models.py:89 #: eboutic/models.py:14 eboutic/models.py:47 launderette/models.py:89
#: launderette/models.py:126 #: launderette/models.py:126
msgid "user" msgid "user"
@ -575,13 +577,15 @@ msgstr "Membres"
msgid "Old members" msgid "Old members"
msgstr "Anciens membres" msgstr "Anciens membres"
#: club/templates/club/club_base.jinja:34 core/templates/core/base.jinja:25 #: club/templates/club/club_base.jinja:34 core/templates/core/base.jinja:37
#: core/templates/core/user_base.jinja:19 #: core/templates/core/user_base.jinja:19
msgid "Tools" msgid "Tools"
msgstr "Outils" msgstr "Outils"
#: club/templates/club/club_base.jinja:50 #: club/templates/club/club_base.jinja:50
#: counter/templates/counter/counter_list.jinja:23 #: counter/templates/counter/counter_list.jinja:20
#: counter/templates/counter/counter_list.jinja:34
#: counter/templates/counter/counter_list.jinja:48
msgid "Props" msgid "Props"
msgstr "Propriétés" msgstr "Propriétés"
@ -1080,52 +1084,52 @@ msgstr "Connexion"
msgid "Register" msgid "Register"
msgstr "S'enregister" msgstr "S'enregister"
#: core/templates/core/base.jinja:26 #: core/templates/core/base.jinja:38
msgid "Logout" msgid "Logout"
msgstr "Déconnexion" msgstr "Déconnexion"
#: core/templates/core/base.jinja:28 core/templates/core/base.jinja.py:29 #: core/templates/core/base.jinja:40 core/templates/core/base.jinja.py:41
msgid "Search" msgid "Search"
msgstr "Recherche" msgstr "Recherche"
#: core/templates/core/base.jinja:51 #: core/templates/core/base.jinja:63
msgid "Main" msgid "Main"
msgstr "Accueil" msgstr "Accueil"
#: core/templates/core/base.jinja:52 #: core/templates/core/base.jinja:64
msgid "Matmatronch" msgid "Matmatronch"
msgstr "Matmatronch" msgstr "Matmatronch"
#: core/templates/core/base.jinja:53 #: core/templates/core/base.jinja:65
msgid "Wiki" msgid "Wiki"
msgstr "Wiki" msgstr "Wiki"
#: core/templates/core/base.jinja:54 #: core/templates/core/base.jinja:66
msgid "SAS" msgid "SAS"
msgstr "SAS" msgstr "SAS"
#: core/templates/core/base.jinja:55 #: core/templates/core/base.jinja:67
msgid "Forum" msgid "Forum"
msgstr "Forum" msgstr "Forum"
#: core/templates/core/base.jinja:56 #: core/templates/core/base.jinja:68
msgid "Services" msgid "Services"
msgstr "Services" msgstr "Services"
#: core/templates/core/base.jinja:57 core/templates/core/file.jinja:20 #: core/templates/core/base.jinja:69 core/templates/core/file.jinja:20
#: core/views/files.py:42 #: core/views/files.py:42
msgid "Files" msgid "Files"
msgstr "Fichiers" msgstr "Fichiers"
#: core/templates/core/base.jinja:58 #: core/templates/core/base.jinja:70
msgid "Sponsors" msgid "Sponsors"
msgstr "Partenaires" msgstr "Partenaires"
#: core/templates/core/base.jinja:59 #: core/templates/core/base.jinja:71
msgid "Help" msgid "Help"
msgstr "Aide" msgstr "Aide"
#: core/templates/core/base.jinja:75 #: core/templates/core/base.jinja:87
msgid "Site made by good people" msgid "Site made by good people"
msgstr "Site réalisé par des gens bons" msgstr "Site réalisé par des gens bons"
@ -1656,7 +1660,8 @@ msgstr "Gestion de Sith"
msgid "Subscriptions" msgid "Subscriptions"
msgstr "Cotisations" msgstr "Cotisations"
#: core/templates/core/user_tools.jinja:22 counter/views.py:481 #: core/templates/core/user_tools.jinja:22
#: counter/templates/counter/counter_base.jinja:11 counter/views.py:511
msgid "Counters" msgid "Counters"
msgstr "Comptoirs" msgstr "Comptoirs"
@ -1673,7 +1678,9 @@ msgid "Products management"
msgstr "Gestion des produits" msgstr "Gestion des produits"
#: core/templates/core/user_tools.jinja:28 #: core/templates/core/user_tools.jinja:28
msgid "Products type management" #, fuzzy
#| msgid "Products type management"
msgid "Product types management"
msgstr "Gestion des types de produit" msgstr "Gestion des types de produit"
#: core/templates/core/user_tools.jinja:42 #: core/templates/core/user_tools.jinja:42
@ -1786,107 +1793,112 @@ msgstr "produit parent"
msgid "buying groups" msgid "buying groups"
msgstr "groupe d'achat" msgstr "groupe d'achat"
#: counter/models.py:94 #: counter/models.py:92
msgid "archived"
msgstr "archivé"
#: counter/models.py:95
msgid "product" msgid "product"
msgstr "produit" msgstr "produit"
#: counter/models.py:113 #: counter/models.py:114
msgid "products" msgid "products"
msgstr "produits" msgstr "produits"
#: counter/models.py:114 #: counter/models.py:115
msgid "counter type" msgid "counter type"
msgstr "type de comptoir" msgstr "type de comptoir"
#: counter/models.py:116 #: counter/models.py:117
msgid "Bar" msgid "Bar"
msgstr "Bar" msgstr "Bar"
#: counter/models.py:116 #: counter/models.py:117
msgid "Office" msgid "Office"
msgstr "Bureau" msgstr "Bureau"
#: counter/models.py:116 eboutic/templates/eboutic/eboutic_main.jinja:4 #: counter/models.py:117 counter/templates/counter/counter_list.jinja:11
#: eboutic/templates/eboutic/eboutic_main.jinja:4
#: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_main.jinja:24
#: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8
#: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4
#: sith/settings.py:282 sith/settings.py:290 sith/settings_sample.py:271 #: sith/settings.py:284 sith/settings.py:292 sith/settings_sample.py:273
#: sith/settings_sample.py:279 #: sith/settings_sample.py:281
msgid "Eboutic" msgid "Eboutic"
msgstr "Eboutic" msgstr "Eboutic"
#: counter/models.py:117 #: counter/models.py:118
msgid "sellers" msgid "sellers"
msgstr "vendeurs" msgstr "vendeurs"
#: counter/models.py:122 counter/models.py:281 counter/models.py:295 #: counter/models.py:123 counter/models.py:279 counter/models.py:293
#: launderette/models.py:16 #: launderette/models.py:16
msgid "counter" msgid "counter"
msgstr "comptoir" msgstr "comptoir"
#: counter/models.py:206 #: counter/models.py:204
msgid "bank" msgid "bank"
msgstr "banque" msgstr "banque"
#: counter/models.py:208 counter/models.py:249 #: counter/models.py:206 counter/models.py:247
msgid "is validated" msgid "is validated"
msgstr "est validé" msgstr "est validé"
#: counter/models.py:211 #: counter/models.py:209
msgid "refilling" msgid "refilling"
msgstr "rechargement" msgstr "rechargement"
#: counter/models.py:242 eboutic/models.py:133 #: counter/models.py:240 eboutic/models.py:133
msgid "unit price" msgid "unit price"
msgstr "prix unitaire" msgstr "prix unitaire"
#: counter/models.py:243 counter/models.py:320 eboutic/models.py:134 #: counter/models.py:241 counter/models.py:318 eboutic/models.py:134
msgid "quantity" msgid "quantity"
msgstr "quantité" msgstr "quantité"
#: counter/models.py:248 #: counter/models.py:246
msgid "Sith account" msgid "Sith account"
msgstr "Compte utilisateur" msgstr "Compte utilisateur"
#: counter/models.py:248 sith/settings.py:275 sith/settings.py:280 #: counter/models.py:246 sith/settings.py:277 sith/settings.py:282
#: sith/settings.py:302 sith/settings_sample.py:264 #: sith/settings.py:304 sith/settings_sample.py:266
#: sith/settings_sample.py:269 sith/settings_sample.py:291 #: sith/settings_sample.py:271 sith/settings_sample.py:293
msgid "Credit card" msgid "Credit card"
msgstr "Carte bancaire" msgstr "Carte bancaire"
#: counter/models.py:252 #: counter/models.py:250
msgid "selling" msgid "selling"
msgstr "vente" msgstr "vente"
#: counter/models.py:284 #: counter/models.py:282
msgid "last activity date" msgid "last activity date"
msgstr "dernière activité" msgstr "dernière activité"
#: counter/models.py:287 #: counter/models.py:285
msgid "permanency" msgid "permanency"
msgstr "permanence" msgstr "permanence"
#: counter/models.py:298 #: counter/models.py:296
msgid "emptied" msgid "emptied"
msgstr "coffre vidée" msgstr "coffre vidée"
#: counter/models.py:301 #: counter/models.py:299
msgid "cash register summary" msgid "cash register summary"
msgstr "relevé de caisse" msgstr "relevé de caisse"
#: counter/models.py:318 #: counter/models.py:316
msgid "cash summary" msgid "cash summary"
msgstr "relevé" msgstr "relevé"
#: counter/models.py:319 #: counter/models.py:317
msgid "value" msgid "value"
msgstr "valeur" msgstr "valeur"
#: counter/models.py:321 #: counter/models.py:319
msgid "check" msgid "check"
msgstr "chèque" msgstr "chèque"
#: counter/models.py:324 #: counter/models.py:322
msgid "cash register summary item" msgid "cash register summary item"
msgstr "élément de relevé de caisse" msgstr "élément de relevé de caisse"
@ -1895,6 +1907,23 @@ msgstr "élément de relevé de caisse"
msgid "Make a cash register summary" msgid "Make a cash register summary"
msgstr "Faire un relevé de caisse" msgstr "Faire un relevé de caisse"
#: counter/templates/counter/counter_base.jinja:5
msgid "Counter administration"
msgstr "Administration des comptoirs"
#: counter/templates/counter/counter_base.jinja:16
msgid "Products"
msgstr "Produits"
#: counter/templates/counter/counter_base.jinja:21
#: counter/templates/counter/product_list.jinja:10
msgid "Archived products"
msgstr "Produits archivés"
#: counter/templates/counter/counter_base.jinja:26
msgid "Product types"
msgstr "Types de produit"
#: counter/templates/counter/counter_click.jinja:29 #: counter/templates/counter/counter_click.jinja:29
msgid "Customer" msgid "Customer"
msgstr "Client" msgstr "Client"
@ -1952,7 +1981,15 @@ msgstr "Liste des comptoirs"
msgid "New counter" msgid "New counter"
msgstr "Nouveau comptoir" msgstr "Nouveau comptoir"
#: counter/templates/counter/counter_list.jinja:29 #: counter/templates/counter/counter_list.jinja:25
msgid "Bars"
msgstr "Bars"
#: counter/templates/counter/counter_list.jinja:39
msgid "Offices"
msgstr "Bureaux"
#: counter/templates/counter/counter_list.jinja:54
msgid "There is no counters in this website." msgid "There is no counters in this website."
msgstr "Il n'y a pas de comptoirs dans ce site web." msgstr "Il n'y a pas de comptoirs dans ce site web."
@ -1996,15 +2033,15 @@ msgid "Barman: "
msgstr "Barman : " msgstr "Barman : "
#: counter/templates/counter/product_list.jinja:4 #: counter/templates/counter/product_list.jinja:4
#: counter/templates/counter/product_list.jinja:10 #: counter/templates/counter/product_list.jinja:13
msgid "Product list" msgid "Product list"
msgstr "Liste des produits" msgstr "Liste des produits"
#: counter/templates/counter/product_list.jinja:8 #: counter/templates/counter/product_list.jinja:9
msgid "New product" msgid "New product"
msgstr "Nouveau produit" msgstr "Nouveau produit"
#: counter/templates/counter/product_list.jinja:17 #: counter/templates/counter/product_list.jinja:23
msgid "There is no products in this website." msgid "There is no products in this website."
msgstr "Il n'y a pas de produits dans ce site web." msgstr "Il n'y a pas de produits dans ce site web."
@ -2049,65 +2086,65 @@ msgstr "ANN"
msgid "You have not enough money to buy all the basket" msgid "You have not enough money to buy all the basket"
msgstr "Vous n'avez pas assez d'argent pour acheter le panier" msgstr "Vous n'avez pas assez d'argent pour acheter le panier"
#: counter/views.py:478 #: counter/views.py:508
msgid "Parent product" msgid "Parent product"
msgstr "Produit parent" msgstr "Produit parent"
#: counter/views.py:479 #: counter/views.py:509
msgid "Buying groups" msgid "Buying groups"
msgstr "Groupes d'achat" msgstr "Groupes d'achat"
#: counter/views.py:546 #: counter/views.py:576
msgid "10 cents" msgid "10 cents"
msgstr "10 centimes" msgstr "10 centimes"
#: counter/views.py:547 #: counter/views.py:577
msgid "20 cents" msgid "20 cents"
msgstr "20 centimes" msgstr "20 centimes"
#: counter/views.py:548 #: counter/views.py:578
msgid "50 cents" msgid "50 cents"
msgstr "50 centimes" msgstr "50 centimes"
#: counter/views.py:549 #: counter/views.py:579
msgid "1 euro" msgid "1 euro"
msgstr "1 €" msgstr "1 €"
#: counter/views.py:550 #: counter/views.py:580
msgid "2 euros" msgid "2 euros"
msgstr "2 €" msgstr "2 €"
#: counter/views.py:551 #: counter/views.py:581
msgid "5 euros" msgid "5 euros"
msgstr "5 €" msgstr "5 €"
#: counter/views.py:552 #: counter/views.py:582
msgid "10 euros" msgid "10 euros"
msgstr "10 €" msgstr "10 €"
#: counter/views.py:553 #: counter/views.py:583
msgid "20 euros" msgid "20 euros"
msgstr "20 €" msgstr "20 €"
#: counter/views.py:554 #: counter/views.py:584
msgid "50 euros" msgid "50 euros"
msgstr "50 €" msgstr "50 €"
#: counter/views.py:555 #: counter/views.py:585
msgid "100 euros" msgid "100 euros"
msgstr "100 €" msgstr "100 €"
#: counter/views.py:556 counter/views.py:558 counter/views.py:560 #: counter/views.py:586 counter/views.py:588 counter/views.py:590
#: counter/views.py:562 counter/views.py:564 #: counter/views.py:592 counter/views.py:594
msgid "Check amount" msgid "Check amount"
msgstr "Montant du chèque" msgstr "Montant du chèque"
#: counter/views.py:557 counter/views.py:559 counter/views.py:561 #: counter/views.py:587 counter/views.py:589 counter/views.py:591
#: counter/views.py:563 counter/views.py:565 #: counter/views.py:593 counter/views.py:595
msgid "Check quantity" msgid "Check quantity"
msgstr "Nombre de chèque" msgstr "Nombre de chèque"
#: counter/views.py:567 #: counter/views.py:597
msgid "Emptied" msgid "Emptied"
msgstr "Coffre vidé" msgstr "Coffre vidé"
@ -2255,12 +2292,12 @@ msgid "Washing and drying"
msgstr "Lavage et séchage" msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:26 #: launderette/templates/launderette/launderette_book.jinja:26
#: sith/settings.py:416 sith/settings_sample.py:405 #: sith/settings.py:418 sith/settings_sample.py:407
msgid "Washing" msgid "Washing"
msgstr "Lavage" msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:30 #: launderette/templates/launderette/launderette_book.jinja:30
#: sith/settings.py:416 sith/settings_sample.py:405 #: sith/settings.py:418 sith/settings_sample.py:407
msgid "Drying" msgid "Drying"
msgstr "Séchage" msgstr "Séchage"
@ -2315,120 +2352,120 @@ msgstr "L'utilisateur n'a pas réservé de créneau"
msgid "Token not found" msgid "Token not found"
msgstr "Jeton non trouvé" msgstr "Jeton non trouvé"
#: sith/settings.py:170 sith/settings_sample.py:160 #: sith/settings.py:172 sith/settings_sample.py:162
msgid "English" msgid "English"
msgstr "Anglais" msgstr "Anglais"
#: sith/settings.py:171 sith/settings_sample.py:161 #: sith/settings.py:173 sith/settings_sample.py:163
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
#: sith/settings.py:272 sith/settings.py:279 sith/settings.py:300 #: sith/settings.py:274 sith/settings.py:281 sith/settings.py:302
#: sith/settings_sample.py:261 sith/settings_sample.py:268 #: sith/settings_sample.py:263 sith/settings_sample.py:270
#: sith/settings_sample.py:289 #: sith/settings_sample.py:291
msgid "Check" msgid "Check"
msgstr "Chèque" msgstr "Chèque"
#: sith/settings.py:273 sith/settings.py:281 sith/settings.py:301 #: sith/settings.py:275 sith/settings.py:283 sith/settings.py:303
#: sith/settings_sample.py:262 sith/settings_sample.py:270 #: sith/settings_sample.py:264 sith/settings_sample.py:272
#: sith/settings_sample.py:290 #: sith/settings_sample.py:292
msgid "Cash" msgid "Cash"
msgstr "Espèces" msgstr "Espèces"
#: sith/settings.py:274 sith/settings_sample.py:263 #: sith/settings.py:276 sith/settings_sample.py:265
msgid "Transfert" msgid "Transfert"
msgstr "Virement" msgstr "Virement"
#: sith/settings.py:287 sith/settings_sample.py:276 #: sith/settings.py:289 sith/settings_sample.py:278
msgid "Belfort" msgid "Belfort"
msgstr "Belfort" msgstr "Belfort"
#: sith/settings.py:288 sith/settings_sample.py:277 #: sith/settings.py:290 sith/settings_sample.py:279
msgid "Sevenans" msgid "Sevenans"
msgstr "Sevenans" msgstr "Sevenans"
#: sith/settings.py:289 sith/settings_sample.py:278 #: sith/settings.py:291 sith/settings_sample.py:280
msgid "Montbéliard" msgid "Montbéliard"
msgstr "Montbéliard" msgstr "Montbéliard"
#: sith/settings.py:329 sith/settings_sample.py:318 #: sith/settings.py:331 sith/settings_sample.py:320
msgid "One semester" msgid "One semester"
msgstr "Un semestre, 15 €" msgstr "Un semestre, 15 €"
#: sith/settings.py:334 sith/settings_sample.py:323 #: sith/settings.py:336 sith/settings_sample.py:325
msgid "Two semesters" msgid "Two semesters"
msgstr "Deux semestres, 28 €" msgstr "Deux semestres, 28 €"
#: sith/settings.py:339 sith/settings_sample.py:328 #: sith/settings.py:341 sith/settings_sample.py:330
msgid "Common core cursus" msgid "Common core cursus"
msgstr "Cursus tronc commun, 45 €" msgstr "Cursus tronc commun, 45 €"
#: sith/settings.py:344 sith/settings_sample.py:333 #: sith/settings.py:346 sith/settings_sample.py:335
#: sith/settings_sample.py:338 #: sith/settings_sample.py:340
msgid "Branch cursus" msgid "Branch cursus"
msgstr "Cursus branche, 45 €" msgstr "Cursus branche, 45 €"
#: sith/settings.py:349 #: sith/settings.py:351
msgid "Alternating cursus" msgid "Alternating cursus"
msgstr "Cursus alternant, 30 €" msgstr "Cursus alternant, 30 €"
#: sith/settings.py:354 sith/settings_sample.py:343 #: sith/settings.py:356 sith/settings_sample.py:345
msgid "Honorary member" msgid "Honorary member"
msgstr "Membre honoraire, 0 €" msgstr "Membre honoraire, 0 €"
#: sith/settings.py:359 sith/settings_sample.py:348 #: sith/settings.py:361 sith/settings_sample.py:350
msgid "Assidu member" msgid "Assidu member"
msgstr "Membre d'Assidu, 0 €" msgstr "Membre d'Assidu, 0 €"
#: sith/settings.py:364 sith/settings_sample.py:353 #: sith/settings.py:366 sith/settings_sample.py:355
msgid "Amicale/DOCEO member" msgid "Amicale/DOCEO member"
msgstr "Membre de l'Amicale/DOCEO, 0 €" msgstr "Membre de l'Amicale/DOCEO, 0 €"
#: sith/settings.py:369 sith/settings_sample.py:358 #: sith/settings.py:371 sith/settings_sample.py:360
msgid "UT network member" msgid "UT network member"
msgstr "Cotisant du réseau UT, 0 €" msgstr "Cotisant du réseau UT, 0 €"
#: sith/settings.py:374 sith/settings_sample.py:363 #: sith/settings.py:376 sith/settings_sample.py:365
msgid "CROUS member" msgid "CROUS member"
msgstr "Membres du CROUS, 0 €" msgstr "Membres du CROUS, 0 €"
#: sith/settings.py:379 sith/settings_sample.py:368 #: sith/settings.py:381 sith/settings_sample.py:370
msgid "Sbarro/ESTA member" msgid "Sbarro/ESTA member"
msgstr "Membre de Sbarro ou de l'ESTA, 15 €" msgstr "Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:387 sith/settings_sample.py:376 #: sith/settings.py:389 sith/settings_sample.py:378
msgid "President" msgid "President"
msgstr "Président" msgstr "Président"
#: sith/settings.py:388 sith/settings_sample.py:377 #: sith/settings.py:390 sith/settings_sample.py:379
msgid "Vice-President" msgid "Vice-President"
msgstr "Vice-Président" msgstr "Vice-Président"
#: sith/settings.py:389 sith/settings_sample.py:378 #: sith/settings.py:391 sith/settings_sample.py:380
msgid "Treasurer" msgid "Treasurer"
msgstr "Trésorier" msgstr "Trésorier"
#: sith/settings.py:390 sith/settings_sample.py:379 #: sith/settings.py:392 sith/settings_sample.py:381
msgid "Communication supervisor" msgid "Communication supervisor"
msgstr "Responsable com" msgstr "Responsable com"
#: sith/settings.py:391 sith/settings_sample.py:380 #: sith/settings.py:393 sith/settings_sample.py:382
msgid "Secretary" msgid "Secretary"
msgstr "Secrétaire" msgstr "Secrétaire"
#: sith/settings.py:392 sith/settings_sample.py:381 #: sith/settings.py:394 sith/settings_sample.py:383
msgid "IT supervisor" msgid "IT supervisor"
msgstr "Responsable info" msgstr "Responsable info"
#: sith/settings.py:393 sith/settings_sample.py:382 #: sith/settings.py:395 sith/settings_sample.py:384
msgid "Board member" msgid "Board member"
msgstr "Membre du bureau" msgstr "Membre du bureau"
#: sith/settings.py:394 sith/settings_sample.py:383 #: sith/settings.py:396 sith/settings_sample.py:385
msgid "Active member" msgid "Active member"
msgstr "Membre actif" msgstr "Membre actif"
#: sith/settings.py:395 sith/settings_sample.py:384 #: sith/settings.py:397 sith/settings_sample.py:386
msgid "Curious" msgid "Curious"
msgstr "Curieux" msgstr "Curieux"

1
sith/settings_sample.py
View File

@ -112,6 +112,7 @@ TEMPLATES = [
"get_subscriber": "subscription.views.get_subscriber", "get_subscriber": "subscription.views.get_subscriber",
"settings": "sith.settings", "settings": "sith.settings",
"Counter": "counter.models.Counter", "Counter": "counter.models.Counter",
"ProductType": "counter.models.ProductType",
}, },
"bytecode_cache": { "bytecode_cache": {
"name": "default", "name": "default",