From f1105d704e68958cce076caecbb3b04156e9eb75 Mon Sep 17 00:00:00 2001 From: Skia Date: Fri, 19 Aug 2016 02:53:44 +0200 Subject: [PATCH] Add basic search bar --- core/static/core/img/na.gif | Bin 0 -> 1067 bytes core/static/core/style.css | 24 +++++- core/templates/core/base.jinja | 4 + core/templates/core/index.jinja | 5 +- core/templates/core/macros.jinja | 13 +++ core/templates/core/search.jinja | 26 ++++++ core/templates/core/user_stats.jinja | 7 +- core/urls.py | 3 +- core/views/site.py | 43 +++++++++- core/views/user.py | 9 +- locale/fr/LC_MESSAGES/django.mo | Bin 28020 -> 28173 bytes locale/fr/LC_MESSAGES/django.po | 122 +++++++++++++++------------ migrate.py | 16 ++-- 13 files changed, 199 insertions(+), 73 deletions(-) create mode 100644 core/static/core/img/na.gif create mode 100644 core/templates/core/search.jinja diff --git a/core/static/core/img/na.gif b/core/static/core/img/na.gif new file mode 100644 index 0000000000000000000000000000000000000000..332b62df2d9b059e6e3e330116a23c9ab0a30584 GIT binary patch literal 1067 zcmV+`1l0RSNk%w1VSNC70J8u9cXxM0L`1v0yCNbYW@cvY?(S7pRhgNYs;a8p-Q5up z5zNfYGcz-Yh=~9H{{R30A^8LV00000EC2ui0DS;`06+x)@X1N5y*TU5yZ>M)j$~<` zXsWJk>%MTj0g7zjTjT6JfWro!a7Z+$3c~>?NNhR?0%1TF75XrMA&Eh}ZWKdA2SJ>= z7y`02GdK`K38GRHsA@Ze0&*x2Gyroeb`EA4Lq;80LJNf;Izj?97z0jTFbY`&9y($( zO$RCpeQ`tr1q-4>mOm^CQv(690fDTwwzs&sy1Tr+zQ4f1!o$SH#>dFXI0Jh-oyxnC z5&=yMw9pg;000L9+uz{e0S4D0l!qRJkO1RuPCJb*?(iA}L!cpwLiii!Jeui-#ACsP z$G{2#KNvuO2*834sTMSQN0G>a9Re7%(B}Y=At8AGnlvymuj0E^(9}8LhpnZ{moQ_> zoJq5$&6_xL>fFh*r_Y~2g9;VKamUaXq=aZZy29R&1Tz&B=yQ<(rld++sPmXez(pqu z01i61qM*rtC?0|QQ1Wa-7;1$SD5r+UND_51dMH`|-~|8^4a(qnH$z^s8@^`cFs}e& z3r+>cc#FZTgTfxT3@P9tFXj%EUnq8fk^(g$&pNc7`{DEs&L1N0D7}K?;|HoTHwaL7 zK?4G}Ddcq^fB>y+25K+>OvLXC+Z#e>kj;auqb3Oe!6Gm`Hw=F}SYCj{0lbtG1G>8< z9n&=r@n@{xWTr*iQl|Lx>)+46zyJRL1}NbFfCLt3;DHDxsNjMOHt67k5Jo8BgcMeo z%xMTjky?aBK{X*7-bJXH5FSbxm;>b;2nzrRj22=}184)BG%R4{Kmjy<;7S1B7>5fO zn^EN42>@WVAqQ?fG*%1@xM)&|Cb(x52u{9}z(m2BK;2nKir}IE9t@z;di2CFfJ3hx zkfH$q2oML3B~S<7Buxl#jhOFbSppFS+(&^_iRurv`EDKY5=4*#m1(JEZ~MKOIymK zz?@_s@gPEs0p!TWH*JLnfB`%L&_EyfdR0m++H7jVVbQJ8fs{KWZ~$-|2&-NKh%nGi zzD^_{z`-vpsX?h2*vQ%l8ejXs098(U$$1yA#X+JEWlClxW@d{J52|i3CaoMWa3YyB zpHNp{8zhzUmOHpRf&n)V5thqmARu%F2I$Lyq$svvfISQ$p$P*uh`Tg00i2j3gSje7 lAtp$0(+s2*rmgncY`5+9+i=G%_uO>XZTH=H=gmO`06WKRy7&M9 literal 0 HcmV?d00001 diff --git a/core/static/core/style.css b/core/static/core/style.css index f9d9c3ce..a66db1b4 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -26,7 +26,11 @@ header a { header a:hover { color: #2D3; } - +header form { + display: inline-block; + padding: 1em; + width: 150px; +} #popupheader { width: 88%; margin: 0px auto; @@ -185,6 +189,24 @@ tbody>tr:hover { #user_profile .promo_pict { height: 45px; } +.mini_profile_link { + display: block; + text-decoration: none; +} +.mini_profile_link span { + display: inline-block; + width: 50px; + vertical-align: middle; +} +.mini_profile_link em { + vertical-align: middle; +} +.mini_profile_link img { + max-width: 40px; + max-height: 60px; + margin: 2px auto; + display: block; +} /*---------------------------------PAGE--------------------------------*/ .page_content { display: block; diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index da79c86d..f639ab56 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -24,6 +24,10 @@ {{ user.get_display_name() }} | {% trans %}Tools{% endtrans %} | {% trans %}Logout{% endtrans %} +
+ + +
{% endif %} {% else %} diff --git a/core/templates/core/index.jinja b/core/templates/core/index.jinja index 880bdc44..6724ae6b 100644 --- a/core/templates/core/index.jinja +++ b/core/templates/core/index.jinja @@ -1,7 +1,8 @@ {% extends "core/base.jinja" %} -{% block title %}{{ title }}{% endblock %} - +{% block title %} +{% trans %}Welcome!{% endtrans %} +{% endblock %} {% block content %} {% trans %}Hello, world. You're at the core index using Jinja2.{% endtrans %} {% endblock %} diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja index 84fa1d6c..4c25be71 100644 --- a/core/templates/core/macros.jinja +++ b/core/templates/core/macros.jinja @@ -1,3 +1,16 @@ {% macro user_profile_link(user) -%} {{ user.get_display_name() }} {%- endmacro %} + +{% macro user_link_with_pict(user) -%} + + + {% if user.profile_pict %} + {% trans %}Profile{% endtrans %} + {% else %} + {% trans %}Profile{% endtrans %} + {% endif %} + + {{ user.get_display_name() }} + +{%- endmacro %} diff --git a/core/templates/core/search.jinja b/core/templates/core/search.jinja new file mode 100644 index 00000000..bd38874e --- /dev/null +++ b/core/templates/core/search.jinja @@ -0,0 +1,26 @@ +{% extends "core/base.jinja" %} + +{% from "core/macros.jinja" import user_link_with_pict %} + +{% block title %} + {% trans %}Search result{% endtrans %} +{% endblock %} + +{% block content %} +

{% trans %}Users{% endtrans %}

+
    + {% for i in result.users %} +
  • + {{ user_link_with_pict(i) }} +
    • + {% endfor %} +
+

{% trans %}Clubs{% endtrans %}

+
    + {% for i in result.clubs %} +
  • + {{ i }} +
    • + {% endfor %} +
+{% endblock %} diff --git a/core/templates/core/user_stats.jinja b/core/templates/core/user_stats.jinja index ba25aac7..b6bf8021 100644 --- a/core/templates/core/user_stats.jinja +++ b/core/templates/core/user_stats.jinja @@ -8,9 +8,10 @@ {% if profile.permanencies %}

Permanencies

-

- {{ total_time }} -

+

Total: {{ total_perm_time }}

+

Foyer: {{ total_foyer_time }}

+

MDE: {{ total_mde_time }}

+

La Gommette: {{ total_gommette_time }}

{% endif %} {% endblock %} diff --git a/core/urls.py b/core/urls.py index 45f43691..7f3f4046 100644 --- a/core/urls.py +++ b/core/urls.py @@ -4,6 +4,8 @@ from core.views import * urlpatterns = [ url(r'^$', index, name='index'), + url(r'^search/$', search_view, name='search'), + url(r'^search_json/$', search_json, name='search_json'), # Login and co url(r'^login/$', login, name='login'), @@ -50,5 +52,4 @@ urlpatterns = [ url(r'^page/(?P[a-z0-9/-_]*)/hist$', PageHistView.as_view(), name='page_hist'), url(r'^page/(?P[a-z0-9/-_]*)/rev/(?P[0-9]+)/', PageRevView.as_view(), name='page_rev'), url(r'^page/(?P[a-z0-9/-_]*)/$', PageView.as_view(), name='page'), - ] diff --git a/core/views/site.py b/core/views/site.py index e6ecb376..cd350563 100644 --- a/core/views/site.py +++ b/core/views/site.py @@ -1,11 +1,46 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.db import models +from django.http import JsonResponse +from django.core import serializers +from django.db.models import Q +from django.contrib.auth.decorators import login_required import os +import json +from itertools import chain + +from core.models import User +from club.models import Club def index(request, context=None): - if context == None: - return render(request, "core/index.jinja", {'title': 'Bienvenue!'}) - else: - return render(request, "core/index.jinja", context) + return render(request, "core/index.jinja") + +def search(query, as_json=False): + result = {'users': None, 'clubs': None} + if query: + nicks = User.objects.filter(nick_name__icontains=query).all() + users = User.objects.filter(Q(first_name__icontains=query) | Q(last_name__icontains=query)).all() + clubs = Club.objects.filter(name__icontains=query).all() + nicks = nicks[:5] + users = users[:5] + clubs = clubs[:5] + if as_json: # Re-loads json to avoid double encoding by JsonResponse, but still benefit from serializers + nicks = json.loads(serializers.serialize('json', nicks, fields=('nick_name', 'last_name', 'first_name', 'profile_pict'))) + users = json.loads(serializers.serialize('json', users, fields=('nick_name', 'last_name', 'first_name', 'profile_pict'))) + clubs = json.loads(serializers.serialize('json', clubs, fields=('name'))) + else: + nicks = list(nicks.all()) + users = list(users.all()) + clubs = list(clubs.all()) + result['users'] = nicks + users + result['clubs'] = clubs + return result + +@login_required +def search_view(request): + return render(request, "core/search.jinja", context={'result': search(request.GET.get('query', ''))}) + +@login_required +def search_json(request): + return JsonResponse(search(request.GET.get('query', ''), True)) diff --git a/core/views/user.py b/core/views/user.py index 3a26423b..6cdf6812 100644 --- a/core/views/user.py +++ b/core/views/user.py @@ -134,7 +134,14 @@ class UserStatsView(CanViewMixin, DetailView): def get_context_data(self, **kwargs): kwargs = super(UserStatsView, self).get_context_data(**kwargs) - kwargs['total_time'] = sum([p.end-p.start for p in self.object.permanencies.all()], timedelta()) + from counter.models import Counter + foyer = Counter.objects.filter(name="Foyer").first() + mde = Counter.objects.filter(name="MDE").first() + gommette = Counter.objects.filter(name="La Gommette").first() + kwargs['total_perm_time'] = sum([p.end-p.start for p in self.object.permanencies.all()], timedelta()) + kwargs['total_foyer_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=foyer)], timedelta()) + kwargs['total_mde_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=mde)], timedelta()) + kwargs['total_gommette_time'] = sum([p.end-p.start for p in self.object.permanencies.filter(counter=gommette)], timedelta()) return kwargs class UserMiniView(CanViewMixin, DetailView): diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 4600b1d2966b4651654d8e77daab58244cec9dd4..8df42a48c736b5acd6277d98be067699b905f10f 100644 GIT binary patch delta 10086 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 delta 9998 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 qq$Y3chPmDg~#wIg+%SNQoc70+7b zI?5lBA120;>*((B-=7D`#uEXwnS-P4+8@Xp5{rl%#Ou_zA|{jTc!KCaInGzo5B9$d z6&s1Shyql7g2}}F|2FcHQ81cl$2lDznELqKCG;^WPu*73F_C;65l#LNVvn`2uQK^f zY^wYJEy1VI$*~5c&Lr~VxBzcsmMS@p5htwO1M;avFtM1r)x;QLDdo3_mE?(-jyeJ{ z9|rhJd}+}=Z-qnFNX4n-^@-2OixT_D12Gs|;7^2(9>f^pJtCKLhfv2s@=b&ee{(#B zQvSwQ%iDl?+W#G#7)kWE6X(p`c%7JO<-Zb5`#OXUf1-vj^L|vd`og$`I7@XR#t=zF z2g>hS`$xL}!>QDNGG3rE4Vz&DVlep;B9(jy@%Z=~Nj0J)v4QjD2pwB+zU77R9k1Hi zf-hVC5NmL*CDu`$?tdBL0F`}+nnVbZK;6r@oM=L><4N*<#M^|9p&m|2%ALtq5u1r( zL|y8-5YvhE#7orW;a`s;l--$DS?ez+Q^+%jzZ2ED;%VGWd`DiEc#(V{F_FA7b|iFs zMf^r25ib%t%5rWk(TT`M+@h``;gSpAPyJX(MP00dt#KKyz{kgj-UZHSD%M%9bMq`e zO5TcSuS$-JR^N-fI{64IZ^HpZ6!ok87=IzjV4?|?n$B}r4u2sU6I&@iKK}hU!33*+ zle~h}_oc3c<)v{KvE0hycm1HvAJCTg`~TL@KQ1_tUkx~(C$>}WK{O;DA0Z^IDR09+ ziLpd}%I^|Sk-uqe`;t!};wYCUMv@OBqU`(<^4;X_Ns@mNI$ot>AU4No#A08q_oFdo z9c{3s\n" "Language-Team: AE info \n" @@ -40,12 +40,12 @@ msgstr "numero de compte" msgid "%(club_account)s on %(bank_account)s" msgstr "%(club_account)s sur %(bank_account)s" -#: accounting/models.py:109 club/models.py:147 counter/models.py:271 +#: accounting/models.py:109 club/models.py:147 counter/models.py:291 #: launderette/models.py:122 msgid "start date" msgstr "date de début" -#: accounting/models.py:110 club/models.py:148 counter/models.py:272 +#: accounting/models.py:110 club/models.py:148 counter/models.py:292 msgid "end date" msgstr "date de fin" @@ -67,12 +67,12 @@ msgid "number" msgstr "numéro" #: accounting/models.py:154 core/models.py:404 core/models.py:680 -#: counter/models.py:209 counter/models.py:245 eboutic/models.py:14 +#: counter/models.py:209 counter/models.py:255 eboutic/models.py:14 #: eboutic/models.py:47 msgid "date" msgstr "date" -#: accounting/models.py:155 accounting/models.py:241 counter/models.py:237 +#: accounting/models.py:155 accounting/models.py:241 counter/models.py:247 msgid "label" msgstr "intitulé" @@ -80,8 +80,8 @@ msgstr "intitulé" msgid "remark" msgstr "remarque" -#: accounting/models.py:157 counter/models.py:210 counter/models.py:247 -#: eboutic/models.py:49 subscription/models.py:34 +#: accounting/models.py:157 counter/models.py:210 counter/models.py:256 +#: subscription/models.py:34 msgid "payment method" msgstr "méthode de paiement" @@ -89,7 +89,7 @@ msgstr "méthode de paiement" msgid "cheque number" msgstr "numéro de chèque" -#: accounting/models.py:159 eboutic/models.py:119 +#: accounting/models.py:159 eboutic/models.py:115 msgid "invoice" msgstr "facture" @@ -114,7 +114,7 @@ msgstr "Utilisateur" msgid "Club" msgstr "Club" -#: accounting/models.py:163 core/templates/core/user_base.jinja:17 +#: accounting/models.py:163 core/templates/core/user_base.jinja:18 msgid "Account" msgstr "Compte" @@ -207,7 +207,7 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/club_account_details.jinja:44 #: accounting/templates/accounting/journal_details.jinja:62 #: club/templates/club/club_detail.jinja:7 core/templates/core/file.jinja:38 -#: core/templates/core/page.jinja:31 core/templates/core/user_base.jinja:9 +#: core/templates/core/page.jinja:31 core/templates/core/user_base.jinja:10 #: core/templates/core/user_tools.jinja:33 #: counter/templates/counter/counter_list.jinja:15 #: counter/templates/counter/counter_list.jinja:18 @@ -269,7 +269,7 @@ msgstr "Fin" #: accounting/templates/accounting/club_account_details.jinja:20 #: accounting/templates/accounting/journal_details.jinja:23 #: core/templates/core/user_account.jinja:19 -#: core/templates/core/user_account.jinja:72 +#: core/templates/core/user_account.jinja:78 msgid "Amount" msgstr "Montant" @@ -324,13 +324,13 @@ msgstr "No" #: accounting/templates/accounting/journal_details.jinja:21 #: core/templates/core/user_account.jinja:16 -#: core/templates/core/user_account.jinja:41 -#: core/templates/core/user_account.jinja:70 +#: core/templates/core/user_account.jinja:44 +#: core/templates/core/user_account.jinja:76 msgid "Date" msgstr "Date" #: accounting/templates/accounting/journal_details.jinja:22 -#: core/templates/core/user_account.jinja:44 +#: core/templates/core/user_account.jinja:47 msgid "Label" msgstr "Intitulé" @@ -908,7 +908,7 @@ msgstr "Outils" msgid "Logout" msgstr "Déconnexion" -#: core/templates/core/base.jinja:36 +#: core/templates/core/base.jinja:36 core/templates/core/search.jinja:10 msgid "Users" msgstr "Utilisateurs" @@ -920,7 +920,7 @@ msgstr "Wiki" msgid "Pages" msgstr "Pages" -#: core/templates/core/base.jinja:39 +#: core/templates/core/base.jinja:39 core/templates/core/search.jinja:18 msgid "Clubs" msgstr "Clubs" @@ -938,23 +938,25 @@ msgid "Create %(name)s" msgstr "Créer %(name)s" #: core/templates/core/delete_confirm.jinja:4 +#: core/templates/core/delete_confirm.jinja:8 #: core/templates/core/file_delete_confirm.jinja:4 +#: core/templates/core/file_delete_confirm.jinja:8 msgid "Delete confirmation" msgstr "Confirmation de suppression" -#: core/templates/core/delete_confirm.jinja:6 -#: core/templates/core/file_delete_confirm.jinja:6 +#: core/templates/core/delete_confirm.jinja:10 +#: core/templates/core/file_delete_confirm.jinja:10 #, python-format msgid "Are you sure you want to delete \"%(obj)s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%(obj)s\" ?" -#: core/templates/core/delete_confirm.jinja:7 -#: core/templates/core/file_delete_confirm.jinja:7 +#: core/templates/core/delete_confirm.jinja:11 +#: core/templates/core/file_delete_confirm.jinja:11 msgid "Confirm" msgstr "Confirmation" -#: core/templates/core/delete_confirm.jinja:8 -#: core/templates/core/file_delete_confirm.jinja:8 +#: core/templates/core/delete_confirm.jinja:14 +#: core/templates/core/file_delete_confirm.jinja:14 #: counter/templates/counter/counter_click.jinja:71 msgid "Cancel" msgstr "Annuler" @@ -1067,6 +1069,13 @@ msgstr "login" msgid "Lost password?" msgstr "Mot de passe perdu ?" +#: core/templates/core/macros.jinja:9 core/templates/core/macros.jinja:11 +#: core/templates/core/user_detail.jinja:12 +#: core/templates/core/user_edit.jinja:15 +#: core/templates/core/user_mini.jinja:4 +msgid "Profile" +msgstr "Profil" + #: core/templates/core/page.jinja:7 core/templates/core/page_list.jinja:4 #: core/templates/core/page_list.jinja:9 msgid "Page list" @@ -1219,6 +1228,10 @@ msgstr "" msgid "Your username is %(username)s." msgstr "Votre nom d'utilisateur est %(username)s." +#: core/templates/core/search.jinja:6 +msgid "Search result" +msgstr "Résultat de la recherche" + #: core/templates/core/user_account.jinja:4 #, python-format msgid "%(user_name)s's account" @@ -1233,47 +1246,50 @@ msgid "Refillings" msgstr "Rechargements" #: core/templates/core/user_account.jinja:17 -#: core/templates/core/user_account.jinja:42 +#: core/templates/core/user_account.jinja:45 #: counter/templates/counter/counter_click.jinja:24 msgid "Counter" msgstr "Comptoir" #: core/templates/core/user_account.jinja:18 -#: core/templates/core/user_account.jinja:43 +#: core/templates/core/user_account.jinja:46 msgid "Barman" msgstr "Barman" #: core/templates/core/user_account.jinja:20 -#: core/templates/core/user_account.jinja:47 -#: core/templates/core/user_account.jinja:73 +#: core/templates/core/user_account.jinja:50 msgid "Payment method" msgstr "Méthode de paiement" -#: core/templates/core/user_account.jinja:37 +#: core/templates/core/user_account.jinja:40 msgid "Account buyings" msgstr "Achat sur compte utilisateur" -#: core/templates/core/user_account.jinja:45 +#: core/templates/core/user_account.jinja:48 msgid "Quantity" msgstr "Quantité" -#: core/templates/core/user_account.jinja:46 +#: core/templates/core/user_account.jinja:49 msgid "Total" msgstr "Total" -#: core/templates/core/user_account.jinja:66 +#: core/templates/core/user_account.jinja:72 msgid "Eboutic invoices" msgstr "Facture eboutic" -#: core/templates/core/user_account.jinja:71 +#: core/templates/core/user_account.jinja:77 msgid "Items" msgstr "Articles" -#: core/templates/core/user_account.jinja:95 +#: core/templates/core/user_account.jinja:99 msgid "User has no account" msgstr "L'utilisateur n'a pas de compte" -#: core/templates/core/user_base.jinja:12 +#: core/templates/core/user_base.jinja:8 +msgid "Stats" +msgstr "Stats" + +#: core/templates/core/user_base.jinja:13 #: core/templates/core/user_tools.jinja:14 msgid "Groups" msgstr "Groupes" @@ -1283,12 +1299,6 @@ msgstr "Groupes" msgid "%(user_name)s's profile" msgstr "Profil de %(user_name)s" -#: core/templates/core/user_detail.jinja:12 -#: core/templates/core/user_edit.jinja:15 -#: core/templates/core/user_mini.jinja:4 -msgid "Profile" -msgstr "Profil" - #: core/templates/core/user_detail.jinja:21 #: core/templates/core/user_mini.jinja:12 msgid "Born: " @@ -1371,6 +1381,10 @@ msgstr "Éditer les groupes pour %(user_name)s" msgid "User list" msgstr "Liste d'utilisateurs" +#: core/templates/core/user_stats.jinja:4 +msgid "%(user_name)s's stats" +msgstr "Stats de %(user_name)s" + #: core/templates/core/user_tools.jinja:4 #, python-format msgid "%(user_name)s's tools" @@ -1522,7 +1536,7 @@ msgstr "comptoir" msgid "bank" msgstr "banque" -#: counter/models.py:214 counter/models.py:246 +#: counter/models.py:214 counter/models.py:258 msgid "is validated" msgstr "est validé" @@ -1530,29 +1544,29 @@ msgstr "est validé" msgid "refilling" msgstr "rechargement" -#: counter/models.py:241 eboutic/models.py:106 +#: counter/models.py:251 eboutic/models.py:102 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:242 eboutic/models.py:107 +#: counter/models.py:252 eboutic/models.py:103 msgid "quantity" msgstr "quantité" -#: counter/models.py:248 eboutic/models.py:48 +#: counter/models.py:257 msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:248 eboutic/models.py:48 sith/settings.py:272 -#: sith/settings.py:277 sith/settings.py:298 sith/settings_sample.py:258 +#: counter/models.py:257 sith/settings.py:272 sith/settings.py:277 +#: sith/settings.py:298 sith/settings_sample.py:258 #: sith/settings_sample.py:263 sith/settings_sample.py:284 msgid "Credit card" msgstr "Carte banquaire" -#: counter/models.py:251 +#: counter/models.py:261 msgid "selling" msgstr "vente" -#: counter/models.py:275 +#: counter/models.py:295 msgid "permanency" msgstr "permanence" @@ -1597,7 +1611,6 @@ msgid "Finish" msgstr "Terminer" #: counter/templates/counter/counter_click.jinja:73 -#: eboutic/templates/eboutic/eboutic_main.jinja:41 msgid "Products: " msgstr "Produits : " @@ -1694,27 +1707,27 @@ msgstr "ANN" msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: eboutic/models.py:50 +#: eboutic/models.py:48 msgid "validated" msgstr "validé" -#: eboutic/models.py:60 +#: eboutic/models.py:61 msgid "Invoice already validated" msgstr "Facture déjà validée" -#: eboutic/models.py:103 +#: eboutic/models.py:99 msgid "product id" msgstr "ID du produit" -#: eboutic/models.py:104 +#: eboutic/models.py:100 msgid "product name" msgstr "nom du produit" -#: eboutic/models.py:105 +#: eboutic/models.py:101 msgid "product type id" msgstr "id du type du produit" -#: eboutic/models.py:116 +#: eboutic/models.py:112 msgid "basket" msgstr "panier" @@ -2047,4 +2060,3 @@ msgstr "Un utilisateur avec cette adresse email existe déjà" msgid "You must either choose an existing user or create a new one properly" msgstr "" "Vous devez soit choisir un utilisateur existant, ou en créer un proprement." - diff --git a/migrate.py b/migrate.py index 6e7953ed..82c6174b 100644 --- a/migrate.py +++ b/migrate.py @@ -513,13 +513,17 @@ def migrate_sellings(): """) Selling.objects.filter(payment_method="SITH_ACCOUNT").delete() print("Sith account selling deleted") + ae = Club.objects.filter(unix_name="ae").first() + mde = Counter.objects.filter(id=1).first() + root = User.objects.filter(id=0).first() + beer = Product.objects.filter(id=1).first() for r in cur: try: - product = Product.objects.filter(id=r['id_produit']).first() - club = Club.objects.filter(id=r['id_assocpt']).first() - counter = Counter.objects.filter(id=r['id_comptoir']).first() - op = User.objects.filter(id=r['id_utilisateur']).first() - customer = Customer.objects.filter(user__id=r['id_utilisateur_client']).first() + product = Product.objects.filter(id=r['id_produit']).first() or beer + club = Club.objects.filter(id=r['id_assocpt']).first() or ae + counter = Counter.objects.filter(id=r['id_comptoir']).first() or mde + op = User.objects.filter(id=r['id_utilisateur']).first() or root + customer = Customer.objects.filter(user__id=r['id_utilisateur_client']).first() or root.customer new = Selling( label=product.name, counter=counter, @@ -570,6 +574,7 @@ def main(): # migrate_subscriptions() # update_customer_account() # migrate_counters() + # migrate_permanencies() # migrate_typeproducts() # migrate_products() # migrate_products_to_counter() @@ -577,7 +582,6 @@ def main(): # migrate_invoices() # migrate_refillings() # migrate_sellings() - # migrate_permanencies() reset_index('core', 'counter') if __name__ == "__main__":