PEP8 + typo
This commit is contained in:
Ludovic Stephan
parent
c58ac3a904
commit
88aec52141
3 changed files with 95 additions and 90 deletions
|
|
@ -1,9 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import (absolute_import, division,
|
||||
print_function, unicode_literals)
|
||||
from builtins import *
|
||||
|
||||
from django.shortcuts import render
|
||||
from django.http import Http404
|
||||
from django.db.models import Q
|
||||
|
|
@ -11,6 +7,7 @@ from gestioncof.models import User, Clipper
|
|||
from kfet.decorators import teamkfet_required
|
||||
from kfet.models import Account
|
||||
|
||||
|
||||
@teamkfet_required
|
||||
def account_create(request):
|
||||
if "q" not in request.GET:
|
||||
|
|
@ -25,48 +22,48 @@ def account_create(request):
|
|||
queries = {}
|
||||
search_words = q.split()
|
||||
|
||||
queries['kfet'] = Account.objects
|
||||
queries['users_cof'] = User.objects.filter(Q(profile__is_cof = True))
|
||||
queries['users_notcof'] = User.objects.filter(Q(profile__is_cof = False))
|
||||
queries['clippers'] = Clipper.objects
|
||||
queries['kfet'] = Account.objects
|
||||
queries['users_cof'] = User.objects.filter(Q(profile__is_cof=True))
|
||||
queries['users_notcof'] = User.objects.filter(Q(profile__is_cof=False))
|
||||
queries['clippers'] = Clipper.objects
|
||||
|
||||
for word in search_words:
|
||||
queries['kfet'] = queries['kfet'].filter(
|
||||
Q(cofprofile__user__username__icontains = word)
|
||||
| Q(cofprofile__user__first_name__icontains = word)
|
||||
| Q(cofprofile__user__last_name__icontains = word)
|
||||
Q(cofprofile__user__username__icontains=word) |
|
||||
Q(cofprofile__user__first_name__icontains=word) |
|
||||
Q(cofprofile__user__last_name__icontains=word)
|
||||
)
|
||||
queries['users_cof'] = queries['users_cof'].filter(
|
||||
Q(username__icontains = word)
|
||||
| Q(first_name__icontains = word)
|
||||
| Q(last_name__icontains = word)
|
||||
Q(username__icontains=word) |
|
||||
Q(first_name__icontains=word) |
|
||||
Q(last_name__icontains=word)
|
||||
)
|
||||
queries['users_notcof'] = queries['users_notcof'].filter(
|
||||
Q(username__icontains = word)
|
||||
| Q(first_name__icontains = word)
|
||||
| Q(last_name__icontains = word)
|
||||
Q(username__icontains=word) |
|
||||
Q(first_name__icontains=word) |
|
||||
Q(last_name__icontains=word)
|
||||
)
|
||||
queries['clippers'] = queries['clippers'].filter(
|
||||
Q(username__icontains = word)
|
||||
| Q(fullname__icontains = word)
|
||||
queries['clippers'] = queries['clippers'].filter(
|
||||
Q(username__icontains=word) |
|
||||
Q(fullname__icontains=word)
|
||||
)
|
||||
|
||||
queries['kfet'] = queries['kfet'].distinct()
|
||||
|
||||
usernames = list( \
|
||||
usernames = list(
|
||||
queries['kfet'].values_list('cofprofile__user__username', flat=True))
|
||||
|
||||
queries['kfet'] = [ (account, account.cofprofile.user) \
|
||||
for account in queries['kfet'] ]
|
||||
queries['kfet'] = [(account, account.cofprofile.user)
|
||||
for account in queries['kfet']]
|
||||
|
||||
queries['users_cof'] = \
|
||||
queries['users_cof'] = \
|
||||
queries['users_cof'].exclude(username__in=usernames).distinct()
|
||||
queries['users_notcof'] = \
|
||||
queries['users_notcof'] = \
|
||||
queries['users_notcof'].exclude(username__in=usernames).distinct()
|
||||
|
||||
usernames += list( \
|
||||
usernames += list(
|
||||
queries['users_cof'].values_list('username', flat=True))
|
||||
usernames += list( \
|
||||
usernames += list(
|
||||
queries['users_notcof'].values_list('username', flat=True))
|
||||
|
||||
queries['clippers'] = \
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</a>
|
||||
</li>
|
||||
{% if kfet %}
|
||||
<li class="user_category"><span class="text">Comptes existant</span></li>
|
||||
<li class="user_category"><span class="text">Comptes existants</span></li>
|
||||
{% for account, user in kfet %}
|
||||
<li><span class="text">{{ account }} [{{ user|highlight_user:q }}]</span></li>
|
||||
{% endfor %}
|
||||
|
|
|
|||
132
kfet/urls.py
132
kfet/urls.py
|
|
@ -1,9 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import (absolute_import, division,
|
||||
print_function, unicode_literals)
|
||||
from builtins import *
|
||||
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth.decorators import permission_required
|
||||
from kfet import views
|
||||
|
|
@ -12,11 +8,11 @@ from kfet.decorators import teamkfet_required
|
|||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.home,
|
||||
name = 'kfet.home'),
|
||||
name='kfet.home'),
|
||||
url(r'^login/genericteam$', views.login_genericteam,
|
||||
name = 'kfet.login.genericteam'),
|
||||
name='kfet.login.genericteam'),
|
||||
url(r'^history$', views.history,
|
||||
name = 'kfet.history'),
|
||||
name='kfet.history'),
|
||||
|
||||
# -----
|
||||
# Account urls
|
||||
|
|
@ -24,45 +20,53 @@ urlpatterns = [
|
|||
|
||||
# Account - General
|
||||
url(r'^accounts/$', views.account,
|
||||
name = 'kfet.account'),
|
||||
name='kfet.account'),
|
||||
url(r'^accounts/is_validandfree$', views.account_is_validandfree_ajax,
|
||||
name = 'kfet.account.is_validandfree.ajax'),
|
||||
name='kfet.account.is_validandfree.ajax'),
|
||||
|
||||
# Account - Create
|
||||
url(r'^accounts/new$', views.account_create,
|
||||
name = 'kfet.account.create'),
|
||||
name='kfet.account.create'),
|
||||
url(r'^accounts/new_special$', views.account_create_special,
|
||||
name = 'kfet.account.create_special'),
|
||||
name='kfet.account.create_special'),
|
||||
url(r'^accounts/new/user/(?P<username>.+)$', views.account_create_ajax,
|
||||
name = 'kfet.account.create.fromuser'),
|
||||
url(r'^accounts/new/clipper/(?P<login_clipper>.+)$', views.account_create_ajax,
|
||||
name = 'kfet.account.create.fromclipper'),
|
||||
name='kfet.account.create.fromuser'),
|
||||
url(r'^accounts/new/clipper/(?P<login_clipper>.+)$',
|
||||
views.account_create_ajax,
|
||||
name='kfet.account.create.fromclipper'),
|
||||
url(r'^accounts/new/empty$', views.account_create_ajax,
|
||||
name = 'kfet.account.create.empty'),
|
||||
name='kfet.account.create.empty'),
|
||||
url(r'^autocomplete/account_new$', autocomplete.account_create,
|
||||
name = 'kfet.account.create.autocomplete'),
|
||||
name='kfet.account.create.autocomplete'),
|
||||
|
||||
# Account - Search
|
||||
url(r'^autocomplete/account_search$', autocomplete.account_search,
|
||||
name='kfet.account.search.autocomplete'),
|
||||
|
||||
# Account - Read
|
||||
url(r'^accounts/(?P<trigramme>.{3})$', views.account_read,
|
||||
name = 'kfet.account.read'),
|
||||
name='kfet.account.read'),
|
||||
|
||||
# Account - Update
|
||||
url(r'^accounts/(?P<trigramme>.{3})/edit$', views.account_update,
|
||||
name = 'kfet.account.update'),
|
||||
name='kfet.account.update'),
|
||||
|
||||
# Account - Groups
|
||||
url(r'^accounts/groups$', views.account_group,
|
||||
name = 'kfet.account.group'),
|
||||
name='kfet.account.group'),
|
||||
url(r'^accounts/groups/new$',
|
||||
permission_required('kfet.manage_perms')(views.AccountGroupCreate.as_view()),
|
||||
name = 'kfet.account.group.create'),
|
||||
permission_required('kfet.manage_perms')
|
||||
(views.AccountGroupCreate.as_view()),
|
||||
name='kfet.account.group.create'),
|
||||
url(r'^accounts/groups/(?P<pk>\d+)/edit$',
|
||||
permission_required('kfet.manage_perms')(views.AccountGroupUpdate.as_view()),
|
||||
name = 'kfet.account.group.update'),
|
||||
permission_required('kfet.manage_perms')
|
||||
(views.AccountGroupUpdate.as_view()),
|
||||
name='kfet.account.group.update'),
|
||||
|
||||
url(r'^accounts/negatives$',
|
||||
permission_required('kfet.view_negs')(views.AccountNegativeList.as_view()),
|
||||
name = 'kfet.account.negative'),
|
||||
permission_required('kfet.view_negs')
|
||||
(views.AccountNegativeList.as_view()),
|
||||
name='kfet.account.negative'),
|
||||
|
||||
# -----
|
||||
# Checkout urls
|
||||
|
|
@ -71,34 +75,36 @@ urlpatterns = [
|
|||
# Checkout - General
|
||||
url('^checkouts/$',
|
||||
teamkfet_required(views.CheckoutList.as_view()),
|
||||
name = 'kfet.checkout'),
|
||||
name='kfet.checkout'),
|
||||
# Checkout - Create
|
||||
url('^checkouts/new$',
|
||||
teamkfet_required(views.CheckoutCreate.as_view()),
|
||||
name = 'kfet.checkout.create'),
|
||||
name='kfet.checkout.create'),
|
||||
# Checkout - Read
|
||||
url('^checkouts/(?P<pk>\d+)$',
|
||||
teamkfet_required(views.CheckoutRead.as_view()),
|
||||
name = 'kfet.checkout.read'),
|
||||
name='kfet.checkout.read'),
|
||||
# Checkout - Update
|
||||
url('^checkouts/(?P<pk>\d+)/edit$',
|
||||
teamkfet_required(views.CheckoutUpdate.as_view()),
|
||||
name = 'kfet.checkout.update'),
|
||||
name='kfet.checkout.update'),
|
||||
|
||||
### Checkout Statements urls
|
||||
# -----
|
||||
# Checkout Statement urls
|
||||
# -----
|
||||
|
||||
# Checkout Statement - General
|
||||
url('^checkouts/statements/$',
|
||||
teamkfet_required(views.CheckoutStatementList.as_view()),
|
||||
name = 'kfet.checkoutstatement'),
|
||||
name='kfet.checkoutstatement'),
|
||||
# Checkout Statement - Create
|
||||
url('^checkouts/(?P<pk_checkout>\d+)/statements/add',
|
||||
teamkfet_required(views.CheckoutStatementCreate.as_view()),
|
||||
name = 'kfet.checkoutstatement.create'),
|
||||
name='kfet.checkoutstatement.create'),
|
||||
# Checkout Statement - Update
|
||||
url('^checkouts/(?P<pk_checkout>\d+)/statements/(?P<pk>\d+)/edit',
|
||||
teamkfet_required(views.CheckoutStatementUpdate.as_view()),
|
||||
name = 'kfet.checkoutstatement.update'),
|
||||
name='kfet.checkoutstatement.update'),
|
||||
|
||||
# -----
|
||||
# Article urls
|
||||
|
|
@ -107,46 +113,46 @@ urlpatterns = [
|
|||
# Article - General
|
||||
url('^articles/$',
|
||||
teamkfet_required(views.ArticleList.as_view()),
|
||||
name = 'kfet.article'),
|
||||
name='kfet.article'),
|
||||
# Article - Create
|
||||
url('^articles/new$',
|
||||
teamkfet_required(views.ArticleCreate.as_view()),
|
||||
name = 'kfet.article.create'),
|
||||
name='kfet.article.create'),
|
||||
# Article - Read
|
||||
url('^articles/(?P<pk>\d+)$',
|
||||
teamkfet_required(views.ArticleRead.as_view()),
|
||||
name = 'kfet.article.read'),
|
||||
name='kfet.article.read'),
|
||||
# Article - Update
|
||||
url('^articles/(?P<pk>\d+)/edit$',
|
||||
teamkfet_required(views.ArticleUpdate.as_view()),
|
||||
name = 'kfet.article.update'),
|
||||
name='kfet.article.update'),
|
||||
|
||||
# -----
|
||||
# K-Psul urls
|
||||
# -----
|
||||
|
||||
url('^k-psul/$', views.kpsul, name = 'kfet.kpsul'),
|
||||
url('^k-psul/$', views.kpsul, name='kfet.kpsul'),
|
||||
url('^k-psul/checkout_data$', views.kpsul_checkout_data,
|
||||
name = 'kfet.kpsul.checkout_data'),
|
||||
name='kfet.kpsul.checkout_data'),
|
||||
url('^k-psul/perform_operations$', views.kpsul_perform_operations,
|
||||
name = 'kfet.kpsul.perform_operations'),
|
||||
name='kfet.kpsul.perform_operations'),
|
||||
url('^k-psul/cancel_operations$', views.kpsul_cancel_operations,
|
||||
name = 'kfet.kpsul.cancel_operations'),
|
||||
name='kfet.kpsul.cancel_operations'),
|
||||
url('^k-psul/articles_data', views.kpsul_articles_data,
|
||||
name = 'kfet.kpsul.articles_data'),
|
||||
name='kfet.kpsul.articles_data'),
|
||||
url('^k-psul/update_addcost$', views.kpsul_update_addcost,
|
||||
name = 'kfet.kpsul.update_addcost'),
|
||||
name='kfet.kpsul.update_addcost'),
|
||||
url('^k-psul/get_settings$', views.kpsul_get_settings,
|
||||
name = 'kfet.kpsul.get_settings'),
|
||||
name='kfet.kpsul.get_settings'),
|
||||
|
||||
# -----
|
||||
# JSON urls
|
||||
# -----
|
||||
|
||||
url(r'^history.json$', views.history_json,
|
||||
name = 'kfet.history.json'),
|
||||
name='kfet.history.json'),
|
||||
url(r'^accounts/read.json$', views.account_read_json,
|
||||
name = 'kfet.account.read.json'),
|
||||
name='kfet.account.read.json'),
|
||||
|
||||
|
||||
# -----
|
||||
|
|
@ -154,24 +160,26 @@ urlpatterns = [
|
|||
# -----
|
||||
|
||||
url(r'^settings/$',
|
||||
permission_required('kfet.change_settings')(views.SettingsList.as_view()),
|
||||
name = 'kfet.settings'),
|
||||
permission_required('kfet.change_settings')
|
||||
(views.SettingsList.as_view()),
|
||||
name='kfet.settings'),
|
||||
url(r'^settings/(?P<pk>\d+)/edit$',
|
||||
permission_required('kfet.change_settings')(views.SettingsUpdate.as_view()),
|
||||
name = 'kfet.settings.update'),
|
||||
permission_required('kfet.change_settings')
|
||||
(views.SettingsUpdate.as_view()),
|
||||
name='kfet.settings.update'),
|
||||
|
||||
# -----
|
||||
# Transfers urls
|
||||
# -----
|
||||
|
||||
url(r'^transfers/$', views.transfers,
|
||||
name = 'kfet.transfers'),
|
||||
name='kfet.transfers'),
|
||||
url(r'^transfers/new$', views.transfers_create,
|
||||
name = 'kfet.transfers.create'),
|
||||
name='kfet.transfers.create'),
|
||||
url(r'^transfers/perform$', views.perform_transfers,
|
||||
name = 'kfet.transfers.perform'),
|
||||
name='kfet.transfers.perform'),
|
||||
url(r'^transfers/cancel$', views.cancel_transfers,
|
||||
name = 'kfet.transfers.cancel'),
|
||||
name='kfet.transfers.cancel'),
|
||||
|
||||
# -----
|
||||
# Inventories urls
|
||||
|
|
@ -179,12 +187,12 @@ urlpatterns = [
|
|||
|
||||
url(r'^inventaires/$',
|
||||
teamkfet_required(views.InventoryList.as_view()),
|
||||
name = 'kfet.inventory'),
|
||||
name='kfet.inventory'),
|
||||
url(r'^inventaires/new$', views.inventory_create,
|
||||
name = 'kfet.inventory.create'),
|
||||
name='kfet.inventory.create'),
|
||||
url(r'^inventaires/(?P<pk>\d+)$',
|
||||
teamkfet_required(views.InventoryRead.as_view()),
|
||||
name = 'kfet.inventory.read'),
|
||||
name='kfet.inventory.read'),
|
||||
|
||||
# -----
|
||||
# Order urls
|
||||
|
|
@ -192,15 +200,15 @@ urlpatterns = [
|
|||
|
||||
url(r'^orders/$',
|
||||
teamkfet_required(views.OrderList.as_view()),
|
||||
name = 'kfet.order'),
|
||||
name='kfet.order'),
|
||||
url(r'^orders/(?P<pk>\d+)$',
|
||||
teamkfet_required(views.OrderRead.as_view()),
|
||||
name = 'kfet.order.read'),
|
||||
name='kfet.order.read'),
|
||||
url(r'^orders/suppliers/(?P<pk>\d+)/edit$',
|
||||
teamkfet_required(views.SupplierUpdate.as_view()),
|
||||
name = 'kfet.order.supplier.update'),
|
||||
name='kfet.order.supplier.update'),
|
||||
url(r'^orders/suppliers/(?P<pk>\d+)/new-order$', views.order_create,
|
||||
name = 'kfet.order.new'),
|
||||
name='kfet.order.new'),
|
||||
url(r'^orders/(?P<pk>\d+)/to_inventory$', views.order_to_inventory,
|
||||
name = 'kfet.order.to_inventory'),
|
||||
name='kfet.order.to_inventory'),
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue