From d5f718fbba47e9f804a7704b0a01b0dc89082daf Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sun, 1 Mar 2020 17:16:38 +0100 Subject: [PATCH 01/21] start activity view and urls --- apps/activity/urls.py | 15 ++++++++++++ apps/activity/views.py | 33 +++++++++++++++++++++++++++ note_kfet/urls.py | 3 ++- templates/activity/activity_list.html | 26 +++++++++++++++++++++ templates/base.html | 2 +- 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 apps/activity/urls.py create mode 100644 apps/activity/views.py create mode 100644 templates/activity/activity_list.html diff --git a/apps/activity/urls.py b/apps/activity/urls.py new file mode 100644 index 00000000..125ac7af --- /dev/null +++ b/apps/activity/urls.py @@ -0,0 +1,15 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.urls import path + +from . import views + +app_name = 'activity' +urlpatterns = [ + path('', views.ActivityListView.as_view(),name='activity_list'), + path('/', views.ActivityDetailView.as_view(),name='activity_detail'), + path('/entry/', views.ActivityEntryView.as_view(),name='activity_entry'), + path('/update/', views.ActivityUpdateView.as_view(),name='activity_update'), + path('new/', views.ActivityCreateView.as_view(),name='activity_create'), +] diff --git a/apps/activity/views.py b/apps/activity/views.py new file mode 100644 index 00000000..7ea61d2e --- /dev/null +++ b/apps/activity/views.py @@ -0,0 +1,33 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from dal import autocomplete +from django.contrib.auth.mixins import LoginRequiredMixin +from django.db.models import Q +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ +from django.views.generic import CreateView, DetailView,\ + ListView, UpdateView, TemplateView +from django_tables2.views import SingleTableView + +from .models import Activity, ActivityType + +class ActivityCreateView(CreateView): + model = Activity + template_name = 'activity_create.html' + +class ActivityListView(SingleTableView): + model = Activity + template_name = 'activity_list.html' + +class ActivityDetailView(DetailView): + model = Activity + template_name = 'activty_detail.html' + +class ActivityUpdateView(UpdateView): + model = Activity + template_name = 'activity_update.html' + +class ActivityEntryView(TemplateView): + pass + diff --git a/note_kfet/urls.py b/note_kfet/urls.py index 303e229a..79b6dba6 100644 --- a/note_kfet/urls.py +++ b/note_kfet/urls.py @@ -11,10 +11,11 @@ urlpatterns = [ # Include project routers path('note/', include('note.urls')), + path('accounts/', include('member.urls')), + path('activity/', include('activity.urls')), # Include Django Contrib and Core routers path('i18n/', include('django.conf.urls.i18n')), - path('accounts/', include('member.urls')), path('accounts/', include('django.contrib.auth.urls')), path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), diff --git a/templates/activity/activity_list.html b/templates/activity/activity_list.html new file mode 100644 index 00000000..7f682d4c --- /dev/null +++ b/templates/activity/activity_list.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% load render_table from django_tables2 %} +{% load i18n crispy_forms_tags%} +{% block content %} + +{% trans 'New activity' %} + +
+
+ {% render_table table %} +
+
+ +{% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/base.html b/templates/base.html index 6814bedf..c0d4c43b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -73,7 +73,7 @@ SPDX-License-Identifier: GPL-3.0-or-later Clubs
  • - Activités + Activités
  • Bouton From 213e5a8369ad348a6c98df2f7c43b8c1a3c1e85b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 00:40:35 +0100 Subject: [PATCH 02/21] Fix CI --- apps/activity/urls.py | 11 ++++++----- apps/activity/views.py | 20 +++++++++----------- apps/member/views.py | 2 +- note_kfet/urls.py | 1 - 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/apps/activity/urls.py b/apps/activity/urls.py index 125ac7af..fc0b4850 100644 --- a/apps/activity/urls.py +++ b/apps/activity/urls.py @@ -6,10 +6,11 @@ from django.urls import path from . import views app_name = 'activity' + urlpatterns = [ - path('', views.ActivityListView.as_view(),name='activity_list'), - path('/', views.ActivityDetailView.as_view(),name='activity_detail'), - path('/entry/', views.ActivityEntryView.as_view(),name='activity_entry'), - path('/update/', views.ActivityUpdateView.as_view(),name='activity_update'), - path('new/', views.ActivityCreateView.as_view(),name='activity_create'), + path('', views.ActivityListView.as_view(), name='activity_list'), + path('/', views.ActivityDetailView.as_view(), name='activity_detail'), + path('/entry/', views.ActivityEntryView.as_view(), name='activity_entry'), + path('/update/', views.ActivityUpdateView.as_view(), name='activity_update'), + path('new/', views.ActivityCreateView.as_view(), name='activity_create'), ] diff --git a/apps/activity/views.py b/apps/activity/views.py index 7ea61d2e..f6c3ad1d 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,33 +1,31 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from dal import autocomplete -from django.contrib.auth.mixins import LoginRequiredMixin -from django.db.models import Q -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, DetailView,\ - ListView, UpdateView, TemplateView +from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django_tables2.views import SingleTableView -from .models import Activity, ActivityType +from .models import Activity + class ActivityCreateView(CreateView): model = Activity template_name = 'activity_create.html' - + + class ActivityListView(SingleTableView): model = Activity template_name = 'activity_list.html' + class ActivityDetailView(DetailView): model = Activity template_name = 'activty_detail.html' + class ActivityUpdateView(UpdateView): model = Activity template_name = 'activity_update.html' - + + class ActivityEntryView(TemplateView): pass - diff --git a/apps/member/views.py b/apps/member/views.py index 7d3ed748..c1bdf5cc 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -336,7 +336,7 @@ class ClubCreateView(LoginRequiredMixin, CreateView): def form_valid(self, form): return super().form_valid(form) - + class ClubListView(LoginRequiredMixin, SingleTableView): """ diff --git a/note_kfet/urls.py b/note_kfet/urls.py index 5aa25887..a7afab29 100644 --- a/note_kfet/urls.py +++ b/note_kfet/urls.py @@ -23,7 +23,6 @@ urlpatterns = [ path('i18n/', include('django.conf.urls.i18n')), path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), - path('accounts/', include('member.urls')), path('accounts/login/', CustomLoginView.as_view()), path('accounts/', include('django.contrib.auth.urls')), path('api/', include('api.urls')), From 45b14ed1bd370a81903fe219eb6e35e724768688 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 01:31:54 +0100 Subject: [PATCH 03/21] Create activities --- apps/activity/forms.py | 12 ++++++++++++ apps/activity/views.py | 15 +++++++++++---- templates/activity/activity_form.html | 11 +++++++++++ templates/activity/activity_list.html | 10 ++-------- 4 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 apps/activity/forms.py create mode 100644 templates/activity/activity_form.html diff --git a/apps/activity/forms.py b/apps/activity/forms.py new file mode 100644 index 00000000..a36f85cd --- /dev/null +++ b/apps/activity/forms.py @@ -0,0 +1,12 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django import forms + +from activity.models import Activity + + +class ActivityForm(forms.ModelForm): + class Meta: + model = Activity + fields = '__all__' diff --git a/apps/activity/views.py b/apps/activity/views.py index f6c3ad1d..224181ef 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -2,29 +2,36 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.views.generic import CreateView, DetailView, UpdateView, TemplateView +from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView +from .forms import ActivityForm from .models import Activity class ActivityCreateView(CreateView): model = Activity - template_name = 'activity_create.html' + form_class = ActivityForm class ActivityListView(SingleTableView): model = Activity - template_name = 'activity_list.html' + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + ctx['title'] = _("Upcoming activities") + + return ctx class ActivityDetailView(DetailView): model = Activity - template_name = 'activty_detail.html' class ActivityUpdateView(UpdateView): model = Activity - template_name = 'activity_update.html' + form_class = ActivityForm class ActivityEntryView(TemplateView): diff --git a/templates/activity/activity_form.html b/templates/activity/activity_form.html new file mode 100644 index 00000000..99c254e3 --- /dev/null +++ b/templates/activity/activity_form.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% load static %} +{% load i18n %} +{% load crispy_forms_tags %} +{% block content %} +
    +{% csrf_token %} +{{form|crispy}} + +
    +{% endblock %} diff --git a/templates/activity/activity_list.html b/templates/activity/activity_list.html index 7f682d4c..9092e2ca 100644 --- a/templates/activity/activity_list.html +++ b/templates/activity/activity_list.html @@ -2,15 +2,9 @@ {% load render_table from django_tables2 %} {% load i18n crispy_forms_tags%} {% block content %} + {% render_table table %} -{% trans 'New activity' %} - -
    -
    - {% render_table table %} -
    -
    - + {% trans 'New activity' %} {% endblock %} {% block extrajavascript %} From f81e2b5b5b1b8f2adc9080c0fa1c961c623062a9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 13:50:02 +0100 Subject: [PATCH 04/21] Use custom inputs for date picker and amounts --- apps/activity/forms.py | 6 +- apps/activity/views.py | 11 +- apps/note/templatetags/pretty_money.py | 5 - apps/note/views.py | 2 + apps/treasury/forms.py | 14 +- apps/treasury/views.py | 23 +- note_kfet/inputs.py | 280 ++++++++++++++++++ note_kfet/settings/base.py | 3 + .../css/datepicker-widget.css | 121 ++++++++ .../js/datepicker-widget.js | 55 ++++ .../date_picker.html | 6 + .../bootstrap_datepicker_plus/input.html | 4 + .../time_picker.html | 6 + templates/note/amount_input.html | 11 + templates/note/transaction_form.html | 7 +- templates/treasury/invoice_form.html | 26 +- 16 files changed, 518 insertions(+), 62 deletions(-) create mode 100644 note_kfet/inputs.py create mode 100644 static/bootstrap_datepicker_plus/css/datepicker-widget.css create mode 100644 static/bootstrap_datepicker_plus/js/datepicker-widget.js create mode 100644 templates/bootstrap_datepicker_plus/date_picker.html create mode 100644 templates/bootstrap_datepicker_plus/input.html create mode 100644 templates/bootstrap_datepicker_plus/time_picker.html create mode 100644 templates/note/amount_input.html diff --git a/apps/activity/forms.py b/apps/activity/forms.py index a36f85cd..b7dc6de9 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -2,11 +2,15 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django import forms - from activity.models import Activity +from note_kfet.inputs import DateTimePickerInput class ActivityForm(forms.ModelForm): class Meta: model = Activity fields = '__all__' + widgets = { + "date_start": DateTimePickerInput(), + "date_end": DateTimePickerInput(), + } diff --git a/apps/activity/views.py b/apps/activity/views.py index 224181ef..f1ecc1b3 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,6 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView @@ -9,12 +10,12 @@ from .forms import ActivityForm from .models import Activity -class ActivityCreateView(CreateView): +class ActivityCreateView(LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm -class ActivityListView(SingleTableView): +class ActivityListView(LoginRequiredMixin, SingleTableView): model = Activity def get_context_data(self, **kwargs): @@ -25,14 +26,14 @@ class ActivityListView(SingleTableView): return ctx -class ActivityDetailView(DetailView): +class ActivityDetailView(LoginRequiredMixin, DetailView): model = Activity -class ActivityUpdateView(UpdateView): +class ActivityUpdateView(LoginRequiredMixin, UpdateView): model = Activity form_class = ActivityForm -class ActivityEntryView(TemplateView): +class ActivityEntryView(LoginRequiredMixin, TemplateView): pass diff --git a/apps/note/templatetags/pretty_money.py b/apps/note/templatetags/pretty_money.py index ba527f9b..265870a8 100644 --- a/apps/note/templatetags/pretty_money.py +++ b/apps/note/templatetags/pretty_money.py @@ -18,10 +18,5 @@ def pretty_money(value): ) -def cents_to_euros(value): - return "{:.02f}".format(value / 100) if value else "" - - register = template.Library() register.filter('pretty_money', pretty_money) -register.filter('cents_to_euros', cents_to_euros) diff --git a/apps/note/views.py b/apps/note/views.py index ddf5ee6f..c8f57924 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -9,6 +9,7 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, UpdateView from django_tables2 import SingleTableView from django.urls import reverse_lazy +from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend from .forms import TransactionTemplateForm @@ -40,6 +41,7 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): """ context = super().get_context_data(**kwargs) context['title'] = _('Transfer money') + context['amount_widget'] = AmountInput(attrs={"id": "amount"}) context['polymorphic_ctype'] = ContentType.objects.get_for_model(Transaction).pk context['special_polymorphic_ctype'] = ContentType.objects.get_for_model(SpecialTransaction).pk context['special_types'] = NoteSpecial.objects.order_by("special_type").all() diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index caaa365f..7fe7de4c 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -7,6 +7,7 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit from django import forms from django.utils.translation import gettext_lazy as _ +from note_kfet.inputs import DatePickerInput, AmountInput from .models import Invoice, Product, Remittance, SpecialTransactionProxy @@ -19,7 +20,7 @@ class InvoiceForm(forms.ModelForm): # Django forms don't support date fields. We have to add it manually date = forms.DateField( initial=datetime.date.today, - widget=forms.TextInput(attrs={'type': 'date'}) + widget=DatePickerInput() ) def clean_date(self): @@ -30,12 +31,21 @@ class InvoiceForm(forms.ModelForm): exclude = ('bde', ) +class ProductForm(forms.ModelForm): + class Meta: + model = Product + fields = '__all__' + widgets = { + "amount": AmountInput() + } + + # Add a subform per product in the invoice form, and manage correctly the link between the invoice and # its products. The FormSet will search automatically the ForeignKey in the Product model. ProductFormSet = forms.inlineformset_factory( Invoice, Product, - fields='__all__', + form=ProductForm, extra=1, ) diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 90440566..c374ced1 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -50,18 +50,8 @@ class InvoiceCreateView(LoginRequiredMixin, CreateView): def form_valid(self, form): ret = super().form_valid(form) - kwargs = {} - - # The user type amounts in cents. We convert it in euros. - for key in self.request.POST: - value = self.request.POST[key] - if key.endswith("amount") and value: - kwargs[key] = str(int(100 * float(value))) - elif value: - kwargs[key] = value - # For each product, we save it - formset = ProductFormSet(kwargs, instance=form.instance) + formset = ProductFormSet(self.request.POST, instance=form.instance) if formset.is_valid(): for f in formset: # We don't save the product if the designation is not entered, ie. if the line is empty @@ -112,16 +102,7 @@ class InvoiceUpdateView(LoginRequiredMixin, UpdateView): def form_valid(self, form): ret = super().form_valid(form) - kwargs = {} - # The user type amounts in cents. We convert it in euros. - for key in self.request.POST: - value = self.request.POST[key] - if key.endswith("amount") and value: - kwargs[key] = str(int(100 * float(value))) - elif value: - kwargs[key] = value - - formset = ProductFormSet(kwargs, instance=form.instance) + formset = ProductFormSet(self.request.POST, instance=form.instance) saved = [] # For each product, we save it if formset.is_valid(): diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py new file mode 100644 index 00000000..ca3a13c7 --- /dev/null +++ b/note_kfet/inputs.py @@ -0,0 +1,280 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +""" +This file comes from the project `django-bootstrap-datepicker-plus` available on Github: +https://github.com/monim67/django-bootstrap-datepicker-plus +This is distributed under Apache License 2.0. + +This adds datetime pickers with bootstrap. +""" + +"""Contains Base Date-Picker input class for widgets of this package.""" + +from json import dumps as json_dumps + +from django.forms.widgets import DateTimeBaseInput, NumberInput + + +class AmountInput(NumberInput): + """ + This input type lets the user type amounts in euros, but forms receive data in cents + """ + template_name = "note/amount_input.html" + + def format_value(self, value): + return None if value is None or value == "" else "{:.02f}".format(value / 100, ) + + def value_from_datadict(self, data, files, name): + val = super().value_from_datadict(data, files, name) + return str(int(100 * float(val))) if val else val + + +class DatePickerDictionary: + """Keeps track of all date-picker input classes.""" + + _i = 0 + items = dict() + + @classmethod + def generate_id(cls): + """Return a unique ID for each date-picker input class.""" + cls._i += 1 + return 'dp_%s' % cls._i + + +class BasePickerInput(DateTimeBaseInput): + """Base Date-Picker input class for widgets of this package.""" + + template_name = 'bootstrap_datepicker_plus/date_picker.html' + picker_type = 'DATE' + format = '%Y-%m-%d' + config = {} + _default_config = { + 'id': None, + 'picker_type': None, + 'linked_to': None, + 'options': {} # final merged options + } + options = {} # options extended by user + options_param = {} # options passed as parameter + _default_options = { + 'showClose': True, + 'showClear': True, + 'showTodayButton': True, + "locale": "fr", + } + + # source: https://github.com/tutorcruncher/django-bootstrap3-datetimepicker + # file: /blob/31fbb09/bootstrap3_datetime/widgets.py#L33 + format_map = ( + ('DDD', r'%j'), + ('DD', r'%d'), + ('MMMM', r'%B'), + ('MMM', r'%b'), + ('MM', r'%m'), + ('YYYY', r'%Y'), + ('YY', r'%y'), + ('HH', r'%H'), + ('hh', r'%I'), + ('mm', r'%M'), + ('ss', r'%S'), + ('a', r'%p'), + ('ZZ', r'%z'), + ) + + class Media: + """JS/CSS resources needed to render the date-picker calendar.""" + + js = ( + 'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/' + 'moment-with-locales.min.js', + 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/' + '4.17.47/js/bootstrap-datetimepicker.min.js', + 'bootstrap_datepicker_plus/js/datepicker-widget.js' + ) + css = {'all': ( + 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/' + '4.17.47/css/bootstrap-datetimepicker.css', + 'bootstrap_datepicker_plus/css/datepicker-widget.css' + ), } + + @classmethod + def format_py2js(cls, datetime_format): + """Convert python datetime format to moment datetime format.""" + for js_format, py_format in cls.format_map: + datetime_format = datetime_format.replace(py_format, js_format) + return datetime_format + + @classmethod + def format_js2py(cls, datetime_format): + """Convert moment datetime format to python datetime format.""" + for js_format, py_format in cls.format_map: + datetime_format = datetime_format.replace(js_format, py_format) + return datetime_format + + def __init__(self, attrs=None, format=None, options=None): + """Initialize the Date-picker widget.""" + self.format_param = format + self.options_param = options if options else {} + self.config = self._default_config.copy() + self.config['id'] = DatePickerDictionary.generate_id() + self.config['picker_type'] = self.picker_type + self.config['options'] = self._calculate_options() + attrs = attrs if attrs else {} + if 'class' not in attrs: + attrs['class'] = 'form-control' + super().__init__(attrs, self._calculate_format()) + + def _calculate_options(self): + """Calculate and Return the options.""" + _options = self._default_options.copy() + _options.update(self.options) + if self.options_param: + _options.update(self.options_param) + return _options + + def _calculate_format(self): + """Calculate and Return the datetime format.""" + _format = self.format_param if self.format_param else self.format + if self.config['options'].get('format'): + _format = self.format_js2py(self.config['options'].get('format')) + else: + self.config['options']['format'] = self.format_py2js(_format) + return _format + + def get_context(self, name, value, attrs): + """Return widget context dictionary.""" + context = super().get_context( + name, value, attrs) + context['widget']['attrs']['dp_config'] = json_dumps(self.config) + return context + + def start_of(self, event_id): + """ + Set Date-Picker as the start-date of a date-range. + + Args: + - event_id (string): User-defined unique id for linking two fields + """ + DatePickerDictionary.items[str(event_id)] = self + return self + + def end_of(self, event_id, import_options=True): + """ + Set Date-Picker as the end-date of a date-range. + + Args: + - event_id (string): User-defined unique id for linking two fields + - import_options (bool): inherit options from start-date input, + default: TRUE + """ + event_id = str(event_id) + if event_id in DatePickerDictionary.items: + linked_picker = DatePickerDictionary.items[event_id] + self.config['linked_to'] = linked_picker.config['id'] + if import_options: + backup_moment_format = self.config['options']['format'] + self.config['options'].update(linked_picker.config['options']) + self.config['options'].update(self.options_param) + if self.format_param or 'format' in self.options_param: + self.config['options']['format'] = backup_moment_format + else: + self.format = linked_picker.format + # Setting useCurrent is necessary, see following issue + # https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1075 + self.config['options']['useCurrent'] = False + self._link_to(linked_picker) + else: + raise KeyError( + 'start-date not specified for event_id "%s"' % event_id) + return self + + def _link_to(self, linked_picker): + """ + Executed when two date-inputs are linked together. + + This method for sub-classes to override to customize the linking. + """ + pass + + +class DatePickerInput(BasePickerInput): + """ + Widget to display a Date-Picker Calendar on a DateField property. + + Args: + - attrs (dict): HTML attributes of rendered HTML input + - format (string): Python DateTime format eg. "%Y-%m-%d" + - options (dict): Options to customize the widget, see README + """ + + picker_type = 'DATE' + format = '%Y-%m-%d' + format_key = 'DATE_INPUT_FORMATS' + + +class TimePickerInput(BasePickerInput): + """ + Widget to display a Time-Picker Calendar on a TimeField property. + + Args: + - attrs (dict): HTML attributes of rendered HTML input + - format (string): Python DateTime format eg. "%Y-%m-%d" + - options (dict): Options to customize the widget, see README + """ + + picker_type = 'TIME' + format = '%H:%M' + format_key = 'TIME_INPUT_FORMATS' + template_name = 'bootstrap_datepicker_plus/time_picker.html' + + +class DateTimePickerInput(BasePickerInput): + """ + Widget to display a DateTime-Picker Calendar on a DateTimeField property. + + Args: + - attrs (dict): HTML attributes of rendered HTML input + - format (string): Python DateTime format eg. "%Y-%m-%d" + - options (dict): Options to customize the widget, see README + """ + + picker_type = 'DATETIME' + format = '%Y-%m-%d %H:%M' + format_key = 'DATETIME_INPUT_FORMATS' + + +class MonthPickerInput(BasePickerInput): + """ + Widget to display a Month-Picker Calendar on a DateField property. + + Args: + - attrs (dict): HTML attributes of rendered HTML input + - format (string): Python DateTime format eg. "%Y-%m-%d" + - options (dict): Options to customize the widget, see README + """ + + picker_type = 'MONTH' + format = '01/%m/%Y' + format_key = 'DATE_INPUT_FORMATS' + + +class YearPickerInput(BasePickerInput): + """ + Widget to display a Year-Picker Calendar on a DateField property. + + Args: + - attrs (dict): HTML attributes of rendered HTML input + - format (string): Python DateTime format eg. "%Y-%m-%d" + - options (dict): Options to customize the widget, see README + """ + + picker_type = 'YEAR' + format = '01/01/%Y' + format_key = 'DATE_INPUT_FORMATS' + + def _link_to(self, linked_picker): + """Customize the options when linked with other date-time input""" + yformat = self.config['options']['format'].replace('-01-01', '-12-31') + self.config['options']['format'] = yformat \ No newline at end of file diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index d49b2542..bdd4d9a3 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -48,6 +48,7 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.forms', # API 'rest_framework', 'rest_framework.authtoken', @@ -100,6 +101,8 @@ TEMPLATES = [ }, ] +FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' + WSGI_APPLICATION = 'note_kfet.wsgi.application' # Password validation diff --git a/static/bootstrap_datepicker_plus/css/datepicker-widget.css b/static/bootstrap_datepicker_plus/css/datepicker-widget.css new file mode 100644 index 00000000..baeec507 --- /dev/null +++ b/static/bootstrap_datepicker_plus/css/datepicker-widget.css @@ -0,0 +1,121 @@ +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.eot'); + src: url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), + url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.woff2') format('woff2'), + url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.woff') format('woff'), + url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.ttf') format('truetype'), + url('//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); +} + +.glyphicon { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.glyphicon-time:before { + content: "\e023"; +} + +.glyphicon-chevron-left:before { + content: "\e079"; +} + +.glyphicon-chevron-right:before { + content: "\e080"; +} + +.glyphicon-chevron-up:before { + content: "\e113"; +} + +.glyphicon-chevron-down:before { + content: "\e114"; +} + +.glyphicon-calendar:before { + content: "\e109"; +} + +.glyphicon-screenshot:before { + content: "\e087"; +} + +.glyphicon-trash:before { + content: "\e020"; +} + +.glyphicon-remove:before { + content: "\e014"; +} + +.bootstrap-datetimepicker-widget .btn { + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 14px; + font-weight: normal; + line-height: 1.42857143; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + background-image: none; + border: 1px solid transparent; + border-radius: 4px; +} + +.bootstrap-datetimepicker-widget.dropdown-menu { + position: absolute; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + box-shadow: 0 6px 12px rgba(0, 0, 0, .175); +} + +.bootstrap-datetimepicker-widget .list-unstyled { + padding-left: 0; + list-style: none; +} + +.bootstrap-datetimepicker-widget .collapse { + display: none; +} + +.bootstrap-datetimepicker-widget .collapse.in { + display: block; +} + +/* fix for bootstrap4 */ +.bootstrap-datetimepicker-widget .table-condensed > thead > tr > th, +.bootstrap-datetimepicker-widget .table-condensed > tbody > tr > td, +.bootstrap-datetimepicker-widget .table-condensed > tfoot > tr > td { + padding: 5px; +} diff --git a/static/bootstrap_datepicker_plus/js/datepicker-widget.js b/static/bootstrap_datepicker_plus/js/datepicker-widget.js new file mode 100644 index 00000000..2288b46b --- /dev/null +++ b/static/bootstrap_datepicker_plus/js/datepicker-widget.js @@ -0,0 +1,55 @@ +jQuery(function ($) { + var datepickerDict = {}; + var isBootstrap4 = $.fn.collapse.Constructor.VERSION.split('.').shift() == "4"; + function fixMonthEndDate(e, picker) { + e.date && picker.val().length && picker.val(e.date.endOf('month').format('YYYY-MM-DD')); + } + $("[dp_config]:not([disabled])").each(function (i, element) { + var $element = $(element), data = {}; + try { + data = JSON.parse($element.attr('dp_config')); + } + catch (x) { } + if (data.id && data.options) { + data.$element = $element.datetimepicker(data.options); + data.datepickerdata = $element.data("DateTimePicker"); + datepickerDict[data.id] = data; + data.$element.next('.input-group-addon').on('click', function(){ + data.datepickerdata.show(); + }); + if(isBootstrap4){ + data.$element.on("dp.show", function (e) { + $('.collapse.in').addClass('show'); + }); + } + } + }); + $.each(datepickerDict, function (id, to_picker) { + if (to_picker.linked_to) { + var from_picker = datepickerDict[to_picker.linked_to]; + from_picker.datepickerdata.maxDate(to_picker.datepickerdata.date() || false); + to_picker.datepickerdata.minDate(from_picker.datepickerdata.date() || false); + from_picker.$element.on("dp.change", function (e) { + to_picker.datepickerdata.minDate(e.date || false); + }); + to_picker.$element.on("dp.change", function (e) { + if (to_picker.picker_type == 'MONTH') fixMonthEndDate(e, to_picker.$element); + from_picker.datepickerdata.maxDate(e.date || false); + }); + if (to_picker.picker_type == 'MONTH') { + to_picker.$element.on("dp.hide", function (e) { + fixMonthEndDate(e, to_picker.$element); + }); + fixMonthEndDate({ date: to_picker.datepickerdata.date() }, to_picker.$element); + } + } + }); + if(isBootstrap4) { + $('body').on('show.bs.collapse','.bootstrap-datetimepicker-widget .collapse',function(e){ + $(e.target).addClass('in'); + }); + $('body').on('hidden.bs.collapse','.bootstrap-datetimepicker-widget .collapse',function(e){ + $(e.target).removeClass('in'); + }); + } +}); diff --git a/templates/bootstrap_datepicker_plus/date_picker.html b/templates/bootstrap_datepicker_plus/date_picker.html new file mode 100644 index 00000000..67a11df1 --- /dev/null +++ b/templates/bootstrap_datepicker_plus/date_picker.html @@ -0,0 +1,6 @@ +
    + {% include "bootstrap_datepicker_plus/input.html" %} +
    +
    +
    +
    diff --git a/templates/bootstrap_datepicker_plus/input.html b/templates/bootstrap_datepicker_plus/input.html new file mode 100644 index 00000000..b2f8c403 --- /dev/null +++ b/templates/bootstrap_datepicker_plus/input.html @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/templates/bootstrap_datepicker_plus/time_picker.html b/templates/bootstrap_datepicker_plus/time_picker.html new file mode 100644 index 00000000..2bd509a3 --- /dev/null +++ b/templates/bootstrap_datepicker_plus/time_picker.html @@ -0,0 +1,6 @@ +
    + {% include "bootstrap_datepicker_plus/input.html" %} +
    +
    +
    +
    diff --git a/templates/note/amount_input.html b/templates/note/amount_input.html new file mode 100644 index 00000000..6ef4a53a --- /dev/null +++ b/templates/note/amount_input.html @@ -0,0 +1,11 @@ +
    + +
    + € +
    +
    \ No newline at end of file diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index d2cd85e9..65aaa635 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -126,12 +126,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
    -
    - -
    - € -
    -
    + {% include "note/amount_input.html" with widget=amount_widget %}
    diff --git a/templates/treasury/invoice_form.html b/templates/treasury/invoice_form.html index 0edcbdcd..2875d410 100644 --- a/templates/treasury/invoice_form.html +++ b/templates/treasury/invoice_form.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static %} {% load i18n %} -{% load crispy_forms_tags pretty_money %} +{% load crispy_forms_tags %} {% block content %}

    {% trans "Invoices list" %}

    @@ -26,18 +26,8 @@ {% endif %} {{ form.designation }} - {{ form.quantity }} - - {# Use custom input for amount, with the € symbol #} -
    - -
    - € -
    -
    - + {{ form.quantity }} + {{ form.amount }} {# These fields are hidden but handled by the formset to link the id and the invoice id #} {{ form.invoice }} {{ form.id }} @@ -64,15 +54,7 @@ {{ formset.empty_form.designation }} {{ formset.empty_form.quantity }} - -
    - -
    - € -
    -
    - + {{ formset.empty_form.amount }} {{ formset.empty_form.invoice }} {{ formset.empty_form.id }} From 823bcfe7812f89e5cdd0c52c69bf0f11f5010990 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 14:19:55 +0100 Subject: [PATCH 05/21] Fix CI --- apps/member/views.py | 14 ++++++-------- apps/note/api/views.py | 9 ++++----- apps/note/forms.py | 1 - apps/note/models/notes.py | 6 +++--- apps/note/models/transactions.py | 1 - apps/note/tables.py | 14 ++++++-------- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index 82510c65..bcaca335 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -6,22 +6,18 @@ import io from PIL import Image from dal import autocomplete from django.conf import settings -from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.auth.views import LoginView -from django.core.exceptions import ValidationError from django.db.models import Q -from django.http import HttpResponseRedirect from django.shortcuts import redirect from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, DetailView, UpdateView, TemplateView, DeleteView +from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.views.generic.edit import FormMixin from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm -#from note.forms import AliasForm, ImageForm from note.models import Alias, NoteUser from note.models.transactions import Transaction from note.tables import HistoryTable, AliasTable @@ -168,12 +164,12 @@ class UserListView(LoginRequiredMixin, SingleTableView): context["filter"] = self.filter return context - + class ProfileAliasView(LoginRequiredMixin, DetailView): model = User template_name = 'member/profile_alias.html' context_object_name = 'user_object' - + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) note = context['object'].note @@ -326,11 +322,12 @@ class ClubDetailView(LoginRequiredMixin, DetailView): context['member_list'] = club_member return context + class ClubAliasView(LoginRequiredMixin, DetailView): model = Club template_name = 'member/club_alias.html' context_object_name = 'club' - + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) note = context['object'].note @@ -364,6 +361,7 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view") | PermissionBackend.filter_queryset(self.request.user, Membership, "change")) + def get_context_data(self, **kwargs): club = Club.objects.get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) diff --git a/apps/note/api/views.py b/apps/note/api/views.py index e70eb49e..049f8736 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -8,7 +8,6 @@ from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework import viewsets from rest_framework.response import Response from rest_framework import status - from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet from .serializers import NotePolymorphicSerializer, AliasSerializer, TemplateCategorySerializer, \ @@ -60,19 +59,19 @@ class AliasViewSet(ReadProtectedModelViewSet): def get_serializer_class(self): serializer_class = self.serializer_class if self.request.method in ['PUT', 'PATCH']: - #alias owner cannot be change once establish + # alias owner cannot be change once establish setattr(serializer_class.Meta, 'read_only_fields', ('note',)) return serializer_class - + def destroy(self, request, *args, **kwargs): instance = self.get_object() try: self.perform_destroy(instance) except ValidationError as e: print(e) - return Response({e.code:e.message},status.HTTP_400_BAD_REQUEST) + return Response({e.code: e.message}, status.HTTP_400_BAD_REQUEST) return Response(status=status.HTTP_204_NO_CONTENT) - + def get_queryset(self): """ Parse query and apply filters. diff --git a/apps/note/forms.py b/apps/note/forms.py index 60252ad5..18bcf712 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -5,7 +5,6 @@ from dal import autocomplete from django import forms from django.utils.translation import gettext_lazy as _ -from .models import Alias from .models import TransactionTemplate diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 43faabfe..9282bde9 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -242,10 +242,10 @@ class Alias(models.Model): pass self.normalized_name = normalized_name - def save(self,*args,**kwargs): + def save(self, *args, **kwargs): self.normalized_name = self.normalize(self.name) - super().save(*args,**kwargs) - + super().save(*args, **kwargs) + def delete(self, using=None, keep_parents=False): if self.name == str(self.note): raise ValidationError(_("You can't delete your main alias."), diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index c6b8baa6..d1dcd788 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.db import models -from django.db.models import F from django.urls import reverse from django.utils import timezone from django.utils.translation import gettext_lazy as _ diff --git a/apps/note/tables.py b/apps/note/tables.py index 201b6c43..0d83e3cc 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -106,9 +106,8 @@ DELETE_TEMPLATE = """ class AliasTable(tables.Table): class Meta: attrs = { - 'class': - 'table table condensed table-striped table-hover', - 'id':"alias_table" + 'class': 'table table condensed table-striped table-hover', + 'id': "alias_table" } model = Alias fields = ('name',) @@ -118,9 +117,8 @@ class AliasTable(tables.Table): name = tables.Column(attrs={'td': {'class': 'text-center'}}) delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, - extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) - + extra_context={"delete_trans": _('delete')}, + attrs={'td': {'class': 'col-sm-1'}}) class ButtonTable(tables.Table): @@ -145,8 +143,8 @@ class ButtonTable(tables.Table): accessor='pk') delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, - extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) + extra_context={"delete_trans": _('delete')}, + attrs={'td': {'class': 'col-sm-1'}}) def render_amount(self, value): return pretty_money(value) From f09364d3d8853b55b1de07ff5d2aaa871b1aabee Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 16:19:33 +0100 Subject: [PATCH 06/21] Custom auto-complete fields, remove DAL requirement --- apps/activity/forms.py | 11 ++++- apps/activity/views.py | 3 ++ apps/member/forms.py | 12 +++-- apps/member/urls.py | 2 - apps/member/views.py | 23 --------- apps/note/api/views.py | 3 +- apps/note/forms.py | 14 +++--- apps/note/urls.py | 3 -- apps/note/views.py | 60 +----------------------- note_kfet/inputs.py | 50 +++++++++++++++----- note_kfet/settings/base.py | 3 -- requirements/base.txt | 1 - static/js/autocomplete_model.js | 34 ++++++++++++++ templates/member/autocomplete_model.html | 9 ++++ templates/member/club_info.html | 6 ++- 15 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 static/js/autocomplete_model.js create mode 100644 templates/member/autocomplete_model.html diff --git a/apps/activity/forms.py b/apps/activity/forms.py index b7dc6de9..081f611c 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -3,7 +3,8 @@ from django import forms from activity.models import Activity -from note_kfet.inputs import DateTimePickerInput +from member.models import Club +from note_kfet.inputs import DateTimePickerInput, AutocompleteModelSelect class ActivityForm(forms.ModelForm): @@ -11,6 +12,14 @@ class ActivityForm(forms.ModelForm): model = Activity fields = '__all__' widgets = { + "organizer": AutocompleteModelSelect( + model=Club, + attrs={"api_url": "/api/members/club/"}, + ), + "attendees_club": AutocompleteModelSelect( + model=Club, + attrs={"api_url": "/api/members/club/"}, + ), "date_start": DateTimePickerInput(), "date_end": DateTimePickerInput(), } diff --git a/apps/activity/views.py b/apps/activity/views.py index f1ecc1b3..be3db16d 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView @@ -13,6 +14,7 @@ from .models import Activity class ActivityCreateView(LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm + success_url = reverse_lazy('activity:activity_list') class ActivityListView(LoginRequiredMixin, SingleTableView): @@ -33,6 +35,7 @@ class ActivityDetailView(LoginRequiredMixin, DetailView): class ActivityUpdateView(LoginRequiredMixin, UpdateView): model = Activity form_class = ActivityForm + success_url = reverse_lazy('activity:activity_list') class ActivityEntryView(LoginRequiredMixin, TemplateView): diff --git a/apps/member/forms.py b/apps/member/forms.py index 5f2d5838..52dde34a 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,10 +4,11 @@ from crispy_forms.bootstrap import Div from crispy_forms.helper import FormHelper from crispy_forms.layout import Layout -from dal import autocomplete from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User + +from note_kfet.inputs import AutocompleteModelSelect from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -63,11 +64,12 @@ class MembershipForm(forms.ModelForm): # et récupère les noms d'utilisateur valides widgets = { 'user': - autocomplete.ModelSelect2( - url='member:user_autocomplete', + AutocompleteModelSelect( + User, attrs={ - 'data-placeholder': 'Nom ...', - 'data-minimum-input-length': 1, + 'api_url': '/api/user/', + 'name_field': 'username', + 'placeholder': 'Nom ...', }, ), } diff --git a/apps/member/urls.py b/apps/member/urls.py index 0b705bfd..085a3fec 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -21,6 +21,4 @@ urlpatterns = [ path('user//update_pic', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"), path('user//aliases', views.ProfileAliasView.as_view(), name="user_alias"), path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'), - # API for the user autocompleter - path('user/user-autocomplete', views.UserAutocomplete.as_view(), name="user_autocomplete"), ] diff --git a/apps/member/views.py b/apps/member/views.py index bcaca335..8145b5e9 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -4,7 +4,6 @@ import io from PIL import Image -from dal import autocomplete from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User @@ -253,28 +252,6 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): return context -class UserAutocomplete(autocomplete.Select2QuerySetView): - """ - Auto complete users by usernames - """ - - def get_queryset(self): - """ - Quand une personne cherche un utilisateur par pseudo, une requête est envoyée sur l'API dédiée à l'auto-complétion. - Cette fonction récupère la requête, et renvoie la liste filtrée des utilisateurs par pseudos. - """ - # Un utilisateur non connecté n'a accès à aucune information - if not self.request.user.is_authenticated: - return User.objects.none() - - qs = User.objects.filter(PermissionBackend.filter_queryset(self.request.user, User, "view")).all() - - if self.q: - qs = qs.filter(username__regex="^" + self.q) - - return qs - - # ******************************* # # CLUB # # ******************************* # diff --git a/apps/note/api/views.py b/apps/note/api/views.py index 049f8736..23bed1c9 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -24,7 +24,8 @@ class NotePolymorphicViewSet(ReadOnlyProtectedModelViewSet): """ queryset = Note.objects.all() serializer_class = NotePolymorphicSerializer - filter_backends = [SearchFilter, OrderingFilter] + filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter] + filterset_fields = ['polymorphic_ctype', 'is_active', ] search_fields = ['$alias__normalized_name', '$alias__name', '$polymorphic_ctype__model', ] ordering_fields = ['alias__name', 'alias__normalized_name'] diff --git a/apps/note/forms.py b/apps/note/forms.py index 18bcf712..d819644f 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -1,11 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from dal import autocomplete from django import forms +from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ +from note_kfet.inputs import AutocompleteModelSelect -from .models import TransactionTemplate +from .models import TransactionTemplate, NoteClub class ImageForm(forms.Form): @@ -30,11 +31,12 @@ class TransactionTemplateForm(forms.ModelForm): # forward=(forward.Const('TYPE', 'note_type') où TYPE est dans {user, club, special} widgets = { 'destination': - autocomplete.ModelSelect2( - url='note:note_autocomplete', + AutocompleteModelSelect( + NoteClub, attrs={ - 'data-placeholder': 'Note ...', - 'data-minimum-input-length': 1, + 'api_url': '/api/note/note/', + 'api_url_suffix': '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk), + 'placeholder': 'Note ...', }, ), } diff --git a/apps/note/urls.py b/apps/note/urls.py index 59316069..1bc12b4d 100644 --- a/apps/note/urls.py +++ b/apps/note/urls.py @@ -13,7 +13,4 @@ urlpatterns = [ path('buttons/update//', views.TransactionTemplateUpdateView.as_view(), name='template_update'), path('buttons/', views.TransactionTemplateListView.as_view(), name='template_list'), path('consos/', views.ConsoView.as_view(), name='consos'), - - # API for the note autocompleter - path('note-autocomplete/', views.NoteAutocomplete.as_view(model=Note), name='note_autocomplete'), ] diff --git a/apps/note/views.py b/apps/note/views.py index c8f57924..25279281 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -1,10 +1,8 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from dal import autocomplete from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType -from django.db.models import Q from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, UpdateView from django_tables2 import SingleTableView @@ -13,7 +11,7 @@ from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend from .forms import TransactionTemplateForm -from .models import Transaction, TransactionTemplate, Alias, RecurrentTransaction, NoteSpecial +from .models import Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial from .models.transactions import SpecialTransaction from .tables import HistoryTable, ButtonTable @@ -49,62 +47,6 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): return context -class NoteAutocomplete(autocomplete.Select2QuerySetView): - """ - Auto complete note by aliases. Used in every search field for note - ex: :view:`ConsoView`, :view:`TransactionCreateView` - """ - - def get_queryset(self): - """ - When someone look for an :models:`note.Alias`, a query is sent to the dedicated API. - This function handles the result and return a filtered list of aliases. - """ - # Un utilisateur non connecté n'a accès à aucune information - if not self.request.user.is_authenticated: - return Alias.objects.none() - - qs = Alias.objects.all() - - # self.q est le paramètre de la recherche - if self.q: - qs = qs.filter(Q(name__regex="^" + self.q) | Q(normalized_name__regex="^" + Alias.normalize(self.q))) \ - .order_by('normalized_name').distinct() - - # Filtrage par type de note (user, club, special) - note_type = self.forwarded.get("note_type", None) - if note_type: - types = str(note_type).lower() - if "user" in types: - qs = qs.filter(note__polymorphic_ctype__model="noteuser") - elif "club" in types: - qs = qs.filter(note__polymorphic_ctype__model="noteclub") - elif "special" in types: - qs = qs.filter(note__polymorphic_ctype__model="notespecial") - else: - qs = qs.none() - - return qs - - def get_result_label(self, result): - """ - Show the selected alias and the username associated - (aka. ) - """ - # Gère l'affichage de l'alias dans la recherche - res = result.name - note_name = str(result.note) - if res != note_name: - res += " (aka. " + note_name + ")" - return res - - def get_result_value(self, result): - """ - The value used for the transactions will be the id of the Note. - """ - return str(result.note.pk) - - class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): """ Create TransactionTemplate diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index ca3a13c7..35b8b605 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -1,19 +1,9 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -""" -This file comes from the project `django-bootstrap-datepicker-plus` available on Github: -https://github.com/monim67/django-bootstrap-datepicker-plus -This is distributed under Apache License 2.0. - -This adds datetime pickers with bootstrap. -""" - -"""Contains Base Date-Picker input class for widgets of this package.""" - from json import dumps as json_dumps -from django.forms.widgets import DateTimeBaseInput, NumberInput +from django.forms.widgets import DateTimeBaseInput, NumberInput, Select class AmountInput(NumberInput): @@ -30,6 +20,44 @@ class AmountInput(NumberInput): return str(int(100 * float(val))) if val else val +class AutocompleteModelSelect(Select): + template_name = "member/autocomplete_model.html" + + def __init__(self, model, attrs=None, choices=()): + super().__init__(attrs, choices) + + self.model = model + self.model_pk = None + + class Media: + """JS/CSS resources needed to render the date-picker calendar.""" + + js = ('js/autocomplete_model.js', ) + + def format_value(self, value): + if value: + self.attrs["model_pk"] = int(value) + return str(self.model.objects.get(pk=int(value))) + return "" + + def value_from_datadict(self, data, files, name): + val = super().value_from_datadict(data, files, name) + print(data) + print(self.attrs) + return val + + +""" +The remaining of this file comes from the project `django-bootstrap-datepicker-plus` available on Github: +https://github.com/monim67/django-bootstrap-datepicker-plus +This is distributed under Apache License 2.0. + +This adds datetime pickers with bootstrap. +""" + +"""Contains Base Date-Picker input class for widgets of this package.""" + + class DatePickerDictionary: """Keeps track of all date-picker input classes.""" diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index bdd4d9a3..61e5ea51 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -52,9 +52,6 @@ INSTALLED_APPS = [ # API 'rest_framework', 'rest_framework.authtoken', - # Autocomplete - 'dal', - 'dal_select2', # Note apps 'activity', diff --git a/requirements/base.txt b/requirements/base.txt index 6c5fbc4c..9c978ed0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -3,7 +3,6 @@ chardet==3.0.4 defusedxml==0.6.0 Django~=2.2 django-allauth==0.39.1 -django-autocomplete-light==3.5.1 django-crispy-forms==1.7.2 django-extensions==2.1.9 django-filter==2.2.0 diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js new file mode 100644 index 00000000..e2a3f0cb --- /dev/null +++ b/static/js/autocomplete_model.js @@ -0,0 +1,34 @@ +$(document).ready(function () { + $(".autocomplete").keyup(function(e) { + let target = $("#" + e.target.id); + let prefix = target.attr("id"); + let api_url = target.attr("api_url"); + let api_url_suffix = target.attr("api_url_suffix"); + if (!api_url_suffix) + api_url_suffix = ""; + let name_field = target.attr("name_field"); + if (!name_field) + name_field = "name"; + let input = target.val(); + + $.getJSON(api_url + "?format=json&search=^" + input + api_url_suffix, function(objects) { + let html = ""; + + objects.results.forEach(function (obj) { + html += li(prefix + "_" + obj.id, obj[name_field]); + }); + + $("#" + prefix + "_list").html(html); + + objects.results.forEach(function (obj) { + $("#" + prefix + "_" + obj.id).click(function() { + target.val(obj[name_field]); + $("#" + prefix + "_pk").val(obj.id); + }); + + if (input === obj[name_field]) + $("#" + prefix + "_pk").val(obj.id); + }); + }); + }); +}); \ No newline at end of file diff --git a/templates/member/autocomplete_model.html b/templates/member/autocomplete_model.html new file mode 100644 index 00000000..c45f13c7 --- /dev/null +++ b/templates/member/autocomplete_model.html @@ -0,0 +1,9 @@ + + +
      +
    diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 539d9867..1c8e8661 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -13,8 +13,10 @@
    {% trans 'name'|capfirst %}
    {{ club.name}}
    -
    {% trans 'Club Parent'|capfirst %}
    -
    {{ club.parent_club.name}}
    + {% if club.parent_club %} +
    {% trans 'Club Parent'|capfirst %}
    +
    {{ club.parent_club.name}}
    + {% endif %}
    {% trans 'membership start'|capfirst %}
    {{ club.membership_start }}
    From 4f4bbf6d0e6b5c98ffbb2f6b6ad6d0f4ade3d609 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 16:32:46 +0100 Subject: [PATCH 07/21] Fix server starting --- apps/note/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/note/forms.py b/apps/note/forms.py index d819644f..43c7b395 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -35,7 +35,9 @@ class TransactionTemplateForm(forms.ModelForm): NoteClub, attrs={ 'api_url': '/api/note/note/', - 'api_url_suffix': '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk), + # We don't evaluate the content type at launch because the DB might be not initialized + 'api_url_suffix': + lambda value: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk), 'placeholder': 'Note ...', }, ), From ceb5690838660f5d69a916c0b9943c485573da1b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 18:02:22 +0100 Subject: [PATCH 08/21] Invite people --- apps/activity/forms.py | 30 ++++++++++++++++++- apps/activity/models.py | 33 +++++++++++++++++--- apps/activity/tables.py | 40 +++++++++++++++++++++++++ apps/activity/urls.py | 1 + apps/activity/views.py | 13 ++++++-- apps/member/forms.py | 1 - apps/note/urls.py | 1 - note_kfet/inputs.py | 6 ---- templates/activity/activity_invite.html | 15 ++++++++++ 9 files changed, 125 insertions(+), 15 deletions(-) create mode 100644 apps/activity/tables.py create mode 100644 templates/activity/activity_invite.html diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 081f611c..6ef8a278 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -2,10 +2,13 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django import forms -from activity.models import Activity +from django.contrib.contenttypes.models import ContentType from member.models import Club +from note.models import NoteUser from note_kfet.inputs import DateTimePickerInput, AutocompleteModelSelect +from .models import Activity, Guest + class ActivityForm(forms.ModelForm): class Meta: @@ -23,3 +26,28 @@ class ActivityForm(forms.ModelForm): "date_start": DateTimePickerInput(), "date_end": DateTimePickerInput(), } + + +class GuestForm(forms.ModelForm): + def clean(self, **kwargs): + cleaned_data = super().clean() + + self.instance.activity = cleaned_data["activity"] = Activity.objects.get(pk=1) + + return cleaned_data + + class Meta: + model = Guest + fields = ('last_name', 'first_name', 'inviter', ) + widgets = { + "inviter": AutocompleteModelSelect( + NoteUser, + attrs={ + 'api_url': '/api/note/note/', + # We don't evaluate the content type at launch because the DB might be not initialized + 'api_url_suffix': + lambda value: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteUser).pk), + 'placeholder': 'Note ...', + }, + ), + } diff --git a/apps/activity/models.py b/apps/activity/models.py index 8f23060c..7151a2a0 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,9 +1,9 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from django.conf import settings from django.db import models from django.utils.translation import gettext_lazy as _ +from note.models import NoteUser class ActivityType(models.Model): @@ -77,6 +77,18 @@ class Activity(models.Model): verbose_name_plural = _("activities") +class Entry(models.Model): + time = models.DateTimeField( + verbose_name=_("entry time"), + ) + + note = models.ForeignKey( + NoteUser, + on_delete=models.PROTECT, + verbose_name=_("note"), + ) + + class Guest(models.Model): """ People who are not current members of any clubs, and are invited by someone who is a current member. @@ -86,17 +98,30 @@ class Guest(models.Model): on_delete=models.PROTECT, related_name='+', ) - name = models.CharField( + + last_name = models.CharField( max_length=255, + verbose_name=_("last name"), ) + + first_name = models.CharField( + max_length=255, + verbose_name=_("first name"), + ) + inviter = models.ForeignKey( - settings.AUTH_USER_MODEL, + NoteUser, on_delete=models.PROTECT, related_name='+', + verbose_name=_("inviter"), ) - entry = models.DateTimeField( + + entry = models.OneToOneField( + Entry, + on_delete=models.PROTECT, null=True, ) + entry_transaction = models.ForeignKey( 'note.Transaction', on_delete=models.PROTECT, diff --git a/apps/activity/tables.py b/apps/activity/tables.py new file mode 100644 index 00000000..44939bc4 --- /dev/null +++ b/apps/activity/tables.py @@ -0,0 +1,40 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.utils.translation import gettext_lazy as _ +from django_tables2 import tables, A + +from .models import Activity, Guest + + +class ActivityTable(tables.Table): + name = tables.columns.LinkColumn('activity:activity_detail', + args=[A('pk'), ],) + + invite = tables.columns.LinkColumn('activity:activity_invite', + args=[A('pk'), ], + verbose_name=_("Invite"), + text=_("Invite"),) + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = Activity + template_name = 'django_tables2/bootstrap4.html' + fields = ('name', 'activity_type', 'organizer', 'attendees_club', 'date_start', 'date_end', 'invite', ) + + +class GuestTable(tables.Table): + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = Guest + template_name = 'django_tables2/bootstrap4.html' + fields = ('name', 'inviter', ) + row_attrs = { + 'class': 'table-row', + 'id': lambda record: "row-" + str(record.pk), + 'data-href': lambda record: record.pk + } diff --git a/apps/activity/urls.py b/apps/activity/urls.py index fc0b4850..006dcce3 100644 --- a/apps/activity/urls.py +++ b/apps/activity/urls.py @@ -10,6 +10,7 @@ app_name = 'activity' urlpatterns = [ path('', views.ActivityListView.as_view(), name='activity_list'), path('/', views.ActivityDetailView.as_view(), name='activity_detail'), + path('/invite/', views.ActivityInviteView.as_view(), name='activity_invite'), path('/entry/', views.ActivityEntryView.as_view(), name='activity_entry'), path('/update/', views.ActivityUpdateView.as_view(), name='activity_update'), path('new/', views.ActivityCreateView.as_view(), name='activity_create'), diff --git a/apps/activity/views.py b/apps/activity/views.py index be3db16d..03fa793f 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -7,8 +7,9 @@ from django.views.generic import CreateView, DetailView, UpdateView, TemplateVie from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView -from .forms import ActivityForm -from .models import Activity +from .forms import ActivityForm, GuestForm +from .models import Activity, Guest +from .tables import ActivityTable class ActivityCreateView(LoginRequiredMixin, CreateView): @@ -19,6 +20,7 @@ class ActivityCreateView(LoginRequiredMixin, CreateView): class ActivityListView(LoginRequiredMixin, SingleTableView): model = Activity + table_class = ActivityTable def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) @@ -38,5 +40,12 @@ class ActivityUpdateView(LoginRequiredMixin, UpdateView): success_url = reverse_lazy('activity:activity_list') +class ActivityInviteView(LoginRequiredMixin, CreateView): + model = Guest + form_class = GuestForm + success_url = reverse_lazy('activity:activity_list') + template_name = "activity/activity_invite.html" + + class ActivityEntryView(LoginRequiredMixin, TemplateView): pass diff --git a/apps/member/forms.py b/apps/member/forms.py index 52dde34a..76cd146b 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -7,7 +7,6 @@ from crispy_forms.layout import Layout from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User - from note_kfet.inputs import AutocompleteModelSelect from permission.models import PermissionMask diff --git a/apps/note/urls.py b/apps/note/urls.py index 1bc12b4d..9d6af317 100644 --- a/apps/note/urls.py +++ b/apps/note/urls.py @@ -4,7 +4,6 @@ from django.urls import path from . import views -from .models import Note app_name = 'note' urlpatterns = [ diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index 35b8b605..e012c1c2 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -40,12 +40,6 @@ class AutocompleteModelSelect(Select): return str(self.model.objects.get(pk=int(value))) return "" - def value_from_datadict(self, data, files, name): - val = super().value_from_datadict(data, files, name) - print(data) - print(self.attrs) - return val - """ The remaining of this file comes from the project `django-bootstrap-datepicker-plus` available on Github: diff --git a/templates/activity/activity_invite.html b/templates/activity/activity_invite.html new file mode 100644 index 00000000..8bdb1965 --- /dev/null +++ b/templates/activity/activity_invite.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load render_table from django_tables2 %} +{% load i18n crispy_forms_tags %} +{% block content %} + + {% csrf_token %} + {{ form|crispy }} + + +{% endblock %} + +{% block extrajavascript %} + +{% endblock %} From 34949f0859b0416997073ddff67209e774a3f018 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 19:16:38 +0100 Subject: [PATCH 09/21] Fix activity in Guest model --- apps/activity/forms.py | 7 ------- apps/activity/urls.py | 2 +- apps/activity/views.py | 8 +++++++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 6ef8a278..1602eb63 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -29,13 +29,6 @@ class ActivityForm(forms.ModelForm): class GuestForm(forms.ModelForm): - def clean(self, **kwargs): - cleaned_data = super().clean() - - self.instance.activity = cleaned_data["activity"] = Activity.objects.get(pk=1) - - return cleaned_data - class Meta: model = Guest fields = ('last_name', 'first_name', 'inviter', ) diff --git a/apps/activity/urls.py b/apps/activity/urls.py index 006dcce3..f074e8f7 100644 --- a/apps/activity/urls.py +++ b/apps/activity/urls.py @@ -10,7 +10,7 @@ app_name = 'activity' urlpatterns = [ path('', views.ActivityListView.as_view(), name='activity_list'), path('/', views.ActivityDetailView.as_view(), name='activity_detail'), - path('/invite/', views.ActivityInviteView.as_view(), name='activity_invite'), + path('/invite/', views.ActivityInviteView.as_view(), name='activity_invite'), path('/entry/', views.ActivityEntryView.as_view(), name='activity_entry'), path('/update/', views.ActivityUpdateView.as_view(), name='activity_update'), path('new/', views.ActivityCreateView.as_view(), name='activity_create'), diff --git a/apps/activity/views.py b/apps/activity/views.py index 03fa793f..10e073f0 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -43,9 +43,15 @@ class ActivityUpdateView(LoginRequiredMixin, UpdateView): class ActivityInviteView(LoginRequiredMixin, CreateView): model = Guest form_class = GuestForm - success_url = reverse_lazy('activity:activity_list') template_name = "activity/activity_invite.html" + def form_valid(self, form): + form.instance.activity = Activity.objects.get(pk=self.kwargs["pk"]) + return super().form_valid(form) + + def get_success_url(self, **kwargs): + return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) + class ActivityEntryView(LoginRequiredMixin, TemplateView): pass From 0d43d74c6085d66b0c0f2de1100b4eaf42b4b24e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 19:47:43 +0100 Subject: [PATCH 10/21] Display activity details --- apps/activity/views.py | 1 + templates/activity/activity_detail.html | 50 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 templates/activity/activity_detail.html diff --git a/apps/activity/views.py b/apps/activity/views.py index 10e073f0..952ea59c 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -32,6 +32,7 @@ class ActivityListView(LoginRequiredMixin, SingleTableView): class ActivityDetailView(LoginRequiredMixin, DetailView): model = Activity + context_object_name = "activity" class ActivityUpdateView(LoginRequiredMixin, UpdateView): diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html new file mode 100644 index 00000000..bd946643 --- /dev/null +++ b/templates/activity/activity_detail.html @@ -0,0 +1,50 @@ +{% extends "base.html" %} +{% load static %} +{% load i18n %} +{% load render_table from django_tables2 %} +{% load pretty_money %} + +{% block content %} + +
    +
    +

    {{ activity.name }}

    +
    +
    +
    +
    {% trans 'description'|capfirst %}
    +
    {{ activity.description }}
    + +
    {% trans 'type'|capfirst %}
    +
    {{ activity.activity_type }}
    + +
    {% trans 'start date'|capfirst %}
    +
    {{ activity.date_start }}
    + +
    {% trans 'end date'|capfirst %}
    +
    {{ activity.date_end }}
    + +
    {% trans 'organizer'|capfirst %}
    +
    {{ activity.organizer }}
    + +
    {% trans 'attendees club'|capfirst %}
    +
    {{ activity.attendees_club }}
    + +
    {% trans 'can invite'|capfirst %}
    +
    {{ activity.activity_type.can_invite|yesno }}
    + + {% if activity.activity_type.can_invite %} +
    {% trans 'guest entry fee'|capfirst %}
    +
    {{ activity.activity_type.guest_entry_fee|pretty_money }}
    + {% endif %} +
    +
    + +
    + {% if activity.activity_type.can_invite %} + {% trans "Invite" %} + {% endif %} +
    +
    + +{% endblock %} From d6e202a26f78f59cd4b26d91b6406b409ee96b36 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 21:18:27 +0100 Subject: [PATCH 11/21] Display guests list --- apps/activity/tables.py | 43 ++++++++---- apps/activity/views.py | 20 +++++- apps/permission/templatetags/perms.py | 7 ++ templates/activity/activity_detail.html | 91 +++++++++++++++++-------- 4 files changed, 113 insertions(+), 48 deletions(-) diff --git a/apps/activity/tables.py b/apps/activity/tables.py index 44939bc4..95f43e51 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -2,19 +2,17 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.utils.translation import gettext_lazy as _ -from django_tables2 import tables, A +import django_tables2 as tables +from django_tables2 import A from .models import Activity, Guest class ActivityTable(tables.Table): - name = tables.columns.LinkColumn('activity:activity_detail', - args=[A('pk'), ],) - - invite = tables.columns.LinkColumn('activity:activity_invite', - args=[A('pk'), ], - verbose_name=_("Invite"), - text=_("Invite"),) + name = tables.LinkColumn( + 'activity:activity_detail', + args=[A('pk'), ], + ) class Meta: attrs = { @@ -22,19 +20,34 @@ class ActivityTable(tables.Table): } model = Activity template_name = 'django_tables2/bootstrap4.html' - fields = ('name', 'activity_type', 'organizer', 'attendees_club', 'date_start', 'date_end', 'invite', ) + fields = ('name', 'activity_type', 'organizer', 'attendees_club', 'date_start', 'date_end', ) class GuestTable(tables.Table): + inviter = tables.LinkColumn( + 'member:user_detail', + args=[A('inviter.user.pk'), ], + ) + + entry = tables.Column( + empty_values=(), + attrs={ + "td": { + "class": lambda record: "" if record.entry else "validate btn btn-danger", + "onclick": lambda record: "" if record.entry else "remove_guest(" + str(record.pk) + ")" + } + } + ) + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' } model = Guest template_name = 'django_tables2/bootstrap4.html' - fields = ('name', 'inviter', ) - row_attrs = { - 'class': 'table-row', - 'id': lambda record: "row-" + str(record.pk), - 'data-href': lambda record: record.pk - } + fields = ("last_name", "first_name", "inviter", ) + + def render_entry(self, record): + if record.entry: + return str(record.date) + return _("remove").capitalize() diff --git a/apps/activity/views.py b/apps/activity/views.py index 952ea59c..38e487e0 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -7,15 +7,18 @@ from django.views.generic import CreateView, DetailView, UpdateView, TemplateVie from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView +from permission.backends import PermissionBackend from .forms import ActivityForm, GuestForm from .models import Activity, Guest -from .tables import ActivityTable +from .tables import ActivityTable, GuestTable class ActivityCreateView(LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm - success_url = reverse_lazy('activity:activity_list') + + def get_success_url(self, **kwargs): + return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) class ActivityListView(LoginRequiredMixin, SingleTableView): @@ -34,11 +37,22 @@ class ActivityDetailView(LoginRequiredMixin, DetailView): model = Activity context_object_name = "activity" + def get_context_data(self, **kwargs): + ctx = super().get_context_data() + + table = GuestTable(data=Guest.objects.filter(activity=self.object) + .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))) + ctx["guests"] = table + + return ctx + class ActivityUpdateView(LoginRequiredMixin, UpdateView): model = Activity form_class = ActivityForm - success_url = reverse_lazy('activity:activity_list') + + def get_success_url(self, **kwargs): + return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) class ActivityInviteView(LoginRequiredMixin, CreateView): diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index 8bcd3597..f1ecfacb 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -48,6 +48,13 @@ def not_empty_model_change_list(model_name): return session.get("not_empty_model_change_list_" + model_name) == 1 +def has_perm(t, obj, field=None): + print(t) + perm = "." + t + ("__" + field if field else "_") + return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) + + register = template.Library() register.filter('not_empty_model_list', not_empty_model_list) register.filter('not_empty_model_change_list', not_empty_model_change_list) +register.filter('has_perm', has_perm) diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index bd946643..339d087b 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -3,48 +3,79 @@ {% load i18n %} {% load render_table from django_tables2 %} {% load pretty_money %} +{% load perms %} {% block content %} -
    -
    -

    {{ activity.name }}

    -
    -
    -
    -
    {% trans 'description'|capfirst %}
    -
    {{ activity.description }}
    +
    +
    +

    {{ activity.name }}

    +
    +
    +
    +
    {% trans 'description'|capfirst %}
    +
    {{ activity.description }}
    -
    {% trans 'type'|capfirst %}
    -
    {{ activity.activity_type }}
    +
    {% trans 'type'|capfirst %}
    +
    {{ activity.activity_type }}
    -
    {% trans 'start date'|capfirst %}
    -
    {{ activity.date_start }}
    +
    {% trans 'start date'|capfirst %}
    +
    {{ activity.date_start }}
    -
    {% trans 'end date'|capfirst %}
    -
    {{ activity.date_end }}
    +
    {% trans 'end date'|capfirst %}
    +
    {{ activity.date_end }}
    -
    {% trans 'organizer'|capfirst %}
    -
    {{ activity.organizer }}
    +
    {% trans 'organizer'|capfirst %}
    +
    {{ activity.organizer }}
    -
    {% trans 'attendees club'|capfirst %}
    -
    {{ activity.attendees_club }}
    +
    {% trans 'attendees club'|capfirst %}
    +
    {{ activity.attendees_club }}
    -
    {% trans 'can invite'|capfirst %}
    -
    {{ activity.activity_type.can_invite|yesno }}
    +
    {% trans 'can invite'|capfirst %}
    +
    {{ activity.activity_type.can_invite|yesno }}
    - {% if activity.activity_type.can_invite %} -
    {% trans 'guest entry fee'|capfirst %}
    -
    {{ activity.activity_type.guest_entry_fee|pretty_money }}
    + {% if activity.activity_type.can_invite %} +
    {% trans 'guest entry fee'|capfirst %}
    +
    {{ activity.activity_type.guest_entry_fee|pretty_money }}
    + {% endif %} +
    +
    + +
    + {% if "view"|has_perm:activity %} + {% trans "edit"|capfirst %} {% endif %} -
    + {% if activity.activity_type.can_invite %} + {% trans "Invite" %} + {% endif %} +
    -
    - {% if activity.activity_type.can_invite %} - {% trans "Invite" %} - {% endif %} -
    -
    + {% if guests.data %} +
    +

    {% trans "Guests list" %}

    +
    + {% render_table guests %} +
    + {% endif %} {% endblock %} + +{% block extrajavascript %} + +{% endblock %} From 8c1d902c30ea99b440ea6b5cfea12bdb3705b974 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 27 Mar 2020 22:48:20 +0100 Subject: [PATCH 12/21] Open and validate activities --- apps/activity/forms.py | 13 ++++-- apps/activity/models.py | 45 +++++++++++++++++---- apps/note/forms.py | 2 +- apps/permission/templatetags/perms.py | 4 +- static/js/base.js | 22 +++++++++- templates/activity/activity_detail.html | 53 ++++++++++++++++++++++++- 6 files changed, 121 insertions(+), 18 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 1602eb63..7fafd15e 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -4,7 +4,7 @@ from django import forms from django.contrib.contenttypes.models import ContentType from member.models import Club -from note.models import NoteUser +from note.models import NoteUser, Note from note_kfet.inputs import DateTimePickerInput, AutocompleteModelSelect from .models import Activity, Guest @@ -13,12 +13,19 @@ from .models import Activity, Guest class ActivityForm(forms.ModelForm): class Meta: model = Activity - fields = '__all__' + exclude = ('valid', 'open', ) widgets = { "organizer": AutocompleteModelSelect( model=Club, attrs={"api_url": "/api/members/club/"}, ), + "note": AutocompleteModelSelect( + model=Note, + attrs={ + "api_url": "/api/note/note/", + 'placeholder': 'Note de l\'événement sur laquelle envoyer les crédits d\'invitation ...' + }, + ), "attendees_club": AutocompleteModelSelect( model=Club, attrs={"api_url": "/api/members/club/"}, @@ -39,7 +46,7 @@ class GuestForm(forms.ModelForm): 'api_url': '/api/note/note/', # We don't evaluate the content type at launch because the DB might be not initialized 'api_url_suffix': - lambda value: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteUser).pk), + lambda: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteUser).pk), 'placeholder': 'Note ...', }, ), diff --git a/apps/activity/models.py b/apps/activity/models.py index 7151a2a0..4bf92e23 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -3,7 +3,7 @@ from django.db import models from django.utils.translation import gettext_lazy as _ -from note.models import NoteUser +from note.models import NoteUser, Transaction class ActivityType(models.Model): @@ -44,34 +44,59 @@ class Activity(models.Model): verbose_name=_('name'), max_length=255, ) + description = models.TextField( verbose_name=_('description'), ) + activity_type = models.ForeignKey( ActivityType, on_delete=models.PROTECT, related_name='+', verbose_name=_('type'), ) + organizer = models.ForeignKey( 'member.Club', on_delete=models.PROTECT, related_name='+', verbose_name=_('organizer'), ) + + note = models.ForeignKey( + 'note.Note', + on_delete=models.PROTECT, + related_name='+', + null=True, + blank=True, + verbose_name=_('note'), + ) + attendees_club = models.ForeignKey( 'member.Club', on_delete=models.PROTECT, related_name='+', verbose_name=_('attendees club'), ) + date_start = models.DateTimeField( verbose_name=_('start date'), ) + date_end = models.DateTimeField( verbose_name=_('end date'), ) + valid = models.BooleanField( + default=False, + verbose_name=_('valid'), + ) + + open = models.BooleanField( + default=False, + verbose_name=_('open'), + ) + class Meta: verbose_name = _("activity") verbose_name_plural = _("activities") @@ -122,13 +147,17 @@ class Guest(models.Model): null=True, ) - entry_transaction = models.ForeignKey( - 'note.Transaction', - on_delete=models.PROTECT, - blank=True, - null=True, - ) - class Meta: verbose_name = _("guest") verbose_name_plural = _("guests") + + +class GuestTransaction(Transaction): + guest = models.OneToOneField( + Guest, + on_delete=models.PROTECT, + ) + + @property + def type(self): + return _('Invitation') diff --git a/apps/note/forms.py b/apps/note/forms.py index 43c7b395..8c9a04ce 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -37,7 +37,7 @@ class TransactionTemplateForm(forms.ModelForm): 'api_url': '/api/note/note/', # We don't evaluate the content type at launch because the DB might be not initialized 'api_url_suffix': - lambda value: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk), + lambda: '&polymorphic_ctype=' + str(ContentType.objects.get_for_model(NoteClub).pk), 'placeholder': 'Note ...', }, ), diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index f1ecfacb..aa2feeca 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -48,9 +48,7 @@ def not_empty_model_change_list(model_name): return session.get("not_empty_model_change_list_" + model_name) == 1 -def has_perm(t, obj, field=None): - print(t) - perm = "." + t + ("__" + field if field else "_") +def has_perm(perm, obj): return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) diff --git a/static/js/base.js b/static/js/base.js index d21bd433..22d1366a 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -28,15 +28,35 @@ function addMsg(msg, alert_type) { + msg + "
    \n"; msgDiv.html(html); } + /** * add Muliple error message from err_obj - * @param err_obj {error_code:erro_message} + * @param errs_obj [{error_code:erro_message}] */ function errMsg(errs_obj){ for (const err_msg of Object.values(errs_obj)) { addMsg(err_msg,'danger'); } } + +var reloadWithTurbolinks = (function () { + var scrollPosition; + + function reload () { + scrollPosition = [window.scrollX, window.scrollY]; + Turbolinks.visit(window.location.toString(), { action: 'replace' }) + } + + document.addEventListener('turbolinks:load', function () { + if (scrollPosition) { + window.scrollTo.apply(window, scrollPosition); + scrollPosition = null + } + }); + + return reload; +})(); + /** * Reload the balance of the user on the right top corner */ diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 339d087b..184cc6cd 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -7,7 +7,7 @@ {% block content %} -
    +

    {{ activity.name }}

    @@ -38,11 +38,23 @@
    {% trans 'guest entry fee'|capfirst %}
    {{ activity.activity_type.guest_entry_fee|pretty_money }}
    {% endif %} + +
    {% trans 'valid'|capfirst %}
    +
    {{ activity.valid|yesno }}
    + +
    {% trans 'opened'|capfirst %}
    +
    {{ activity.open|yesno }}
    - {% if "view"|has_perm:activity %} + {% if activity.valid and "change__open"|has_perm:activity %} + {% if activity.open %}{% trans "close"|capfirst %}{% else %}{% trans "open"|capfirst %}{% endif %} + {% endif %} + {% if not activity.open and "change__valid"|has_perm:activity %} + {% if activity.valid %}{% trans "invalidate"|capfirst %}{% else %}{% trans "validate"|capfirst %}{% endif %} + {% endif %} + {% if "view_"|has_perm:activity %} {% trans "edit"|capfirst %} {% endif %} {% if activity.activity_type.can_invite %} @@ -77,5 +89,42 @@ errMsg(xhr.responseJSON); }); } + + $("#open_activity").click(function() { + $.ajax({ + url: "/api/activity/activity/{{ activity.pk }}/", + type: "PATCH", + dataType: "json", + headers: { + "X-CSRFTOKEN": CSRF_TOKEN + }, + data: { + open: {{ activity.open|yesno:'false,true' }} + } + }).done(function () { + reloadWithTurbolinks(); + }).fail(function (xhr) { + errMsg(xhr.responseJSON); + }); + }); + + $("#validate_activity").click(function () { + console.log(42); + $.ajax({ + url: "/api/activity/activity/{{ activity.pk }}/", + type: "PATCH", + dataType: "json", + headers: { + "X-CSRFTOKEN": CSRF_TOKEN + }, + data: { + valid: {{ activity.valid|yesno:'false,true' }} + } + }).done(function () { + reloadWithTurbolinks(); + }).fail(function (xhr) { + errMsg(xhr.responseJSON); + }); + }); {% endblock %} From a8422411bc1baac4e4595920964ce60ad85666fc Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 01:45:13 +0100 Subject: [PATCH 13/21] Entry page (we can search people) --- apps/activity/api/views.py | 2 +- apps/activity/tables.py | 36 +++++++++++++++- apps/activity/views.py | 56 +++++++++++++++++++++++-- templates/activity/activity_detail.html | 4 ++ templates/activity/activity_entry.html | 30 +++++++++++++ 5 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 templates/activity/activity_entry.html diff --git a/apps/activity/api/views.py b/apps/activity/api/views.py index 76b2b333..9d106ee5 100644 --- a/apps/activity/api/views.py +++ b/apps/activity/api/views.py @@ -42,4 +42,4 @@ class GuestViewSet(ReadProtectedModelViewSet): queryset = Guest.objects.all() serializer_class = GuestSerializer filter_backends = [SearchFilter] - search_fields = ['$name', ] + search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ] diff --git a/apps/activity/tables.py b/apps/activity/tables.py index 95f43e51..e4de1e4e 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -1,10 +1,11 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later - +from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ import django_tables2 as tables from django_tables2 import A +from note.templatetags.pretty_money import pretty_money from .models import Activity, Guest @@ -51,3 +52,36 @@ class GuestTable(tables.Table): if record.entry: return str(record.date) return _("remove").capitalize() + + +class EntryTable(tables.Table): + type = tables.Column() + + last_name = tables.Column() + + first_name = tables.Column() + + note_name = tables.Column() + + balance = tables.Column() + + def render_note_name(self, value, record): + if hasattr(record, 'username'): + username = record.username + if username != value: + return format_html(value + " aka. " + username) + return value + + def render_balance(self, value): + return pretty_money(value) + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + template_name = 'django_tables2/bootstrap4.html' + row_attrs = { + 'class': 'table-row', + 'id': lambda record: "row-" + str(record.type), + 'data-href': lambda record: record.type + } diff --git a/apps/activity/views.py b/apps/activity/views.py index 38e487e0..01b0e7f8 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -2,15 +2,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.contenttypes.models import ContentType +from django.db.models import F, Q from django.urls import reverse_lazy from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView - +from note.models import NoteUser, Alias from permission.backends import PermissionBackend + from .forms import ActivityForm, GuestForm from .models import Activity, Guest -from .tables import ActivityTable, GuestTable +from .tables import ActivityTable, GuestTable, EntryTable class ActivityCreateView(LoginRequiredMixin, CreateView): @@ -69,4 +72,51 @@ class ActivityInviteView(LoginRequiredMixin, CreateView): class ActivityEntryView(LoginRequiredMixin, TemplateView): - pass + template_name = "activity/activity_entry.html" + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + activity = Activity.objects.get(pk=self.kwargs["pk"]) + ctx["activity"] = activity + + matched = [] + + pattern = "^$" + if "search" in self.request.GET: + pattern = self.request.GET["search"] + + print(pattern) + + guest_qs = Guest.objects\ + .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\ + .filter(Q(first_name__regex=pattern) | Q(last_name__regex=pattern) + | Q(inviter__alias__name__regex=pattern) + | Q(inviter__alias__normalized_name__startswith=Alias.normalize(pattern)))\ + .distinct()[:20] + for guest in guest_qs: + guest.type = "Invité" + matched.append(guest) + + note_qs = Alias.objects.annotate(last_name=F("note__noteuser__user__last_name"), + first_name=F("note__noteuser__user__first_name"), + username=F("note__noteuser__user__username"), + note_name=F("name"), + balance=F("note__balance"))\ + .filter(Q(note__polymorphic_ctype__model="noteuser") + & (Q(note__noteuser__user__first_name__regex=pattern) + | Q(note__noteuser__user__last_name__regex=pattern) + | Q(name__regex="^" + pattern) + | Q(normalized_name__startswith=Alias.normalize(pattern))))\ + .distinct()[:20] + for note in note_qs: + note.type = "Adhérent" + matched.append(note) + + table = EntryTable(data=matched) + ctx["table"] = table + + ctx["title"] = _('Entry for activity "{}"').format(activity.name) + ctx["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk + + return ctx diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 184cc6cd..b663e52d 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -48,6 +48,10 @@
    + {% if activity.open %} + {% trans "Entry page" %} + {% endif %} + {% if activity.valid and "change__open"|has_perm:activity %} {% if activity.open %}{% trans "close"|capfirst %}{% else %}{% trans "open"|capfirst %}{% endif %} {% endif %} diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html new file mode 100644 index 00000000..e09d0e8f --- /dev/null +++ b/templates/activity/activity_entry.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% load static %} +{% load i18n %} +{% load render_table from django_tables2 %} +{% load pretty_money %} +{% load perms %} + +{% block content %} + + +
    + {% render_table table %} +
    +{% endblock %} + +{% block extrajavascript %} + +{% endblock %} From 08ed694438279a73ce39da102ec0bddb40808859 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 02:08:29 +0100 Subject: [PATCH 14/21] Update translations --- apps/activity/tables.py | 10 +- locale/de/LC_MESSAGES/django.po | 434 +++++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 471 +++++++++++++++++++------------- 3 files changed, 548 insertions(+), 367 deletions(-) diff --git a/apps/activity/tables.py b/apps/activity/tables.py index e4de1e4e..a37f365d 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -55,15 +55,15 @@ class GuestTable(tables.Table): class EntryTable(tables.Table): - type = tables.Column() + type = tables.Column(verbose_name=_("Type")) - last_name = tables.Column() + last_name = tables.Column(verbose_name=_("Last name")) - first_name = tables.Column() + first_name = tables.Column(verbose_name=_("First name")) - note_name = tables.Column() + note_name = tables.Column(verbose_name=_("Note")) - balance = tables.Column() + balance = tables.Column(verbose_name=_("Balance")) def render_note_name(self, value, record): if hasattr(record, 'username'): diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c9eda5aa..70c85682 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-26 14:40+0100\n" +"POT-Creation-Date: 2020-03-28 01:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:76 +#: apps/activity/apps.py:10 apps/activity/models.py:101 msgid "activity" msgstr "" #: apps/activity/models.py:19 apps/activity/models.py:44 -#: apps/member/models.py:63 apps/member/models.py:114 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25 -#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:232 -#: templates/member/profile_detail.html:15 +#: apps/member/models.py:64 apps/member/models.py:122 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "" -#: apps/activity/models.py:23 +#: apps/activity/models.py:23 templates/activity/activity_detail.html:34 msgid "can invite" msgstr "" -#: apps/activity/models.py:26 +#: apps/activity/models.py:26 templates/activity/activity_detail.html:38 msgid "guest entry fee" msgstr "" @@ -46,44 +46,91 @@ msgstr "" msgid "activity types" msgstr "" -#: apps/activity/models.py:48 apps/note/models/transactions.py:70 -#: apps/permission/models.py:91 +#: apps/activity/models.py:49 apps/note/models/transactions.py:69 +#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:54 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:63 +#: apps/activity/models.py:56 apps/note/models/notes.py:164 +#: apps/note/models/transactions.py:62 +#: templates/activity/activity_detail.html:19 msgid "type" msgstr "" -#: apps/activity/models.py:60 +#: apps/activity/models.py:63 templates/activity/activity_detail.html:28 msgid "organizer" msgstr "" -#: apps/activity/models.py:66 +#: apps/activity/models.py:72 apps/activity/models.py:113 apps/note/apps.py:14 +#: apps/note/models/notes.py:58 +msgid "note" +msgstr "" + +#: apps/activity/models.py:79 templates/activity/activity_detail.html:31 msgid "attendees club" msgstr "" -#: apps/activity/models.py:69 +#: apps/activity/models.py:83 templates/activity/activity_detail.html:22 msgid "start date" msgstr "" -#: apps/activity/models.py:72 +#: apps/activity/models.py:87 templates/activity/activity_detail.html:25 msgid "end date" msgstr "" -#: apps/activity/models.py:77 +#: apps/activity/models.py:92 apps/note/models/transactions.py:134 +#: templates/activity/activity_detail.html:42 +msgid "valid" +msgstr "" + +#: apps/activity/models.py:97 templates/activity/activity_detail.html:56 +msgid "open" +msgstr "" + +#: apps/activity/models.py:102 msgid "activities" msgstr "" -#: apps/activity/models.py:108 +#: apps/activity/models.py:107 +msgid "entry time" +msgstr "" + +#: apps/activity/models.py:129 +msgid "last name" +msgstr "" + +#: apps/activity/models.py:134 templates/member/profile_info.html:14 +msgid "first name" +msgstr "" + +#: apps/activity/models.py:141 +msgid "inviter" +msgstr "" + +#: apps/activity/models.py:151 msgid "guest" msgstr "" -#: apps/activity/models.py:109 +#: apps/activity/models.py:152 msgid "guests" msgstr "" +#: apps/activity/models.py:163 +msgid "Invitation" +msgstr "" + +#: apps/activity/tables.py:54 +msgid "remove" +msgstr "" + +#: apps/activity/views.py:34 +msgid "Upcoming activities" +msgstr "" + +#: apps/activity/views.py:119 +msgid "Entry for activity \"{}\"" +msgstr "" + #: apps/api/apps.py:10 msgid "API" msgstr "" @@ -120,11 +167,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:147 +#: apps/logs/models.py:61 apps/note/tables.py:142 +#: templates/activity/activity_detail.html:62 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:151 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "" @@ -144,139 +192,130 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/models.py:25 +#: apps/member/models.py:26 msgid "phone number" msgstr "" -#: apps/member/models.py:31 templates/member/profile_detail.html:28 +#: apps/member/models.py:32 templates/member/profile_info.html:27 msgid "section" msgstr "" -#: apps/member/models.py:32 +#: apps/member/models.py:33 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:38 templates/member/profile_detail.html:31 +#: apps/member/models.py:39 templates/member/profile_info.html:30 msgid "address" msgstr "" -#: apps/member/models.py:44 +#: apps/member/models.py:45 msgid "paid" msgstr "" -#: apps/member/models.py:49 apps/member/models.py:50 +#: apps/member/models.py:50 apps/member/models.py:51 msgid "user profile" msgstr "" -#: apps/member/models.py:68 +#: apps/member/models.py:69 templates/member/club_info.html:36 msgid "email" msgstr "" -#: apps/member/models.py:73 +#: apps/member/models.py:76 +msgid "parent club" +msgstr "" + +#: apps/member/models.py:81 templates/member/club_info.html:30 msgid "membership fee" msgstr "" -#: apps/member/models.py:77 +#: apps/member/models.py:85 templates/member/club_info.html:27 msgid "membership duration" msgstr "" -#: apps/member/models.py:78 +#: apps/member/models.py:86 msgid "The longest time a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:83 +#: apps/member/models.py:91 templates/member/club_info.html:21 msgid "membership start" msgstr "" -#: apps/member/models.py:84 +#: apps/member/models.py:92 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:89 +#: apps/member/models.py:97 templates/member/club_info.html:24 msgid "membership end" msgstr "" -#: apps/member/models.py:90 +#: apps/member/models.py:98 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:96 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:97 +#: apps/member/models.py:105 msgid "clubs" msgstr "" -#: apps/member/models.py:120 apps/permission/models.py:276 +#: apps/member/models.py:128 apps/permission/models.py:275 msgid "role" msgstr "" -#: apps/member/models.py:121 +#: apps/member/models.py:129 msgid "roles" msgstr "" -#: apps/member/models.py:145 +#: apps/member/models.py:153 msgid "membership starts on" msgstr "" -#: apps/member/models.py:148 +#: apps/member/models.py:156 msgid "membership ends on" msgstr "" -#: apps/member/models.py:152 +#: apps/member/models.py:160 msgid "fee" msgstr "" -#: apps/member/models.py:162 +#: apps/member/models.py:172 +msgid "User is not a member of the parent club" +msgstr "" + +#: apps/member/models.py:176 msgid "membership" msgstr "" -#: apps/member/models.py:163 +#: apps/member/models.py:177 msgid "memberships" msgstr "" -#: apps/member/views.py:80 templates/member/profile_detail.html:46 +#: apps/member/views.py:76 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:93 +#: apps/member/views.py:89 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:146 -#, python-format -msgid "Account #%(id)s: %(username)s" -msgstr "" - -#: apps/member/views.py:216 -msgid "Alias successfully deleted" -msgstr "" - -#: apps/note/admin.py:120 apps/note/models/transactions.py:95 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" #: apps/note/admin.py:128 apps/note/admin.py:156 -#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:108 +#: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" -#: apps/note/apps.py:14 apps/note/models/notes.py:58 -msgid "note" -msgstr "" - -#: apps/note/forms.py:20 -msgid "New Alias" -msgstr "" - -#: apps/note/forms.py:25 +#: apps/note/forms.py:14 msgid "select an image" msgstr "" -#: apps/note/forms.py:26 +#: apps/note/forms.py:15 msgid "Maximal size: 2MB" msgstr "" @@ -310,7 +349,7 @@ msgstr "" msgid "display image" msgstr "" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:118 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "" @@ -368,7 +407,8 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/profile_detail.html:37 +#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: templates/member/profile_info.html:36 msgid "aliases" msgstr "" @@ -380,106 +420,114 @@ msgstr "" msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:247 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "" -#: apps/note/models/transactions.py:31 +#: apps/note/models/transactions.py:30 msgid "transaction category" msgstr "" -#: apps/note/models/transactions.py:32 +#: apps/note/models/transactions.py:31 msgid "transaction categories" msgstr "" -#: apps/note/models/transactions.py:48 +#: apps/note/models/transactions.py:47 msgid "A template with this name already exist" msgstr "" -#: apps/note/models/transactions.py:57 apps/note/models/transactions.py:126 +#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:125 msgid "amount" msgstr "" -#: apps/note/models/transactions.py:58 +#: apps/note/models/transactions.py:57 msgid "in centimes" msgstr "" -#: apps/note/models/transactions.py:76 +#: apps/note/models/transactions.py:75 msgid "transaction template" msgstr "" -#: apps/note/models/transactions.py:77 +#: apps/note/models/transactions.py:76 msgid "transaction templates" msgstr "" -#: apps/note/models/transactions.py:101 apps/note/models/transactions.py:114 +#: apps/note/models/transactions.py:100 apps/note/models/transactions.py:113 #: apps/note/tables.py:33 apps/note/tables.py:42 msgid "used alias" msgstr "" -#: apps/note/models/transactions.py:122 +#: apps/note/models/transactions.py:121 msgid "quantity" msgstr "" -#: apps/note/models/transactions.py:130 +#: apps/note/models/transactions.py:129 msgid "reason" msgstr "" -#: apps/note/models/transactions.py:135 -msgid "valid" -msgstr "" - -#: apps/note/models/transactions.py:140 apps/note/tables.py:95 +#: apps/note/models/transactions.py:139 apps/note/tables.py:95 msgid "invalidity reason" msgstr "" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:146 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:148 +#: apps/note/models/transactions.py:147 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:202 templates/base.html:83 +#: apps/note/models/transactions.py:201 templates/base.html:84 #: templates/note/transaction_form.html:19 -#: templates/note/transaction_form.html:145 +#: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:188 +#: apps/note/models/transactions.py:221 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:203 +#: apps/note/models/transactions.py:236 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:208 +#: apps/note/models/transactions.py:241 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:230 apps/note/models/transactions.py:235 +#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:264 msgid "membership transactions" msgstr "" -#: apps/note/views.py:39 +#: apps/note/tables.py:57 +msgid "Click to invalidate" +msgstr "" + +#: apps/note/tables.py:57 +msgid "Click to validate" +msgstr "" + +#: apps/note/tables.py:93 +msgid "No reason specified" +msgstr "" + +#: apps/note/views.py:41 msgid "Transfer money" msgstr "" -#: apps/note/views.py:145 templates/base.html:79 +#: apps/note/views.py:102 templates/base.html:79 msgid "Consumptions" msgstr "" @@ -501,41 +549,43 @@ msgstr "" msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/treasury/apps.py:11 templates/base.html:102 +#: apps/treasury/apps.py:12 templates/base.html:99 msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:56 apps/treasury/forms.py:95 +#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: templates/activity/activity_form.html:9 +#: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:10 templates/treasury/invoice_form.html:47 +#: templates/member/club_form.html:9 templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" -#: apps/treasury/forms.py:58 +#: apps/treasury/forms.py:86 msgid "Close" msgstr "" -#: apps/treasury/forms.py:65 +#: apps/treasury/forms.py:95 msgid "Remittance is already closed." msgstr "" -#: apps/treasury/forms.py:70 +#: apps/treasury/forms.py:100 msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:84 +#: apps/treasury/forms.py:120 msgid "Last name" msgstr "" -#: apps/treasury/forms.py:86 templates/note/transaction_form.html:92 +#: apps/treasury/forms.py:122 templates/note/transaction_form.html:92 msgid "First name" msgstr "" -#: apps/treasury/forms.py:88 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 msgid "Bank" msgstr "" -#: apps/treasury/forms.py:90 apps/treasury/tables.py:40 +#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -601,38 +651,38 @@ msgstr "" msgid "Closed" msgstr "" -#: apps/treasury/models.py:159 +#: apps/treasury/models.py:169 msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:178 apps/treasury/tables.py:64 -#: apps/treasury/tables.py:72 templates/treasury/invoice_list.html:13 +#: apps/treasury/models.py:188 apps/treasury/tables.py:76 +#: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 msgid "Remittance" msgstr "" -#: apps/treasury/tables.py:16 +#: apps/treasury/tables.py:19 msgid "Invoice #{:d}" msgstr "" -#: apps/treasury/tables.py:19 templates/treasury/invoice_list.html:10 +#: apps/treasury/tables.py:22 templates/treasury/invoice_list.html:10 #: templates/treasury/remittance_list.html:10 msgid "Invoice" msgstr "" -#: apps/treasury/tables.py:38 +#: apps/treasury/tables.py:45 msgid "Transaction count" msgstr "" -#: apps/treasury/tables.py:43 apps/treasury/tables.py:45 +#: apps/treasury/tables.py:50 apps/treasury/tables.py:52 msgid "View" msgstr "" -#: apps/treasury/tables.py:66 +#: apps/treasury/tables.py:78 msgid "Add" msgstr "" -#: apps/treasury/tables.py:74 +#: apps/treasury/tables.py:86 msgid "Remove" msgstr "" @@ -643,27 +693,59 @@ msgid "" "again unless your session expires or you logout." msgstr "" -#: note_kfet/settings/base.py:151 +#: note_kfet/settings/base.py:152 msgid "German" msgstr "" -#: note_kfet/settings/base.py:152 +#: note_kfet/settings/base.py:153 msgid "English" msgstr "" -#: note_kfet/settings/base.py:153 +#: note_kfet/settings/base.py:154 msgid "French" msgstr "" +#: templates/activity/activity_detail.html:45 +msgid "opened" +msgstr "" + +#: templates/activity/activity_detail.html:52 +msgid "Entry page" +msgstr "" + +#: templates/activity/activity_detail.html:56 +msgid "close" +msgstr "" + +#: templates/activity/activity_detail.html:59 +msgid "invalidate" +msgstr "" + +#: templates/activity/activity_detail.html:59 +msgid "validate" +msgstr "" + +#: templates/activity/activity_detail.html:65 +msgid "Invite" +msgstr "" + +#: templates/activity/activity_detail.html:72 +msgid "Guests list" +msgstr "" + +#: templates/activity/activity_list.html:7 +msgid "New activity" +msgstr "" + #: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "" -#: templates/base.html:87 +#: templates/base.html:89 msgid "Clubs" msgstr "" -#: templates/base.html:92 +#: templates/base.html:94 msgid "Activities" msgstr "" @@ -722,32 +804,48 @@ msgstr "" msgid "Field filters" msgstr "" -#: templates/member/club_detail.html:10 -msgid "Membership starts on" +#: templates/member/alias_update.html:5 +msgid "Add alias" msgstr "" -#: templates/member/club_detail.html:12 -msgid "Membership ends on" +#: templates/member/club_info.html:17 +msgid "Club Parent" msgstr "" -#: templates/member/club_detail.html:14 -msgid "Membership duration" +#: templates/member/club_info.html:41 +msgid "Add member" msgstr "" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:34 -msgid "balance" +#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +msgid "Edit" msgstr "" -#: templates/member/club_detail.html:51 templates/member/profile_detail.html:75 -msgid "Transaction history" +#: templates/member/club_info.html:43 +msgid "Add roles" msgstr "" -#: templates/member/club_form.html:6 -msgid "Clubs list" +#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +msgid "View Profile" msgstr "" #: templates/member/club_list.html:8 -msgid "New club" +msgid "search clubs" +msgstr "" + +#: templates/member/club_list.html:12 +msgid "Créer un club" +msgstr "" + +#: templates/member/club_list.html:19 +msgid "club listing " +msgstr "" + +#: templates/member/club_tables.html:9 +msgid "Member of the Club" +msgstr "" + +#: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +msgid "Transaction history" msgstr "" #: templates/member/manage_auth_tokens.html:16 @@ -762,35 +860,31 @@ msgstr "" msgid "Regenerate token" msgstr "" -#: templates/member/profile_alias.html:10 -msgid "Add alias" +#: templates/member/profile_info.html:5 +msgid "Account #" msgstr "" -#: templates/member/profile_detail.html:15 -msgid "first name" -msgstr "" - -#: templates/member/profile_detail.html:18 +#: templates/member/profile_info.html:17 msgid "username" msgstr "" -#: templates/member/profile_detail.html:21 +#: templates/member/profile_info.html:20 msgid "password" msgstr "" -#: templates/member/profile_detail.html:24 +#: templates/member/profile_info.html:23 msgid "Change password" msgstr "" -#: templates/member/profile_detail.html:42 +#: templates/member/profile_info.html:33 +msgid "balance" +msgstr "" + +#: templates/member/profile_info.html:41 msgid "Manage auth token" msgstr "" -#: templates/member/profile_detail.html:49 -msgid "View Profile" -msgstr "" - -#: templates/member/profile_detail.html:62 +#: templates/member/profile_tables.html:9 msgid "View my memberships" msgstr "" @@ -819,10 +913,6 @@ msgstr "" msgid "Most used buttons" msgstr "" -#: templates/note/conso_form.html:121 -msgid "Edit" -msgstr "" - #: templates/note/conso_form.html:126 msgid "Single consumptions" msgstr "" @@ -831,7 +921,7 @@ msgstr "" msgid "Double consumptions" msgstr "" -#: templates/note/conso_form.html:141 templates/note/transaction_form.html:152 +#: templates/note/conso_form.html:141 templates/note/transaction_form.html:147 msgid "Recent transactions history" msgstr "" @@ -847,37 +937,21 @@ msgstr "" msgid "Transfer type" msgstr "" -#: templates/note/transaction_form.html:86 -msgid "Name" -msgstr "" - -#: templates/note/transaction_form.html:92 -msgid "First name" -msgstr "" - -#: templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "" - #: templates/note/transaction_form.html:111 -#: templates/note/transaction_form.html:169 -#: templates/note/transaction_form.html:176 +#: templates/note/transaction_form.html:164 +#: templates/note/transaction_form.html:171 msgid "Select receivers" msgstr "" -#: templates/note/transaction_form.html:128 -msgid "Amount" -msgstr "" - -#: templates/note/transaction_form.html:138 +#: templates/note/transaction_form.html:133 msgid "Reason" msgstr "" -#: templates/note/transaction_form.html:183 +#: templates/note/transaction_form.html:178 msgid "Credit note" msgstr "" -#: templates/note/transaction_form.html:190 +#: templates/note/transaction_form.html:185 msgid "Debit note" msgstr "" @@ -889,6 +963,10 @@ msgstr "" msgid "search button" msgstr "" +#: templates/note/transactiontemplate_list.html:13 +msgid "New button" +msgstr "" + #: templates/note/transactiontemplate_list.html:20 msgid "buttons listing " msgstr "" @@ -991,11 +1069,11 @@ msgstr "" msgid "Invoices list" msgstr "" -#: templates/treasury/invoice_form.html:42 +#: templates/treasury/invoice_form.html:41 msgid "Add product" msgstr "" -#: templates/treasury/invoice_form.html:43 +#: templates/treasury/invoice_form.html:42 msgid "Remove product" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index ca43d5a4..9c4272c3 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-26 14:40+0100\n" +"POT-Creation-Date: 2020-03-28 01:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,23 +13,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:76 +#: apps/activity/apps.py:10 apps/activity/models.py:101 msgid "activity" msgstr "activité" #: apps/activity/models.py:19 apps/activity/models.py:44 -#: apps/member/models.py:63 apps/member/models.py:114 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25 -#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:232 -#: templates/member/profile_detail.html:15 +#: apps/member/models.py:64 apps/member/models.py:122 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "nom" -#: apps/activity/models.py:23 +#: apps/activity/models.py:23 templates/activity/activity_detail.html:34 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:26 +#: apps/activity/models.py:26 templates/activity/activity_detail.html:38 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" @@ -41,44 +41,91 @@ msgstr "type d'activité" msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:48 apps/note/models/transactions.py:70 -#: apps/permission/models.py:91 +#: apps/activity/models.py:49 apps/note/models/transactions.py:69 +#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:54 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:63 +#: apps/activity/models.py:56 apps/note/models/notes.py:164 +#: apps/note/models/transactions.py:62 +#: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" -#: apps/activity/models.py:60 +#: apps/activity/models.py:63 templates/activity/activity_detail.html:28 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:66 +#: apps/activity/models.py:72 apps/activity/models.py:113 apps/note/apps.py:14 +#: apps/note/models/notes.py:58 +msgid "note" +msgstr "note" + +#: apps/activity/models.py:79 templates/activity/activity_detail.html:31 msgid "attendees club" msgstr "" -#: apps/activity/models.py:69 +#: apps/activity/models.py:83 templates/activity/activity_detail.html:22 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:72 +#: apps/activity/models.py:87 templates/activity/activity_detail.html:25 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:77 +#: apps/activity/models.py:92 apps/note/models/transactions.py:134 +#: templates/activity/activity_detail.html:42 +msgid "valid" +msgstr "valide" + +#: apps/activity/models.py:97 templates/activity/activity_detail.html:56 +msgid "open" +msgstr "" + +#: apps/activity/models.py:102 msgid "activities" msgstr "activités" -#: apps/activity/models.py:108 +#: apps/activity/models.py:107 +msgid "entry time" +msgstr "" + +#: apps/activity/models.py:129 +msgid "last name" +msgstr "nom de famille" + +#: apps/activity/models.py:134 templates/member/profile_info.html:14 +msgid "first name" +msgstr "prénom" + +#: apps/activity/models.py:141 +msgid "inviter" +msgstr "hôte" + +#: apps/activity/models.py:151 msgid "guest" msgstr "invité" -#: apps/activity/models.py:109 +#: apps/activity/models.py:152 msgid "guests" msgstr "invités" +#: apps/activity/models.py:163 +msgid "Invitation" +msgstr "Invitation" + +#: apps/activity/tables.py:54 +msgid "remove" +msgstr "supprimer" + +#: apps/activity/views.py:34 +msgid "Upcoming activities" +msgstr "Activités à venir" + +#: apps/activity/views.py:119 +msgid "Entry for activity \"{}\"" +msgstr "Entrées pour l'activité « {} »" + #: apps/api/apps.py:10 msgid "API" msgstr "" @@ -115,11 +162,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:147 +#: apps/logs/models.py:61 apps/note/tables.py:142 +#: templates/activity/activity_detail.html:62 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:151 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "Supprimer" @@ -139,61 +187,65 @@ msgstr "Les logs ne peuvent pas être détruits." msgid "member" msgstr "adhérent" -#: apps/member/models.py:25 +#: apps/member/models.py:26 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:31 templates/member/profile_detail.html:28 +#: apps/member/models.py:32 templates/member/profile_info.html:27 msgid "section" msgstr "section" -#: apps/member/models.py:32 +#: apps/member/models.py:33 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:38 templates/member/profile_detail.html:31 +#: apps/member/models.py:39 templates/member/profile_info.html:30 msgid "address" msgstr "adresse" -#: apps/member/models.py:44 +#: apps/member/models.py:45 msgid "paid" msgstr "payé" -#: apps/member/models.py:49 apps/member/models.py:50 +#: apps/member/models.py:50 apps/member/models.py:51 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:68 +#: apps/member/models.py:69 templates/member/club_info.html:36 msgid "email" msgstr "courriel" -#: apps/member/models.py:73 +#: apps/member/models.py:76 +msgid "parent club" +msgstr "club parent" + +#: apps/member/models.py:81 templates/member/club_info.html:30 msgid "membership fee" msgstr "cotisation pour adhérer" -#: apps/member/models.py:77 +#: apps/member/models.py:85 templates/member/club_info.html:27 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:78 +#: apps/member/models.py:86 msgid "The longest time a membership can last (NULL = infinite)." msgstr "La durée maximale d'une adhésion (NULL = infinie)." -#: apps/member/models.py:83 +#: apps/member/models.py:91 templates/member/club_info.html:21 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:84 +#: apps/member/models.py:92 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:89 +#: apps/member/models.py:97 templates/member/club_info.html:24 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:90 +#: apps/member/models.py:98 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -201,81 +253,68 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:96 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:97 +#: apps/member/models.py:105 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:120 apps/permission/models.py:276 +#: apps/member/models.py:128 apps/permission/models.py:275 msgid "role" msgstr "rôle" -#: apps/member/models.py:121 +#: apps/member/models.py:129 msgid "roles" msgstr "rôles" -#: apps/member/models.py:145 +#: apps/member/models.py:153 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:148 +#: apps/member/models.py:156 msgid "membership ends on" msgstr "l'adhésion finie le" -#: apps/member/models.py:152 +#: apps/member/models.py:160 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:162 +#: apps/member/models.py:172 +msgid "User is not a member of the parent club" +msgstr "" + +#: apps/member/models.py:176 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:163 +#: apps/member/models.py:177 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:80 templates/member/profile_detail.html:46 +#: apps/member/views.py:76 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:93 +#: apps/member/views.py:89 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:146 -#, python-format -msgid "Account #%(id)s: %(username)s" -msgstr "Compte n°%(id)s : %(username)s" - -#: apps/member/views.py:216 -msgid "Alias successfully deleted" -msgstr "L'alias a bien été supprimé" - -#: apps/note/admin.py:120 apps/note/models/transactions.py:95 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" #: apps/note/admin.py:128 apps/note/admin.py:156 -#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:108 +#: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" -#: apps/note/apps.py:14 apps/note/models/notes.py:58 -msgid "note" -msgstr "note" - -#: apps/note/forms.py:20 -msgid "New Alias" -msgstr "Nouvel alias" - -#: apps/note/forms.py:25 +#: apps/note/forms.py:14 msgid "select an image" msgstr "Choisissez une image" -#: apps/note/forms.py:26 +#: apps/note/forms.py:15 msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" @@ -310,7 +349,7 @@ msgstr "" msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:118 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "créée le" @@ -368,7 +407,8 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/profile_detail.html:37 +#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" @@ -380,102 +420,114 @@ msgstr "L'alias est trop long." msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:247 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." -#: apps/note/models/transactions.py:31 +#: apps/note/models/transactions.py:30 msgid "transaction category" msgstr "catégorie de transaction" -#: apps/note/models/transactions.py:32 +#: apps/note/models/transactions.py:31 msgid "transaction categories" msgstr "catégories de transaction" -#: apps/note/models/transactions.py:48 +#: apps/note/models/transactions.py:47 msgid "A template with this name already exist" msgstr "Un modèle de transaction avec un nom similaire existe déjà." -#: apps/note/models/transactions.py:57 apps/note/models/transactions.py:126 +#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:125 msgid "amount" msgstr "montant" -#: apps/note/models/transactions.py:58 +#: apps/note/models/transactions.py:57 msgid "in centimes" msgstr "en centimes" -#: apps/note/models/transactions.py:76 +#: apps/note/models/transactions.py:75 msgid "transaction template" msgstr "modèle de transaction" -#: apps/note/models/transactions.py:77 +#: apps/note/models/transactions.py:76 msgid "transaction templates" msgstr "modèles de transaction" -#: apps/note/models/transactions.py:101 apps/note/models/transactions.py:114 +#: apps/note/models/transactions.py:100 apps/note/models/transactions.py:113 #: apps/note/tables.py:33 apps/note/tables.py:42 msgid "used alias" msgstr "alias utilisé" -#: apps/note/models/transactions.py:122 +#: apps/note/models/transactions.py:121 msgid "quantity" msgstr "quantité" -#: apps/note/models/transactions.py:115 +#: apps/note/models/transactions.py:129 msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:119 -msgid "valid" -msgstr "valide" +#: apps/note/models/transactions.py:139 apps/note/tables.py:95 +msgid "invalidity reason" +msgstr "Motif d'invalidité" -#: apps/note/models/transactions.py:124 +#: apps/note/models/transactions.py:146 msgid "transaction" msgstr "transaction" -#: apps/note/models/transactions.py:125 +#: apps/note/models/transactions.py:147 msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:168 templates/base.html:98 +#: apps/note/models/transactions.py:201 templates/base.html:84 #: templates/note/transaction_form.html:19 -#: templates/note/transaction_form.html:145 +#: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:188 +#: apps/note/models/transactions.py:221 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:203 +#: apps/note/models/transactions.py:236 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:208 +#: apps/note/models/transactions.py:241 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:214 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:230 apps/note/models/transactions.py:235 +#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:264 msgid "membership transactions" msgstr "transactions d'adhésion" -#: apps/note/views.py:39 +#: apps/note/tables.py:57 +msgid "Click to invalidate" +msgstr "Cliquez pour dévalider" + +#: apps/note/tables.py:57 +msgid "Click to validate" +msgstr "Cliquez pour valider" + +#: apps/note/tables.py:93 +msgid "No reason specified" +msgstr "Pas de motif spécifié" + +#: apps/note/views.py:41 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:145 templates/base.html:79 +#: apps/note/views.py:102 templates/base.html:79 msgid "Consumptions" msgstr "Consommations" @@ -497,41 +549,43 @@ msgstr "Rang" msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/treasury/apps.py:11 templates/base.html:102 +#: apps/treasury/apps.py:12 templates/base.html:99 msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:56 apps/treasury/forms.py:95 +#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: templates/activity/activity_form.html:9 +#: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/club_form.html:10 templates/treasury/invoice_form.html:47 +#: templates/member/club_form.html:9 templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" -#: apps/treasury/forms.py:58 +#: apps/treasury/forms.py:86 msgid "Close" msgstr "Fermer" -#: apps/treasury/forms.py:65 +#: apps/treasury/forms.py:95 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:70 +#: apps/treasury/forms.py:100 msgid "You can't change the type of the remittance." msgstr "Vous ne pouvez pas changer le type de la remise." -#: apps/treasury/forms.py:84 +#: apps/treasury/forms.py:120 msgid "Last name" msgstr "Nom de famille" -#: apps/treasury/forms.py:86 templates/note/transaction_form.html:92 +#: apps/treasury/forms.py:122 templates/note/transaction_form.html:92 msgid "First name" msgstr "Prénom" -#: apps/treasury/forms.py:88 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 msgid "Bank" msgstr "Banque" -#: apps/treasury/forms.py:90 apps/treasury/tables.py:40 +#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -597,38 +651,38 @@ msgstr "Commentaire" msgid "Closed" msgstr "Fermée" -#: apps/treasury/models.py:159 +#: apps/treasury/models.py:169 msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:178 apps/treasury/tables.py:64 -#: apps/treasury/tables.py:72 templates/treasury/invoice_list.html:13 +#: apps/treasury/models.py:188 apps/treasury/tables.py:76 +#: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 msgid "Remittance" msgstr "Remise" -#: apps/treasury/tables.py:16 +#: apps/treasury/tables.py:19 msgid "Invoice #{:d}" msgstr "Facture n°{:d}" -#: apps/treasury/tables.py:19 templates/treasury/invoice_list.html:10 +#: apps/treasury/tables.py:22 templates/treasury/invoice_list.html:10 #: templates/treasury/remittance_list.html:10 msgid "Invoice" msgstr "Facture" -#: apps/treasury/tables.py:38 +#: apps/treasury/tables.py:45 msgid "Transaction count" msgstr "Nombre de transactions" -#: apps/treasury/tables.py:43 apps/treasury/tables.py:45 +#: apps/treasury/tables.py:50 apps/treasury/tables.py:52 msgid "View" msgstr "Voir" -#: apps/treasury/tables.py:66 +#: apps/treasury/tables.py:78 msgid "Add" msgstr "Ajouter" -#: apps/treasury/tables.py:74 +#: apps/treasury/tables.py:86 msgid "Remove" msgstr "supprimer" @@ -639,27 +693,59 @@ msgid "" "again unless your session expires or you logout." msgstr "" -#: note_kfet/settings/base.py:151 +#: note_kfet/settings/base.py:152 msgid "German" msgstr "" -#: note_kfet/settings/base.py:152 +#: note_kfet/settings/base.py:153 msgid "English" msgstr "" -#: note_kfet/settings/base.py:153 +#: note_kfet/settings/base.py:154 msgid "French" msgstr "" +#: templates/activity/activity_detail.html:45 +msgid "opened" +msgstr "ouvert" + +#: templates/activity/activity_detail.html:52 +msgid "Entry page" +msgstr "Page des entrées" + +#: templates/activity/activity_detail.html:56 +msgid "close" +msgstr "fermer" + +#: templates/activity/activity_detail.html:59 +msgid "invalidate" +msgstr "dévalider" + +#: templates/activity/activity_detail.html:59 +msgid "validate" +msgstr "valider" + +#: templates/activity/activity_detail.html:65 +msgid "Invite" +msgstr "Inviter" + +#: templates/activity/activity_detail.html:72 +msgid "Guests list" +msgstr "Liste des invités" + +#: templates/activity/activity_list.html:7 +msgid "New activity" +msgstr "Nouvelle activité" + #: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." -#: templates/base.html:87 +#: templates/base.html:89 msgid "Clubs" msgstr "Clubs" -#: templates/base.html:92 +#: templates/base.html:94 msgid "Activities" msgstr "Activités" @@ -720,33 +806,49 @@ msgstr "" msgid "Field filters" msgstr "" -#: templates/member/club_detail.html:10 -msgid "Membership starts on" -msgstr "L'adhésion commence le" +#: templates/member/alias_update.html:5 +msgid "Add alias" +msgstr "Ajouter un alias" -#: templates/member/club_detail.html:12 -msgid "Membership ends on" -msgstr "L'adhésion finie le" +#: templates/member/club_info.html:17 +msgid "Club Parent" +msgstr "Club parent" -#: templates/member/club_detail.html:14 -msgid "Membership duration" -msgstr "Durée de l'adhésion" +#: templates/member/club_info.html:41 +msgid "Add member" +msgstr "Ajouter un membre" -#: templates/member/club_detail.html:18 templates/member/profile_detail.html:34 -msgid "balance" -msgstr "solde du compte" +#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +msgid "Edit" +msgstr "Éditer" -#: templates/member/club_detail.html:51 templates/member/profile_detail.html:75 -msgid "Transaction history" -msgstr "Historique des transactions" +#: templates/member/club_info.html:43 +msgid "Add roles" +msgstr "Ajouter des rôles" -#: templates/member/club_form.html:6 -msgid "Clubs list" -msgstr "Liste des clubs" +#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +msgid "View Profile" +msgstr "Voir le profil" #: templates/member/club_list.html:8 -msgid "New club" -msgstr "Nouveau club" +msgid "search clubs" +msgstr "Chercher un club" + +#: templates/member/club_list.html:12 +msgid "Créer un club" +msgstr "" + +#: templates/member/club_list.html:19 +msgid "club listing " +msgstr "Liste des clubs" + +#: templates/member/club_tables.html:9 +msgid "Member of the Club" +msgstr "" + +#: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +msgid "Transaction history" +msgstr "Historique des transactions" #: templates/member/manage_auth_tokens.html:16 msgid "Token" @@ -760,35 +862,34 @@ msgstr "Créé le" msgid "Regenerate token" msgstr "Regénérer le jeton" -#: templates/member/profile_alias.html:10 -msgid "Add alias" -msgstr "Ajouter un alias" +#: templates/member/profile_info.html:5 +msgid "Account #" +msgstr "Compte n°" -#: templates/member/profile_detail.html:15 -msgid "first name" -msgstr "prénom" - -#: templates/member/profile_detail.html:18 +#: templates/member/profile_info.html:17 msgid "username" msgstr "pseudo" -#: templates/member/profile_detail.html:21 +#: templates/member/profile_info.html:20 msgid "password" msgstr "mot de passe" -#: templates/member/profile_detail.html:24 +#: templates/member/profile_info.html:23 msgid "Change password" msgstr "Changer le mot de passe" -#: templates/member/profile_detail.html:42 +#: templates/member/profile_info.html:33 +msgid "balance" +msgstr "solde du compte" + +msgid "Balance" +msgstr "Solde du compte" + +#: templates/member/profile_info.html:41 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_detail.html:49 -msgid "View Profile" -msgstr "Voir le profil" - -#: templates/member/profile_detail.html:62 +#: templates/member/profile_tables.html:9 msgid "View my memberships" msgstr "Voir mes adhésions" @@ -817,10 +918,6 @@ msgstr "Consommer !" msgid "Most used buttons" msgstr "Boutons les plus utilisés" -#: templates/note/conso_form.html:121 -msgid "Edit" -msgstr "Éditer" - #: templates/note/conso_form.html:126 msgid "Single consumptions" msgstr "Consommations simples" @@ -829,7 +926,7 @@ msgstr "Consommations simples" msgid "Double consumptions" msgstr "Consommations doubles" -#: templates/note/conso_form.html:141 templates/note/transaction_form.html:152 +#: templates/note/conso_form.html:141 templates/note/transaction_form.html:147 msgid "Recent transactions history" msgstr "Historique des transactions récentes" @@ -845,37 +942,21 @@ msgstr "Paiement externe" msgid "Transfer type" msgstr "Type de transfert" -#: templates/note/transaction_form.html:86 -msgid "Name" -msgstr "Nom" - -#: templates/note/transaction_form.html:92 -msgid "First name" -msgstr "Prénom" - -#: templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "Banque" - #: templates/note/transaction_form.html:111 -#: templates/note/transaction_form.html:169 -#: templates/note/transaction_form.html:176 +#: templates/note/transaction_form.html:164 +#: templates/note/transaction_form.html:171 msgid "Select receivers" msgstr "Sélection des destinataires" -#: templates/note/transaction_form.html:128 -msgid "Amount" -msgstr "Montant" - -#: templates/note/transaction_form.html:138 +#: templates/note/transaction_form.html:133 msgid "Reason" msgstr "Raison" -#: templates/note/transaction_form.html:183 +#: templates/note/transaction_form.html:178 msgid "Credit note" msgstr "Note à recharger" -#: templates/note/transaction_form.html:190 +#: templates/note/transaction_form.html:185 msgid "Debit note" msgstr "Note à débiter" @@ -887,6 +968,10 @@ msgstr "Liste des boutons" msgid "search button" msgstr "Chercher un bouton" +#: templates/note/transactiontemplate_list.html:13 +msgid "New button" +msgstr "Nouveau bouton" + #: templates/note/transactiontemplate_list.html:20 msgid "buttons listing " msgstr "Liste des boutons" @@ -989,11 +1074,11 @@ msgstr "" msgid "Invoices list" msgstr "Liste des factures" -#: templates/treasury/invoice_form.html:42 +#: templates/treasury/invoice_form.html:41 msgid "Add product" msgstr "Ajouter produit" -#: templates/treasury/invoice_form.html:43 +#: templates/treasury/invoice_form.html:42 msgid "Remove product" msgstr "Retirer produit" @@ -1053,3 +1138,21 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." #: templates/treasury/remittance_list.html:54 msgid "Closed remittances" msgstr "Remises fermées" + +#~ msgid "Account #%(id)s: %(username)s" +#~ msgstr "Compte n°%(id)s : %(username)s" + +#~ msgid "Alias successfully deleted" +#~ msgstr "L'alias a bien été supprimé" + +#~ msgid "New Alias" +#~ msgstr "Nouvel alias" + +#~ msgid "Membership starts on" +#~ msgstr "L'adhésion commence le" + +#~ msgid "Membership ends on" +#~ msgstr "L'adhésion finie le" + +#~ msgid "Membership duration" +#~ msgstr "Durée de l'adhésion" From a805e413673d259ae02733e7126c57a9aae05557 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 02:09:10 +0100 Subject: [PATCH 15/21] Fix CI --- apps/activity/tables.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/activity/tables.py b/apps/activity/tables.py index a37f365d..0e9466e4 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -1,11 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later + from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ import django_tables2 as tables from django_tables2 import A - from note.templatetags.pretty_money import pretty_money + from .models import Activity, Guest From 81cfaf12fa3e1a1a3ea2bfd912431e7b2a19d39a Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 13:38:31 +0100 Subject: [PATCH 16/21] People can join activities --- apps/activity/api/serializers.py | 13 +++++- apps/activity/api/urls.py | 3 +- apps/activity/api/views.py | 16 ++++++- apps/activity/models.py | 63 ++++++++++++++++++++++++-- apps/activity/tables.py | 14 +++--- apps/activity/views.py | 14 ++++-- templates/activity/activity_entry.html | 52 +++++++++++++++++++-- 7 files changed, 151 insertions(+), 24 deletions(-) diff --git a/apps/activity/api/serializers.py b/apps/activity/api/serializers.py index 514515ef..19b52a47 100644 --- a/apps/activity/api/serializers.py +++ b/apps/activity/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers -from ..models import ActivityType, Activity, Guest +from ..models import ActivityType, Activity, Guest, Entry class ActivityTypeSerializer(serializers.ModelSerializer): @@ -37,3 +37,14 @@ class GuestSerializer(serializers.ModelSerializer): class Meta: model = Guest fields = '__all__' + + +class EntrySerializer(serializers.ModelSerializer): + """ + REST API Serializer for Entries. + The djangorestframework plugin will analyse the model `Entry` and parse all fields in the API. + """ + + class Meta: + model = Entry + fields = '__all__' diff --git a/apps/activity/api/urls.py b/apps/activity/api/urls.py index 79e0ba30..3a2495fb 100644 --- a/apps/activity/api/urls.py +++ b/apps/activity/api/urls.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .views import ActivityTypeViewSet, ActivityViewSet, GuestViewSet +from .views import ActivityTypeViewSet, ActivityViewSet, GuestViewSet, EntryViewSet def register_activity_urls(router, path): @@ -11,3 +11,4 @@ def register_activity_urls(router, path): router.register(path + '/activity', ActivityViewSet) router.register(path + '/type', ActivityTypeViewSet) router.register(path + '/guest', GuestViewSet) + router.register(path + '/entry', EntryViewSet) diff --git a/apps/activity/api/views.py b/apps/activity/api/views.py index 9d106ee5..764f2ac3 100644 --- a/apps/activity/api/views.py +++ b/apps/activity/api/views.py @@ -5,8 +5,8 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework.filters import SearchFilter from api.viewsets import ReadProtectedModelViewSet -from .serializers import ActivityTypeSerializer, ActivitySerializer, GuestSerializer -from ..models import ActivityType, Activity, Guest +from .serializers import ActivityTypeSerializer, ActivitySerializer, GuestSerializer, EntrySerializer +from ..models import ActivityType, Activity, Guest, Entry class ActivityTypeViewSet(ReadProtectedModelViewSet): @@ -43,3 +43,15 @@ class GuestViewSet(ReadProtectedModelViewSet): serializer_class = GuestSerializer filter_backends = [SearchFilter] search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ] + + +class EntryViewSet(ReadProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `Entry` objects, serialize it to JSON with the given serializer, + then render it on /api/activity/entry/ + """ + queryset = Entry.objects.all() + serializer_class = EntrySerializer + filter_backends = [SearchFilter] + search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ] diff --git a/apps/activity/models.py b/apps/activity/models.py index 4bf92e23..9e3ea296 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -2,7 +2,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.db import models +from django.db.models import Q from django.utils.translation import gettext_lazy as _ +from rest_framework.exceptions import ValidationError from note.models import NoteUser, Transaction @@ -103,7 +105,14 @@ class Activity(models.Model): class Entry(models.Model): + activity = models.ForeignKey( + Activity, + on_delete=models.PROTECT, + verbose_name=_("activity"), + ) + time = models.DateTimeField( + auto_now_add=True, verbose_name=_("entry time"), ) @@ -113,6 +122,47 @@ class Entry(models.Model): verbose_name=_("note"), ) + guest = models.OneToOneField( + 'activity.Guest', + on_delete=models.PROTECT, + null=True, + ) + + class Meta: + unique_together = (('activity', 'note', 'guest', ), ) + + def save(self, force_insert=False, force_update=False, using=None, + update_fields=None): + + qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest) + if qs.exists(): + raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, )) + + if self.guest: + self.note = self.guest.inviter + + insert = not self.pk + if insert: + if self.note.balance < 0: + raise ValidationError(_("The balance is negative.")) + + ret = super().save(force_insert, force_update, using, update_fields) + + if insert and self.guest: + GuestTransaction.objects.create( + source=self.note, + source_alias=self.note.user.username, + destination=self.activity.organizer.note, + destination_alias=self.activity.organizer.name, + quantity=1, + amount=self.activity.activity_type.guest_entry_fee, + reason="Invitation " + self.activity.name + " " + self.guest.first_name + " " + self.guest.last_name, + valid=True, + guest=self.guest, + ).save() + + return ret + class Guest(models.Model): """ @@ -141,11 +191,14 @@ class Guest(models.Model): verbose_name=_("inviter"), ) - entry = models.OneToOneField( - Entry, - on_delete=models.PROTECT, - null=True, - ) + @property + def has_entry(self): + try: + if self.entry: + return True + return False + except AttributeError: + return False class Meta: verbose_name = _("guest") diff --git a/apps/activity/tables.py b/apps/activity/tables.py index 0e9466e4..449ee321 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -35,8 +35,8 @@ class GuestTable(tables.Table): empty_values=(), attrs={ "td": { - "class": lambda record: "" if record.entry else "validate btn btn-danger", - "onclick": lambda record: "" if record.entry else "remove_guest(" + str(record.pk) + ")" + "class": lambda record: "" if record.has_entry else "validate btn btn-danger", + "onclick": lambda record: "" if record.has_entry else "remove_guest(" + str(record.pk) + ")" } } ) @@ -50,8 +50,8 @@ class GuestTable(tables.Table): fields = ("last_name", "first_name", "inviter", ) def render_entry(self, record): - if record.entry: - return str(record.date) + if record.has_entry: + return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, ))) return _("remove").capitalize() @@ -83,6 +83,8 @@ class EntryTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' row_attrs = { 'class': 'table-row', - 'id': lambda record: "row-" + str(record.type), - 'data-href': lambda record: record.type + 'id': lambda record: "row-" + ("guest-" if isinstance(record, Guest) else "membership-") + str(record.pk), + 'data-type': lambda record: "guest" if isinstance(record, Guest) else "membership", + 'data-id': lambda record: record.pk, + 'data-inviter': lambda record: record.inviter.pk if isinstance(record, Guest) else "", } diff --git a/apps/activity/views.py b/apps/activity/views.py index 01b0e7f8..bb97c2c3 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -86,13 +86,17 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): if "search" in self.request.GET: pattern = self.request.GET["search"] - print(pattern) + if not pattern: + pattern = "^$" + + if pattern[0] != "^": + pattern = "^" + pattern guest_qs = Guest.objects\ .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\ .filter(Q(first_name__regex=pattern) | Q(last_name__regex=pattern) | Q(inviter__alias__name__regex=pattern) - | Q(inviter__alias__normalized_name__startswith=Alias.normalize(pattern)))\ + | Q(inviter__alias__normalized_name__regex=Alias.normalize(pattern)))\ .distinct()[:20] for guest in guest_qs: guest.type = "Invité" @@ -106,9 +110,9 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): .filter(Q(note__polymorphic_ctype__model="noteuser") & (Q(note__noteuser__user__first_name__regex=pattern) | Q(note__noteuser__user__last_name__regex=pattern) - | Q(name__regex="^" + pattern) - | Q(normalized_name__startswith=Alias.normalize(pattern))))\ - .distinct()[:20] + | Q(name__regex=pattern) + | Q(normalized_name__regex=Alias.normalize(pattern))))\ + .distinct("username")[:20] for note in note_qs: note.type = "Adhérent" matched.append(note) diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html index e09d0e8f..c34d2b0a 100644 --- a/templates/activity/activity_entry.html +++ b/templates/activity/activity_entry.html @@ -8,6 +8,8 @@ {% block content %} +
    +
    {% render_table table %}
    @@ -18,13 +20,55 @@ old_pattern = null; alias_obj = $("#alias"); - alias_obj.keyup(function() { + function reloadTable(force=false) { let pattern = alias_obj.val(); - if (pattern === old_pattern || pattern === "") + if ((pattern === old_pattern || pattern === "") && !force) return; - $("#entry_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #entry_table"); - }); + $("#entry_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #entry_table", init); + refreshBalance(); + } + + alias_obj.keyup(reloadTable); + + $(document).ready(init); + + function init() { + $(".table-row").click(function(e) { + let target = e.target.parentElement; + target = $("#" + target.id); + + let type = target.attr("data-type"); + let id = target.attr("data-id"); + + if (type === "membership") { + $.post("/api/activity/entry/?format=json", { + csrfmiddlewaretoken: CSRF_TOKEN, + activity: {{ activity.id }}, + note: id, + guest: null + }).done(function () { + addMsg("Entrée effectuée !", "success"); + reloadTable(true); + }).fail(function(xhr) { + errMsg(xhr.responseJSON); + }); + } + else { + } + $.post("/api/activity/entry/?format=json", { + csrfmiddlewaretoken: CSRF_TOKEN, + activity: {{ activity.id }}, + note: target.attr("data-inviter"), + guest: id + }).done(function () { + addMsg("Entrée effectuée !", "success"); + reloadTable(true); + }).fail(function(xhr) { + errMsg(xhr.responseJSON); + }); + }); + } {% endblock %} From c8b72cf1ff9387639cd254229a6bf3b084fbb3b5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 16:52:58 +0100 Subject: [PATCH 17/21] Guests can pay with CB or coins, lot of other improvements --- apps/activity/api/serializers.py | 13 +- apps/activity/models.py | 4 +- apps/activity/tables.py | 24 +++- apps/activity/views.py | 14 ++- apps/note/api/serializers.py | 8 ++ locale/de/LC_MESSAGES/django.po | 124 ++++++++++++------ locale/fr/LC_MESSAGES/django.po | 159 ++++++++++++++---------- templates/activity/activity_detail.html | 2 +- templates/activity/activity_entry.html | 74 +++++++++-- templates/activity/activity_list.html | 15 ++- 10 files changed, 304 insertions(+), 133 deletions(-) diff --git a/apps/activity/api/serializers.py b/apps/activity/api/serializers.py index 19b52a47..2f257de0 100644 --- a/apps/activity/api/serializers.py +++ b/apps/activity/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers -from ..models import ActivityType, Activity, Guest, Entry +from ..models import ActivityType, Activity, Guest, Entry, GuestTransaction class ActivityTypeSerializer(serializers.ModelSerializer): @@ -48,3 +48,14 @@ class EntrySerializer(serializers.ModelSerializer): class Meta: model = Entry fields = '__all__' + + +class GuestTransactionSerializer(serializers.ModelSerializer): + """ + REST API Serializer for Special transactions. + The djangorestframework plugin will analyse the model `GuestTransaction` and parse all fields in the API. + """ + + class Meta: + model = GuestTransaction + fields = '__all__' diff --git a/apps/activity/models.py b/apps/activity/models.py index 9e3ea296..1645d9ae 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -69,8 +69,6 @@ class Activity(models.Model): 'note.Note', on_delete=models.PROTECT, related_name='+', - null=True, - blank=True, verbose_name=_('note'), ) @@ -152,7 +150,7 @@ class Entry(models.Model): GuestTransaction.objects.create( source=self.note, source_alias=self.note.user.username, - destination=self.activity.organizer.note, + destination=self.note, destination_alias=self.activity.organizer.name, quantity=1, amount=self.activity.activity_type.guest_entry_fee, diff --git a/apps/activity/tables.py b/apps/activity/tables.py index 449ee321..d6e566d3 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -7,7 +7,7 @@ import django_tables2 as tables from django_tables2 import A from note.templatetags.pretty_money import pretty_money -from .models import Activity, Guest +from .models import Activity, Guest, Entry class ActivityTable(tables.Table): @@ -55,6 +55,22 @@ class GuestTable(tables.Table): return _("remove").capitalize() +def get_row_class(record): + c = "table-row" + if isinstance(record, Guest): + if record.has_entry: + c += " table-success" + else: + c += " table-warning" + else: + qs = Entry.objects.filter(note=record.note, activity=record.activity, guest=None) + if qs.exists(): + c += " table-success" + elif record.note.balance < 0: + c += " table-danger" + return c + + class EntryTable(tables.Table): type = tables.Column(verbose_name=_("Type")) @@ -82,9 +98,11 @@ class EntryTable(tables.Table): } template_name = 'django_tables2/bootstrap4.html' row_attrs = { - 'class': 'table-row', + 'class': lambda record: get_row_class(record), 'id': lambda record: "row-" + ("guest-" if isinstance(record, Guest) else "membership-") + str(record.pk), 'data-type': lambda record: "guest" if isinstance(record, Guest) else "membership", - 'data-id': lambda record: record.pk, + 'data-id': lambda record: record.pk if isinstance(record, Guest) else record.note.pk, 'data-inviter': lambda record: record.inviter.pk if isinstance(record, Guest) else "", + 'data-last-name': lambda record: record.last_name, + 'data-first-name': lambda record: record.first_name, } diff --git a/apps/activity/views.py b/apps/activity/views.py index bb97c2c3..af871d99 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,5 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import datetime from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType @@ -8,11 +9,11 @@ from django.urls import reverse_lazy from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView -from note.models import NoteUser, Alias +from note.models import NoteUser, Alias, NoteSpecial from permission.backends import PermissionBackend from .forms import ActivityForm, GuestForm -from .models import Activity, Guest +from .models import Activity, Guest, Entry from .tables import ActivityTable, GuestTable, EntryTable @@ -31,7 +32,10 @@ class ActivityListView(LoginRequiredMixin, SingleTableView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx['title'] = _("Upcoming activities") + ctx['title'] = _("Activities") + + upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now()) + ctx['upcoming'] = ActivityTable(data=upcoming_activities) return ctx @@ -115,12 +119,16 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): .distinct("username")[:20] for note in note_qs: note.type = "Adhérent" + note.activity = activity matched.append(note) table = EntryTable(data=matched) ctx["table"] = table + ctx["entries"] = Entry.objects.filter(activity=activity) + ctx["title"] = _('Entry for activity "{}"').format(activity.name) ctx["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk + ctx["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk return ctx diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index 05c35aa5..fbd12038 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -163,6 +163,7 @@ class SpecialTransactionSerializer(serializers.ModelSerializer): fields = '__all__' +# noinspection PyUnresolvedReferences class TransactionPolymorphicSerializer(PolymorphicSerializer): model_serializer_mapping = { Transaction: TransactionSerializer, @@ -171,5 +172,12 @@ class TransactionPolymorphicSerializer(PolymorphicSerializer): SpecialTransaction: SpecialTransactionSerializer, } + try: + from activity.models import GuestTransaction + from activity.api.serializers import GuestTransactionSerializer + model_serializer_mapping[GuestTransaction] = GuestTransactionSerializer + except ImportError: # Activity app is not loaded + pass + class Meta: model = Transaction diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 70c85682..f92240d3 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-28 01:54+0100\n" +"POT-Creation-Date: 2020-03-28 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,10 +19,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: apps/activity/apps.py:10 apps/activity/models.py:101 +#: apps/activity/models.py:109 msgid "activity" msgstr "" -#: apps/activity/models.py:19 apps/activity/models.py:44 +#: apps/activity/models.py:21 apps/activity/models.py:46 #: apps/member/models.py:64 apps/member/models.py:122 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 @@ -30,38 +31,38 @@ msgstr "" msgid "name" msgstr "" -#: apps/activity/models.py:23 templates/activity/activity_detail.html:34 +#: apps/activity/models.py:25 templates/activity/activity_detail.html:34 msgid "can invite" msgstr "" -#: apps/activity/models.py:26 templates/activity/activity_detail.html:38 +#: apps/activity/models.py:28 templates/activity/activity_detail.html:38 msgid "guest entry fee" msgstr "" -#: apps/activity/models.py:30 +#: apps/activity/models.py:32 msgid "activity type" msgstr "" -#: apps/activity/models.py:31 +#: apps/activity/models.py:33 msgid "activity types" msgstr "" -#: apps/activity/models.py:49 apps/note/models/transactions.py:69 +#: apps/activity/models.py:51 apps/note/models/transactions.py:69 #: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:56 apps/note/models/notes.py:164 +#: apps/activity/models.py:58 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" -#: apps/activity/models.py:63 templates/activity/activity_detail.html:28 +#: apps/activity/models.py:65 templates/activity/activity_detail.html:28 msgid "organizer" msgstr "" -#: apps/activity/models.py:72 apps/activity/models.py:113 apps/note/apps.py:14 +#: apps/activity/models.py:72 apps/activity/models.py:120 apps/note/apps.py:14 #: apps/note/models/notes.py:58 msgid "note" msgstr "" @@ -91,43 +92,80 @@ msgstr "" msgid "activities" msgstr "" -#: apps/activity/models.py:107 +#: apps/activity/models.py:114 msgid "entry time" msgstr "" -#: apps/activity/models.py:129 +#: apps/activity/models.py:137 +msgid "Already entered on " +msgstr "" + +#: apps/activity/models.py:137 apps/activity/tables.py:54 +msgid "{:%Y-%m-%d %H:%M:%S}" +msgstr "" + +#: apps/activity/models.py:145 +msgid "The balance is negative." +msgstr "" + +#: apps/activity/models.py:177 msgid "last name" msgstr "" -#: apps/activity/models.py:134 templates/member/profile_info.html:14 +#: apps/activity/models.py:182 templates/member/profile_info.html:14 msgid "first name" msgstr "" -#: apps/activity/models.py:141 +#: apps/activity/models.py:189 msgid "inviter" msgstr "" -#: apps/activity/models.py:151 +#: apps/activity/models.py:202 msgid "guest" msgstr "" -#: apps/activity/models.py:152 +#: apps/activity/models.py:203 msgid "guests" msgstr "" -#: apps/activity/models.py:163 +#: apps/activity/models.py:214 msgid "Invitation" msgstr "" #: apps/activity/tables.py:54 +msgid "Entered on " +msgstr "" + +#: apps/activity/tables.py:55 msgid "remove" msgstr "" -#: apps/activity/views.py:34 -msgid "Upcoming activities" +#: apps/activity/tables.py:75 apps/treasury/models.py:126 +msgid "Type" msgstr "" -#: apps/activity/views.py:119 +#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +msgid "Last name" +msgstr "" + +#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: templates/note/transaction_form.html:92 +msgid "First name" +msgstr "" + +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +msgid "Note" +msgstr "" + +#: apps/activity/tables.py:83 +msgid "Balance" +msgstr "" + +#: apps/activity/views.py:35 templates/base.html:94 +msgid "Activities" +msgstr "" + +#: apps/activity/views.py:130 msgid "Entry for activity \"{}\"" msgstr "" @@ -357,10 +395,6 @@ msgstr "" msgid "notes" msgstr "" -#: apps/note/models/notes.py:67 -msgid "Note" -msgstr "" - #: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "" @@ -573,14 +607,6 @@ msgstr "" msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:120 -msgid "Last name" -msgstr "" - -#: apps/treasury/forms.py:122 templates/note/transaction_form.html:92 -msgid "First name" -msgstr "" - #: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 msgid "Bank" msgstr "" @@ -639,10 +665,6 @@ msgstr "" msgid "Date" msgstr "" -#: apps/treasury/models.py:126 -msgid "Type" -msgstr "" - #: apps/treasury/models.py:131 msgid "Comment" msgstr "" @@ -733,10 +755,34 @@ msgstr "" msgid "Guests list" msgstr "" -#: templates/activity/activity_list.html:7 +#: templates/activity/activity_entry.html:10 +msgid "Return to activity page" +msgstr "" + +#: templates/activity/activity_entry.html:18 +msgid "entries" +msgstr "" + +#: templates/activity/activity_entry.html:18 +msgid "entry" +msgstr "" + +#: templates/activity/activity_list.html:5 +msgid "Upcoming activities" +msgstr "" + +#: templates/activity/activity_list.html:10 +msgid "There is no planned activity." +msgstr "" + +#: templates/activity/activity_list.html:14 msgid "New activity" msgstr "" +#: templates/activity/activity_list.html:18 +msgid "All activities" +msgstr "" + #: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "" @@ -745,10 +791,6 @@ msgstr "" msgid "Clubs" msgstr "" -#: templates/base.html:94 -msgid "Activities" -msgstr "" - #: templates/cas_server/base.html:7 msgid "Central Authentication Service" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9c4272c3..4a900f35 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-28 01:54+0100\n" +"POT-Creation-Date: 2020-03-28 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,10 +14,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: apps/activity/apps.py:10 apps/activity/models.py:101 +#: apps/activity/models.py:109 msgid "activity" msgstr "activité" -#: apps/activity/models.py:19 apps/activity/models.py:44 +#: apps/activity/models.py:21 apps/activity/models.py:46 #: apps/member/models.py:64 apps/member/models.py:122 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 @@ -25,45 +26,45 @@ msgstr "activité" msgid "name" msgstr "nom" -#: apps/activity/models.py:23 templates/activity/activity_detail.html:34 +#: apps/activity/models.py:25 templates/activity/activity_detail.html:34 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:26 templates/activity/activity_detail.html:38 +#: apps/activity/models.py:28 templates/activity/activity_detail.html:38 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:30 +#: apps/activity/models.py:32 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:31 +#: apps/activity/models.py:33 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:49 apps/note/models/transactions.py:69 +#: apps/activity/models.py:51 apps/note/models/transactions.py:69 #: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:56 apps/note/models/notes.py:164 +#: apps/activity/models.py:58 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" -#: apps/activity/models.py:63 templates/activity/activity_detail.html:28 +#: apps/activity/models.py:65 templates/activity/activity_detail.html:28 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:72 apps/activity/models.py:113 apps/note/apps.py:14 +#: apps/activity/models.py:72 apps/activity/models.py:120 apps/note/apps.py:14 #: apps/note/models/notes.py:58 msgid "note" msgstr "note" #: apps/activity/models.py:79 templates/activity/activity_detail.html:31 msgid "attendees club" -msgstr "" +msgstr "club attendu" #: apps/activity/models.py:83 templates/activity/activity_detail.html:22 msgid "start date" @@ -80,59 +81,96 @@ msgstr "valide" #: apps/activity/models.py:97 templates/activity/activity_detail.html:56 msgid "open" -msgstr "" +msgstr "ouvrir" #: apps/activity/models.py:102 msgid "activities" msgstr "activités" -#: apps/activity/models.py:107 +#: apps/activity/models.py:114 msgid "entry time" -msgstr "" +msgstr "heure d'entrée" -#: apps/activity/models.py:129 +#: apps/activity/models.py:137 +msgid "Already entered on " +msgstr "Déjà rentré le " + +#: apps/activity/models.py:137 apps/activity/tables.py:54 +msgid "{:%Y-%m-%d %H:%M:%S}" +msgstr "{:%d/%m/%Y %H:%M:%S}" + +#: apps/activity/models.py:145 +msgid "The balance is negative." +msgstr "La note est en négatif." + +#: apps/activity/models.py:177 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:134 templates/member/profile_info.html:14 +#: apps/activity/models.py:182 templates/member/profile_info.html:14 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:141 +#: apps/activity/models.py:189 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:151 +#: apps/activity/models.py:202 msgid "guest" msgstr "invité" -#: apps/activity/models.py:152 +#: apps/activity/models.py:203 msgid "guests" msgstr "invités" -#: apps/activity/models.py:163 +#: apps/activity/models.py:214 msgid "Invitation" msgstr "Invitation" #: apps/activity/tables.py:54 +msgid "Entered on " +msgstr "Entré le " + +#: apps/activity/tables.py:55 msgid "remove" msgstr "supprimer" -#: apps/activity/views.py:34 -msgid "Upcoming activities" -msgstr "Activités à venir" +#: apps/activity/tables.py:75 apps/treasury/models.py:126 +msgid "Type" +msgstr "Type" -#: apps/activity/views.py:119 +#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +msgid "Last name" +msgstr "Nom de famille" + +#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: templates/note/transaction_form.html:92 +msgid "First name" +msgstr "Prénom" + +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +msgid "Note" +msgstr "Note" + +#: apps/activity/tables.py:83 +msgid "Balance" +msgstr "Solde du compte" + +#: apps/activity/views.py:35 templates/base.html:94 +msgid "Activities" +msgstr "Activités" + +#: apps/activity/views.py:130 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" #: apps/api/apps.py:10 msgid "API" -msgstr "" +msgstr "API" #: apps/logs/apps.py:11 msgid "Logs" -msgstr "" +msgstr "Logs" #: apps/logs/models.py:21 apps/note/models/notes.py:117 msgid "user" @@ -283,7 +321,7 @@ msgstr "cotisation" #: apps/member/models.py:172 msgid "User is not a member of the parent club" -msgstr "" +msgstr "L'utilisateur n'est pas membre du club parent" #: apps/member/models.py:176 msgid "membership" @@ -357,10 +395,6 @@ msgstr "créée le" msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:67 -msgid "Note" -msgstr "Note" - #: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." @@ -573,14 +607,6 @@ msgstr "La remise est déjà fermée." msgid "You can't change the type of the remittance." msgstr "Vous ne pouvez pas changer le type de la remise." -#: apps/treasury/forms.py:120 -msgid "Last name" -msgstr "Nom de famille" - -#: apps/treasury/forms.py:122 templates/note/transaction_form.html:92 -msgid "First name" -msgstr "Prénom" - #: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 msgid "Bank" msgstr "Banque" @@ -639,10 +665,6 @@ msgstr "Prix unitaire" msgid "Date" msgstr "Date" -#: apps/treasury/models.py:126 -msgid "Type" -msgstr "Type" - #: apps/treasury/models.py:131 msgid "Comment" msgstr "Commentaire" @@ -733,10 +755,34 @@ msgstr "Inviter" msgid "Guests list" msgstr "Liste des invités" -#: templates/activity/activity_list.html:7 +#: templates/activity/activity_entry.html:10 +msgid "Return to activity page" +msgstr "Retour à la page de l'activité" + +#: templates/activity/activity_entry.html:18 +msgid "entries" +msgstr "entrées" + +#: templates/activity/activity_entry.html:18 +msgid "entry" +msgstr "entrée" + +#: templates/activity/activity_list.html:5 +msgid "Upcoming activities" +msgstr "Activités à venir" + +#: templates/activity/activity_list.html:10 +msgid "There is no planned activity." +msgstr "Il n'y a pas d'activité prévue." + +#: templates/activity/activity_list.html:14 msgid "New activity" msgstr "Nouvelle activité" +#: templates/activity/activity_list.html:18 +msgid "All activities" +msgstr "Toutes les activités" + #: templates/base.html:13 msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." @@ -745,10 +791,6 @@ msgstr "La note du BDE de l'ENS Paris-Saclay." msgid "Clubs" msgstr "Clubs" -#: templates/base.html:94 -msgid "Activities" -msgstr "Activités" - #: templates/cas_server/base.html:7 msgid "Central Authentication Service" msgstr "" @@ -882,9 +924,6 @@ msgstr "Changer le mot de passe" msgid "balance" msgstr "solde du compte" -msgid "Balance" -msgstr "Solde du compte" - #: templates/member/profile_info.html:41 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" @@ -1138,21 +1177,3 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." #: templates/treasury/remittance_list.html:54 msgid "Closed remittances" msgstr "Remises fermées" - -#~ msgid "Account #%(id)s: %(username)s" -#~ msgstr "Compte n°%(id)s : %(username)s" - -#~ msgid "Alias successfully deleted" -#~ msgstr "L'alias a bien été supprimé" - -#~ msgid "New Alias" -#~ msgstr "Nouvel alias" - -#~ msgid "Membership starts on" -#~ msgstr "L'adhésion commence le" - -#~ msgid "Membership ends on" -#~ msgstr "L'adhésion finie le" - -#~ msgid "Membership duration" -#~ msgstr "Durée de l'adhésion" diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index b663e52d..ccd64803 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -48,7 +48,7 @@
    - {% if activity.open %} + {% if activity.open and "change__open"|has_perm:activity %} {% trans "Entry page" %} {% endif %} diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html index c34d2b0a..c06a5188 100644 --- a/templates/activity/activity_entry.html +++ b/templates/activity/activity_entry.html @@ -6,11 +6,16 @@ {% load perms %} {% block content %} + + + +
    +

    {{ entries.count }} {% if entries.count >= 2 %}{% trans "entries" %}{% else %}{% trans "entry" %}{% endif %}

    {% render_table table %}
    {% endblock %} @@ -41,6 +46,8 @@ let type = target.attr("data-type"); let id = target.attr("data-id"); + let last_name = target.attr("data-last-name"); + let first_name = target.attr("data-first-name"); if (type === "membership") { $.post("/api/activity/entry/?format=json", { @@ -56,18 +63,63 @@ }); } else { + let line_obj = $("#buttons_guest_" + id); + if (line_obj.length || target.attr('class').includes("table-success")) { + line_obj.remove(); + return; + } + + let tr = "" + + "" + + " " + + " " + + "" + + ""; + $(tr).insertAfter(target); + + let makeTransaction = function() { + $.post("/api/activity/entry/?format=json", { + csrfmiddlewaretoken: CSRF_TOKEN, + activity: {{ activity.id }}, + note: target.attr("data-inviter"), + guest: id + }).done(function () { + addMsg("Entrée effectuée !", "success"); + reloadTable(true); + }).fail(function (xhr) { + errMsg(xhr.responseJSON); + }); + }; + + let credit = function(credit_id, credit_name) { + return function() { + $.post("/api/note/transaction/transaction/", + { + "csrfmiddlewaretoken": CSRF_TOKEN, + "quantity": 1, + "amount": {{ activity.activity_type.guest_entry_fee }}, + "reason": "Crédit " + credit_name + " (invitation {{ activity.name }})", + "valid": true, + "polymorphic_ctype": {{ notespecial_ctype }}, + "resourcetype": "SpecialTransaction", + "source": credit_id, + "destination": target.attr('data-inviter'), + "last_name": last_name, + "first_name": first_name, + "bank": "" + }).done(function () { + makeTransaction(); + reset(); + }).fail(function (xhr) { + errMsg(xhr.responseJSON); + }); + }; + }; + + $("#transaction_guest_" + id).click(makeTransaction); + $("#transaction_guest_" + id + "_especes").click(credit(1, "espèces")); + $("#transaction_guest_" + id + "_cb").click(credit(2, "carte bancaire")); } - $.post("/api/activity/entry/?format=json", { - csrfmiddlewaretoken: CSRF_TOKEN, - activity: {{ activity.id }}, - note: target.attr("data-inviter"), - guest: id - }).done(function () { - addMsg("Entrée effectuée !", "success"); - reloadTable(true); - }).fail(function(xhr) { - errMsg(xhr.responseJSON); - }); }); } diff --git a/templates/activity/activity_list.html b/templates/activity/activity_list.html index 9092e2ca..f2871fd6 100644 --- a/templates/activity/activity_list.html +++ b/templates/activity/activity_list.html @@ -2,9 +2,22 @@ {% load render_table from django_tables2 %} {% load i18n crispy_forms_tags%} {% block content %} - {% render_table table %} +

    {% trans "Upcoming activities" %}

    + {% if upcoming.data %} + {% render_table upcoming %} + {% else %} +
    + {% trans "There is no planned activity." %} +
    + {% endif %} {% trans 'New activity' %} + +
    + +

    {% trans "All activities" %}

    + + {% render_table table %} {% endblock %} {% block extrajavascript %} From 691a03ecadaa5b4d9bf441af4410b703294d0921 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 28 Mar 2020 19:05:21 +0100 Subject: [PATCH 18/21] Add some initial permissions for activities --- apps/activity/forms.py | 2 +- apps/activity/models.py | 9 + apps/activity/views.py | 20 +- apps/permission/fixtures/initial.json | 233 +++++++++++++++++++++++- templates/activity/activity_detail.html | 5 + 5 files changed, 263 insertions(+), 6 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 7fafd15e..c5a9e7f3 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -13,7 +13,7 @@ from .models import Activity, Guest class ActivityForm(forms.ModelForm): class Meta: model = Activity - exclude = ('valid', 'open', ) + exclude = ('creater', 'valid', 'open', ) widgets = { "organizer": AutocompleteModelSelect( model=Club, diff --git a/apps/activity/models.py b/apps/activity/models.py index 1645d9ae..948e0919 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,6 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from django.contrib.auth.models import User from django.db import models from django.db.models import Q from django.utils.translation import gettext_lazy as _ @@ -58,6 +59,12 @@ class Activity(models.Model): verbose_name=_('type'), ) + creater = models.ForeignKey( + User, + on_delete=models.PROTECT, + verbose_name=_("user"), + ) + organizer = models.ForeignKey( 'member.Club', on_delete=models.PROTECT, @@ -68,6 +75,8 @@ class Activity(models.Model): note = models.ForeignKey( 'note.Note', on_delete=models.PROTECT, + blank=True, + null=True, related_name='+', verbose_name=_('note'), ) diff --git a/apps/activity/views.py b/apps/activity/views.py index af871d99..518d7c10 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -21,21 +21,31 @@ class ActivityCreateView(LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm + def form_valid(self, form): + form.instance.creater = self.request.user + return super().form_valid(form) + def get_success_url(self, **kwargs): - return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) + self.object.refresh_from_db() + return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk}) class ActivityListView(LoginRequiredMixin, SingleTableView): model = Activity table_class = ActivityTable + def get_queryset(self): + return super().get_queryset()\ + .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).reverse() + def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx['title'] = _("Activities") upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now()) - ctx['upcoming'] = ActivityTable(data=upcoming_activities) + ctx['upcoming'] = ActivityTable(data=upcoming_activities + .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))) return ctx @@ -100,7 +110,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\ .filter(Q(first_name__regex=pattern) | Q(last_name__regex=pattern) | Q(inviter__alias__name__regex=pattern) - | Q(inviter__alias__normalized_name__regex=Alias.normalize(pattern)))\ + | Q(inviter__alias__normalized_name__regex=Alias.normalize(pattern))) \ + .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))\ .distinct()[:20] for guest in guest_qs: guest.type = "Invité" @@ -115,7 +126,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): & (Q(note__noteuser__user__first_name__regex=pattern) | Q(note__noteuser__user__last_name__regex=pattern) | Q(name__regex=pattern) - | Q(normalized_name__regex=Alias.normalize(pattern))))\ + | Q(normalized_name__regex=Alias.normalize(pattern)))) \ + .filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\ .distinct("username")[:20] for note in note_qs: note.type = "Adhérent" diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 43d39a36..31b59069 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -55,6 +55,20 @@ "name": "Tr\u00e9sorier\u00b7\u00e8re de club" } }, + { + "model": "member.role", + "pk": 8, + "fields": { + "name": "Tr\u00e9sorier\u00b7\u00e8re de club" + } + }, + { + "model": "member.role", + "pk": 9, + "fields": { + "name": "Res[pot]" + } + }, { "model": "permission.permissionmask", "pk": 1, @@ -574,6 +588,201 @@ "description": "Create any transaction" } }, + { + "model": "permission.permission", + "pk": 34, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "[\"OR\", {\"valid\": true}, {\"creater\": [\"user\"]}]", + "type": "view", + "mask": 1, + "field": "", + "description": "View valid activites" + } + }, + { + "model": "permission.permission", + "pk": 35, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "[\"AND\", {\"valid\": false}, {\"creater\": [\"user\"]}]", + "type": "change", + "mask": 1, + "field": "", + "description": "Change our activities" + } + }, + { + "model": "permission.permission", + "pk": 36, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{\"creater\": [\"user\"], \"valid\": false}", + "type": "add", + "mask": 1, + "field": "", + "description": "Add activities" + } + }, + { + "model": "permission.permission", + "pk": 37, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{}", + "type": "change", + "mask": 2, + "field": "valid", + "description": "Validate activities" + } + }, + { + "model": "permission.permission", + "pk": 38, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{}", + "type": "change", + "mask": 2, + "field": "open", + "description": "Open activities" + } + }, + { + "model": "permission.permission", + "pk": 39, + "fields": { + "model": [ + "activity", + "guest" + ], + "query": "{\"inviter\": [\"user\", \"note\"], \"activity__activity_type__can_invite\": true}", + "type": "add", + "mask": 1, + "field": "", + "description": "Invite people to activities" + } + }, + { + "model": "permission.permission", + "pk": 40, + "fields": { + "model": [ + "activity", + "guest" + ], + "query": "{\"inviter\": [\"user\", \"note\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View invited people" + } + }, + { + "model": "permission.permission", + "pk": 41, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{}", + "type": "view", + "mask": 2, + "field": "", + "description": "View all activities" + } + }, + { + "model": "permission.permission", + "pk": 42, + "fields": { + "model": [ + "activity", + "guest" + ], + "query": "{}", + "type": "view", + "mask": 2, + "field": "", + "description": "View all invited people" + } + }, + { + "model": "permission.permission", + "pk": 43, + "fields": { + "model": [ + "activity", + "entry" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "description": "Manage entries" + } + }, + { + "model": "permission.permission", + "pk": 44, + "fields": { + "model": [ + "activity", + "guesttransaction" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "description": "Add invitation transactions" + } + }, + { + "model": "permission.permission", + "pk": 45, + "fields": { + "model": [ + "activity", + "guesttransaction" + ], + "query": "{}", + "type": "view", + "mask": 1, + "field": "", + "description": "View invitation transactions" + } + }, + { + "model": "permission.permission", + "pk": 46, + "fields": { + "model": [ + "activity", + "guesttransaction" + ], + "query": "{}", + "type": "change", + "mask": 2, + "field": "valid", + "description": "Validate invitation transactions" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -613,7 +822,12 @@ 15, 16, 17, - 18 + 18, + 34, + 35, + 36, + 39, + 40 ] } }, @@ -649,5 +863,22 @@ 33 ] } + }, + { + "model": "permission.rolepermissions", + "pk": 5, + "fields": { + "role": 9, + "permissions": [ + 37, + 38, + 41, + 42, + 43, + 44, + 45, + 46 + ] + } } ] diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index ccd64803..07c10a15 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -25,6 +25,11 @@
    {% trans 'end date'|capfirst %}
    {{ activity.date_end }}
    + {% if "view_"|has_perm:activity.creater %} +
    {% trans 'creater'|capfirst %}
    +
    {{ activity.creater }}
    + {% endif %} +
    {% trans 'organizer'|capfirst %}
    {{ activity.organizer }}
    From fb5796d35e880d78645ad3b9cd0dd3206250a4c8 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 30 Mar 2020 00:42:32 +0200 Subject: [PATCH 19/21] Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. --- apps/activity/forms.py | 35 ++++- apps/activity/models.py | 26 +++- apps/activity/views.py | 5 + apps/member/forms.py | 4 +- apps/note/forms.py | 4 +- apps/note/models/notes.py | 31 +++++ locale/de/LC_MESSAGES/django.po | 160 ++++++++++++---------- locale/fr/LC_MESSAGES/django.po | 162 +++++++++++++---------- note_kfet/inputs.py | 8 +- templates/member/autocomplete_model.html | 2 +- 10 files changed, 279 insertions(+), 158 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index c5a9e7f3..533ff7d1 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -1,11 +1,13 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import timedelta from django import forms from django.contrib.contenttypes.models import ContentType +from django.utils.translation import gettext as _ from member.models import Club from note.models import NoteUser, Note -from note_kfet.inputs import DateTimePickerInput, AutocompleteModelSelect +from note_kfet.inputs import DateTimePickerInput, Autocomplete from .models import Activity, Guest @@ -15,18 +17,18 @@ class ActivityForm(forms.ModelForm): model = Activity exclude = ('creater', 'valid', 'open', ) widgets = { - "organizer": AutocompleteModelSelect( + "organizer": Autocomplete( model=Club, attrs={"api_url": "/api/members/club/"}, ), - "note": AutocompleteModelSelect( + "note": Autocomplete( model=Note, attrs={ "api_url": "/api/note/note/", 'placeholder': 'Note de l\'événement sur laquelle envoyer les crédits d\'invitation ...' }, ), - "attendees_club": AutocompleteModelSelect( + "attendees_club": Autocomplete( model=Club, attrs={"api_url": "/api/members/club/"}, ), @@ -36,11 +38,34 @@ class ActivityForm(forms.ModelForm): class GuestForm(forms.ModelForm): + def clean(self): + cleaned_data = super().clean() + + one_year = timedelta(days=365) + + qs = Guest.objects.filter( + first_name=cleaned_data["first_name"], + last_name=cleaned_data["last_name"], + activity__date_start__gte=self.activity.date_start - one_year, + ) + if len(qs) >= 5: + self.add_error("last_name", _("This person has been already invited 5 times this year.")) + + qs = qs.filter(activity=self.activity) + if qs.exists(): + self.add_error("last_name", _("This person is already invited.")) + + qs = Guest.objects.filter(inviter=cleaned_data["inviter"], activity=self.activity) + if len(qs) >= 3: + self.add_error("inviter", _("You can't invite more than 3 people to this activity.")) + + return cleaned_data + class Meta: model = Guest fields = ('last_name', 'first_name', 'inviter', ) widgets = { - "inviter": AutocompleteModelSelect( + "inviter": Autocomplete( NoteUser, attrs={ 'api_url': '/api/note/note/', diff --git a/apps/activity/models.py b/apps/activity/models.py index 948e0919..feae60d7 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,5 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import timedelta from django.contrib.auth.models import User from django.db import models @@ -115,6 +116,7 @@ class Entry(models.Model): activity = models.ForeignKey( Activity, on_delete=models.PROTECT, + related_name="entries", verbose_name=_("activity"), ) @@ -194,7 +196,7 @@ class Guest(models.Model): inviter = models.ForeignKey( NoteUser, on_delete=models.PROTECT, - related_name='+', + related_name='guests', verbose_name=_("inviter"), ) @@ -207,9 +209,31 @@ class Guest(models.Model): except AttributeError: return False + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): + one_year = timedelta(days=365) + + qs = Guest.objects.filter( + first_name=self.first_name, + last_name=self.last_name, + activity__date_start__gte=self.activity.date_start - one_year, + ) + if len(qs) >= 5: + raise ValidationError(_("This person has been already invited 5 times this year.")) + + qs = qs.filter(activity=self.activity) + if qs.exists(): + raise ValidationError(_("This person is already invited.")) + + qs = Guest.objects.filter(inviter=self.inviter, activity=self.activity) + if len(qs) >= 3: + raise ValidationError(_("You can't invite more than 3 people to this activity.")) + + return super().save(force_insert, force_update, using, update_fields) + class Meta: verbose_name = _("guest") verbose_name_plural = _("guests") + unique_together = ("activity", "last_name", "first_name", ) class GuestTransaction(Transaction): diff --git a/apps/activity/views.py b/apps/activity/views.py index 518d7c10..5df3493c 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -77,6 +77,11 @@ class ActivityInviteView(LoginRequiredMixin, CreateView): form_class = GuestForm template_name = "activity/activity_invite.html" + def get_form(self, form_class=None): + form = super().get_form(form_class) + form.activity = Activity.objects.get(pk=self.kwargs["pk"]) + return form + def form_valid(self, form): form.instance.activity = Activity.objects.get(pk=self.kwargs["pk"]) return super().form_valid(form) diff --git a/apps/member/forms.py b/apps/member/forms.py index 76cd146b..20f0acfe 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -7,7 +7,7 @@ from crispy_forms.layout import Layout from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from note_kfet.inputs import AutocompleteModelSelect +from note_kfet.inputs import Autocomplete from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -63,7 +63,7 @@ class MembershipForm(forms.ModelForm): # et récupère les noms d'utilisateur valides widgets = { 'user': - AutocompleteModelSelect( + Autocomplete( User, attrs={ 'api_url': '/api/user/', diff --git a/apps/note/forms.py b/apps/note/forms.py index 8c9a04ce..50f226f2 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -4,7 +4,7 @@ from django import forms from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ -from note_kfet.inputs import AutocompleteModelSelect +from note_kfet.inputs import Autocomplete from .models import TransactionTemplate, NoteClub @@ -31,7 +31,7 @@ class TransactionTemplateForm(forms.ModelForm): # forward=(forward.Const('TYPE', 'note_type') où TYPE est dans {user, club, special} widgets = { 'destination': - AutocompleteModelSelect( + Autocomplete( NoteClub, attrs={ 'api_url': '/api/note/note/', diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 9282bde9..d74d9147 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -10,6 +10,8 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel +from member.models import Club + """ Defines each note types """ @@ -174,6 +176,35 @@ class NoteSpecial(Note): return self.special_type +class NoteCommon(Note): + """ + A :model:`note.Note` for special accounts, where real money enter or leave the system + - bank check + - credit card + - bank transfer + - cash + - refund + This Type of Note is not associated to a :model:`auth.User` or :model:`member.Club` . + """ + note_name = models.CharField( + max_length=255, + unique=True, + ) + + club = models.ForeignKey( + Club, + on_delete=models.PROTECT, + verbose_name=_("club"), + ) + + class Meta: + verbose_name = _("common note") + verbose_name_plural = _("common notes") + + def __str__(self): + return self.note_name + + class Alias(models.Model): """ points toward a :model:`note.NoteUser` or :model;`note.NoteClub` instance. diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f92240d3..49359fb1 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-28 16:42+0100\n" +"POT-Creation-Date: 2020-03-30 00:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,117 +18,134 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:101 -#: apps/activity/models.py:109 +#: apps/activity/apps.py:10 apps/activity/models.py:111 +#: apps/activity/models.py:120 msgid "activity" msgstr "" -#: apps/activity/models.py:21 apps/activity/models.py:46 +#: apps/activity/forms.py:52 apps/activity/models.py:221 +msgid "This person has been already invited 5 times this year." +msgstr "" + +#: apps/activity/forms.py:56 apps/activity/models.py:225 +msgid "This person is already invited." +msgstr "" + +#: apps/activity/forms.py:60 apps/activity/models.py:229 +msgid "You can't invite more than 3 people to this activity." +msgstr "" + +#: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/notes.py:219 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "" -#: apps/activity/models.py:25 templates/activity/activity_detail.html:34 +#: apps/activity/models.py:27 templates/activity/activity_detail.html:39 msgid "can invite" msgstr "" -#: apps/activity/models.py:28 templates/activity/activity_detail.html:38 +#: apps/activity/models.py:30 templates/activity/activity_detail.html:43 msgid "guest entry fee" msgstr "" -#: apps/activity/models.py:32 +#: apps/activity/models.py:34 msgid "activity type" msgstr "" -#: apps/activity/models.py:33 +#: apps/activity/models.py:35 msgid "activity types" msgstr "" -#: apps/activity/models.py:51 apps/note/models/transactions.py:69 +#: apps/activity/models.py:53 apps/note/models/transactions.py:69 #: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:58 apps/note/models/notes.py:164 +#: apps/activity/models.py:60 apps/note/models/notes.py:166 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" -#: apps/activity/models.py:65 templates/activity/activity_detail.html:28 +#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/note/models/notes.py:119 +msgid "user" +msgstr "" + +#: apps/activity/models.py:73 templates/activity/activity_detail.html:33 msgid "organizer" msgstr "" -#: apps/activity/models.py:72 apps/activity/models.py:120 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 +#: apps/note/models/notes.py:60 msgid "note" msgstr "" -#: apps/activity/models.py:79 templates/activity/activity_detail.html:31 +#: apps/activity/models.py:89 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "" -#: apps/activity/models.py:83 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:93 templates/activity/activity_detail.html:22 msgid "start date" msgstr "" -#: apps/activity/models.py:87 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:97 templates/activity/activity_detail.html:25 msgid "end date" msgstr "" -#: apps/activity/models.py:92 apps/note/models/transactions.py:134 -#: templates/activity/activity_detail.html:42 +#: apps/activity/models.py:102 apps/note/models/transactions.py:134 +#: templates/activity/activity_detail.html:47 msgid "valid" msgstr "" -#: apps/activity/models.py:97 templates/activity/activity_detail.html:56 +#: apps/activity/models.py:107 templates/activity/activity_detail.html:61 msgid "open" msgstr "" -#: apps/activity/models.py:102 +#: apps/activity/models.py:112 msgid "activities" msgstr "" -#: apps/activity/models.py:114 +#: apps/activity/models.py:125 msgid "entry time" msgstr "" -#: apps/activity/models.py:137 +#: apps/activity/models.py:148 msgid "Already entered on " msgstr "" -#: apps/activity/models.py:137 apps/activity/tables.py:54 +#: apps/activity/models.py:148 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "" -#: apps/activity/models.py:145 +#: apps/activity/models.py:156 msgid "The balance is negative." msgstr "" -#: apps/activity/models.py:177 +#: apps/activity/models.py:188 msgid "last name" msgstr "" -#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: apps/activity/models.py:193 templates/member/profile_info.html:14 msgid "first name" msgstr "" -#: apps/activity/models.py:189 +#: apps/activity/models.py:200 msgid "inviter" msgstr "" -#: apps/activity/models.py:202 +#: apps/activity/models.py:234 msgid "guest" msgstr "" -#: apps/activity/models.py:203 +#: apps/activity/models.py:235 msgid "guests" msgstr "" -#: apps/activity/models.py:214 +#: apps/activity/models.py:247 msgid "Invitation" msgstr "" @@ -153,7 +170,7 @@ msgstr "" msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "" @@ -161,11 +178,11 @@ msgstr "" msgid "Balance" msgstr "" -#: apps/activity/views.py:35 templates/base.html:94 +#: apps/activity/views.py:44 templates/base.html:94 msgid "Activities" msgstr "" -#: apps/activity/views.py:130 +#: apps/activity/views.py:147 msgid "Entry for activity \"{}\"" msgstr "" @@ -177,10 +194,6 @@ msgstr "" msgid "Logs" msgstr "" -#: apps/logs/models.py:21 apps/note/models/notes.py:117 -msgid "user" -msgstr "" - #: apps/logs/models.py:27 msgid "IP Address" msgstr "" @@ -206,7 +219,7 @@ msgid "create" msgstr "" #: apps/logs/models.py:61 apps/note/tables.py:142 -#: templates/activity/activity_detail.html:62 +#: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" @@ -292,7 +305,8 @@ msgid "" "members can renew their membership." msgstr "" -#: apps/member/models.py:104 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:141 +#: apps/note/models/notes.py:197 msgid "club" msgstr "" @@ -357,104 +371,104 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 msgid "created at" msgstr "" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:123 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:124 msgid "users note" msgstr "" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:130 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:145 msgid "club note" msgstr "" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:146 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:152 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:172 msgid "special note" msgstr "" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:173 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:225 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:241 msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:242 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:264 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:269 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:282 msgid "You can't delete your main alias." msgstr "" @@ -727,31 +741,35 @@ msgstr "" msgid "French" msgstr "" -#: templates/activity/activity_detail.html:45 +#: templates/activity/activity_detail.html:29 +msgid "creater" +msgstr "" + +#: templates/activity/activity_detail.html:50 msgid "opened" msgstr "" -#: templates/activity/activity_detail.html:52 +#: templates/activity/activity_detail.html:57 msgid "Entry page" msgstr "" -#: templates/activity/activity_detail.html:56 +#: templates/activity/activity_detail.html:61 msgid "close" msgstr "" -#: templates/activity/activity_detail.html:59 +#: templates/activity/activity_detail.html:64 msgid "invalidate" msgstr "" -#: templates/activity/activity_detail.html:59 +#: templates/activity/activity_detail.html:64 msgid "validate" msgstr "" -#: templates/activity/activity_detail.html:65 +#: templates/activity/activity_detail.html:70 msgid "Invite" msgstr "" -#: templates/activity/activity_detail.html:72 +#: templates/activity/activity_detail.html:77 msgid "Guests list" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 4a900f35..8a6fa1f8 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-28 16:42+0100\n" +"POT-Creation-Date: 2020-03-30 00:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,117 +13,134 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:101 -#: apps/activity/models.py:109 +#: apps/activity/apps.py:10 apps/activity/models.py:111 +#: apps/activity/models.py:120 msgid "activity" msgstr "activité" -#: apps/activity/models.py:21 apps/activity/models.py:46 +#: apps/activity/forms.py:52 apps/activity/models.py:221 +msgid "This person has been already invited 5 times this year." +msgstr "Cette personne a déjà été invitée 5 fois cette année." + +#: apps/activity/forms.py:56 apps/activity/models.py:225 +msgid "This person is already invited." +msgstr "Cette personne est déjà invitée." + +#: apps/activity/forms.py:60 apps/activity/models.py:229 +msgid "You can't invite more than 3 people to this activity." +msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." + +#: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 +#: apps/note/models/notes.py:219 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "nom" -#: apps/activity/models.py:25 templates/activity/activity_detail.html:34 +#: apps/activity/models.py:27 templates/activity/activity_detail.html:39 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:28 templates/activity/activity_detail.html:38 +#: apps/activity/models.py:30 templates/activity/activity_detail.html:43 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:32 +#: apps/activity/models.py:34 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:33 +#: apps/activity/models.py:35 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:51 apps/note/models/transactions.py:69 +#: apps/activity/models.py:53 apps/note/models/transactions.py:69 #: apps/permission/models.py:90 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:58 apps/note/models/notes.py:164 +#: apps/activity/models.py:60 apps/note/models/notes.py:166 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" -#: apps/activity/models.py:65 templates/activity/activity_detail.html:28 +#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/note/models/notes.py:119 +msgid "user" +msgstr "utilisateur" + +#: apps/activity/models.py:73 templates/activity/activity_detail.html:33 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:72 apps/activity/models.py:120 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 +#: apps/note/models/notes.py:60 msgid "note" msgstr "note" -#: apps/activity/models.py:79 templates/activity/activity_detail.html:31 +#: apps/activity/models.py:89 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "club attendu" -#: apps/activity/models.py:83 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:93 templates/activity/activity_detail.html:22 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:87 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:97 templates/activity/activity_detail.html:25 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:92 apps/note/models/transactions.py:134 -#: templates/activity/activity_detail.html:42 +#: apps/activity/models.py:102 apps/note/models/transactions.py:134 +#: templates/activity/activity_detail.html:47 msgid "valid" msgstr "valide" -#: apps/activity/models.py:97 templates/activity/activity_detail.html:56 +#: apps/activity/models.py:107 templates/activity/activity_detail.html:61 msgid "open" msgstr "ouvrir" -#: apps/activity/models.py:102 +#: apps/activity/models.py:112 msgid "activities" msgstr "activités" -#: apps/activity/models.py:114 +#: apps/activity/models.py:125 msgid "entry time" msgstr "heure d'entrée" -#: apps/activity/models.py:137 +#: apps/activity/models.py:148 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:137 apps/activity/tables.py:54 +#: apps/activity/models.py:148 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:145 +#: apps/activity/models.py:156 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:177 +#: apps/activity/models.py:188 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: apps/activity/models.py:193 templates/member/profile_info.html:14 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:189 +#: apps/activity/models.py:200 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:202 +#: apps/activity/models.py:234 msgid "guest" msgstr "invité" -#: apps/activity/models.py:203 +#: apps/activity/models.py:235 msgid "guests" msgstr "invités" -#: apps/activity/models.py:214 +#: apps/activity/models.py:247 msgid "Invitation" msgstr "Invitation" @@ -148,7 +165,7 @@ msgstr "Nom de famille" msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "Note" @@ -156,11 +173,11 @@ msgstr "Note" msgid "Balance" msgstr "Solde du compte" -#: apps/activity/views.py:35 templates/base.html:94 +#: apps/activity/views.py:44 templates/base.html:94 msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:130 +#: apps/activity/views.py:147 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -172,10 +189,6 @@ msgstr "API" msgid "Logs" msgstr "Logs" -#: apps/logs/models.py:21 apps/note/models/notes.py:117 -msgid "user" -msgstr "utilisateur" - #: apps/logs/models.py:27 msgid "IP Address" msgstr "Adresse IP" @@ -201,7 +214,7 @@ msgid "create" msgstr "Créer" #: apps/logs/models.py:61 apps/note/tables.py:142 -#: templates/activity/activity_detail.html:62 +#: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" @@ -291,7 +304,8 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:104 apps/note/models/notes.py:139 +#: apps/member/models.py:104 apps/note/models/notes.py:141 +#: apps/note/models/notes.py:197 msgid "club" msgstr "club" @@ -356,105 +370,105 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "dernier date de négatif" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:123 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:124 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:130 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:145 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:146 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:152 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:172 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:173 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:225 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:241 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:242 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:264 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:269 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:282 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -727,31 +741,35 @@ msgstr "" msgid "French" msgstr "" -#: templates/activity/activity_detail.html:45 +#: templates/activity/activity_detail.html:29 +msgid "creater" +msgstr "Créateur" + +#: templates/activity/activity_detail.html:50 msgid "opened" msgstr "ouvert" -#: templates/activity/activity_detail.html:52 +#: templates/activity/activity_detail.html:57 msgid "Entry page" msgstr "Page des entrées" -#: templates/activity/activity_detail.html:56 +#: templates/activity/activity_detail.html:61 msgid "close" msgstr "fermer" -#: templates/activity/activity_detail.html:59 +#: templates/activity/activity_detail.html:64 msgid "invalidate" msgstr "dévalider" -#: templates/activity/activity_detail.html:59 +#: templates/activity/activity_detail.html:64 msgid "validate" msgstr "valider" -#: templates/activity/activity_detail.html:65 +#: templates/activity/activity_detail.html:70 msgid "Invite" msgstr "Inviter" -#: templates/activity/activity_detail.html:72 +#: templates/activity/activity_detail.html:77 msgid "Guests list" msgstr "Liste des invités" @@ -886,7 +904,7 @@ msgstr "Liste des clubs" #: templates/member/club_tables.html:9 msgid "Member of the Club" -msgstr "" +msgstr "Membre du club" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 msgid "Transaction history" diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index e012c1c2..a3170007 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -3,7 +3,7 @@ from json import dumps as json_dumps -from django.forms.widgets import DateTimeBaseInput, NumberInput, Select +from django.forms.widgets import DateTimeBaseInput, NumberInput, TextInput class AmountInput(NumberInput): @@ -20,11 +20,11 @@ class AmountInput(NumberInput): return str(int(100 * float(val))) if val else val -class AutocompleteModelSelect(Select): +class Autocomplete(TextInput): template_name = "member/autocomplete_model.html" - def __init__(self, model, attrs=None, choices=()): - super().__init__(attrs, choices) + def __init__(self, model, attrs=None): + super().__init__(attrs) self.model = model self.model_pk = None diff --git a/templates/member/autocomplete_model.html b/templates/member/autocomplete_model.html index c45f13c7..2236c6ef 100644 --- a/templates/member/autocomplete_model.html +++ b/templates/member/autocomplete_model.html @@ -1,5 +1,5 @@ - Date: Mon, 30 Mar 2020 17:27:02 +0200 Subject: [PATCH 20/21] Guests can't be invited since the activity is started --- apps/activity/forms.py | 5 +++- apps/activity/models.py | 32 ++++++++++++++----------- apps/activity/views.py | 4 +++- apps/note/models/notes.py | 29 ---------------------- templates/activity/activity_detail.html | 2 +- 5 files changed, 26 insertions(+), 46 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 533ff7d1..4a13c230 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta +from datetime import timedelta, datetime from django import forms from django.contrib.contenttypes.models import ContentType @@ -41,6 +41,9 @@ class GuestForm(forms.ModelForm): def clean(self): cleaned_data = super().clean() + if self.activity.date_start > datetime.now(): + self.add_error("inviter", _("You can't invite someone once the activity is started.")) + one_year = timedelta(days=365) qs = Guest.objects.filter( diff --git a/apps/activity/models.py b/apps/activity/models.py index feae60d7..b17a9f6e 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta +from datetime import timedelta, datetime from django.contrib.auth.models import User from django.db import models @@ -212,21 +212,25 @@ class Guest(models.Model): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): one_year = timedelta(days=365) - qs = Guest.objects.filter( - first_name=self.first_name, - last_name=self.last_name, - activity__date_start__gte=self.activity.date_start - one_year, - ) - if len(qs) >= 5: - raise ValidationError(_("This person has been already invited 5 times this year.")) + if not force_insert: + if self.activity.date_start > datetime.now(): + raise ValidationError(_("You can't invite someone once the activity is started.")) - qs = qs.filter(activity=self.activity) - if qs.exists(): - raise ValidationError(_("This person is already invited.")) + qs = Guest.objects.filter( + first_name=self.first_name, + last_name=self.last_name, + activity__date_start__gte=self.activity.date_start - one_year, + ) + if len(qs) >= 5: + raise ValidationError(_("This person has been already invited 5 times this year.")) - qs = Guest.objects.filter(inviter=self.inviter, activity=self.activity) - if len(qs) >= 3: - raise ValidationError(_("You can't invite more than 3 people to this activity.")) + qs = qs.filter(activity=self.activity) + if qs.exists(): + raise ValidationError(_("This person is already invited.")) + + qs = Guest.objects.filter(inviter=self.inviter, activity=self.activity) + if len(qs) >= 3: + raise ValidationError(_("You can't invite more than 3 people to this activity.")) return super().save(force_insert, force_update, using, update_fields) diff --git a/apps/activity/views.py b/apps/activity/views.py index 5df3493c..feb7591d 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import datetime +from datetime import datetime, timezone from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType @@ -61,6 +61,8 @@ class ActivityDetailView(LoginRequiredMixin, DetailView): .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))) ctx["guests"] = table + ctx["activity_started"] = datetime.now(timezone.utc) > self.object.date_start + return ctx diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index d74d9147..89e2b31a 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -176,35 +176,6 @@ class NoteSpecial(Note): return self.special_type -class NoteCommon(Note): - """ - A :model:`note.Note` for special accounts, where real money enter or leave the system - - bank check - - credit card - - bank transfer - - cash - - refund - This Type of Note is not associated to a :model:`auth.User` or :model:`member.Club` . - """ - note_name = models.CharField( - max_length=255, - unique=True, - ) - - club = models.ForeignKey( - Club, - on_delete=models.PROTECT, - verbose_name=_("club"), - ) - - class Meta: - verbose_name = _("common note") - verbose_name_plural = _("common notes") - - def __str__(self): - return self.note_name - - class Alias(models.Model): """ points toward a :model:`note.NoteUser` or :model;`note.NoteClub` instance. diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 07c10a15..0ed3c719 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -66,7 +66,7 @@ {% if "view_"|has_perm:activity %} {% trans "edit"|capfirst %} {% endif %} - {% if activity.activity_type.can_invite %} + {% if activity.activity_type.can_invite and not activity_started %} {% trans "Invite" %} {% endif %}
    From b0b3aa35a9fa51d1db984e1131d8bbea75bb9aec Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 30 Mar 2020 17:35:47 +0200 Subject: [PATCH 21/21] Guests can't be invited if the activity is not validated --- apps/activity/forms.py | 3 ++ apps/activity/models.py | 3 ++ apps/note/models/notes.py | 2 - locale/de/LC_MESSAGES/django.po | 85 ++++++++++++++++++--------------- locale/fr/LC_MESSAGES/django.po | 85 ++++++++++++++++++--------------- 5 files changed, 98 insertions(+), 80 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index 4a13c230..dcbd3c9d 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -44,6 +44,9 @@ class GuestForm(forms.ModelForm): if self.activity.date_start > datetime.now(): self.add_error("inviter", _("You can't invite someone once the activity is started.")) + if not self.activity.valid: + self.add_error("inviter", _("This activity is not validated yet.")) + one_year = timedelta(days=365) qs = Guest.objects.filter( diff --git a/apps/activity/models.py b/apps/activity/models.py index b17a9f6e..e3ff0c2f 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -216,6 +216,9 @@ class Guest(models.Model): if self.activity.date_start > datetime.now(): raise ValidationError(_("You can't invite someone once the activity is started.")) + if not self.activity.valid: + raise ValidationError(_("This activity is not validated yet.")) + qs = Guest.objects.filter( first_name=self.first_name, last_name=self.last_name, diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 89e2b31a..9282bde9 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -10,8 +10,6 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel -from member.models import Club - """ Defines each note types """ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 49359fb1..e2c8075e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-30 00:38+0200\n" +"POT-Creation-Date: 2020-03-30 17:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,21 +23,29 @@ msgstr "" msgid "activity" msgstr "" -#: apps/activity/forms.py:52 apps/activity/models.py:221 +#: apps/activity/forms.py:45 apps/activity/models.py:217 +msgid "You can't invite someone once the activity is started." +msgstr "" + +#: apps/activity/forms.py:48 apps/activity/models.py:220 +msgid "This activity is not validated yet." +msgstr "" + +#: apps/activity/forms.py:58 apps/activity/models.py:228 msgid "This person has been already invited 5 times this year." msgstr "" -#: apps/activity/forms.py:56 apps/activity/models.py:225 +#: apps/activity/forms.py:62 apps/activity/models.py:232 msgid "This person is already invited." msgstr "" -#: apps/activity/forms.py:60 apps/activity/models.py:229 +#: apps/activity/forms.py:66 apps/activity/models.py:236 msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:219 apps/note/models/transactions.py:24 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" @@ -64,14 +72,14 @@ msgstr "" msgid "description" msgstr "" -#: apps/activity/models.py:60 apps/note/models/notes.py:166 +#: apps/activity/models.py:60 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:119 +#: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -80,7 +88,7 @@ msgid "organizer" msgstr "" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:58 msgid "note" msgstr "" @@ -137,15 +145,15 @@ msgstr "" msgid "inviter" msgstr "" -#: apps/activity/models.py:234 +#: apps/activity/models.py:241 msgid "guest" msgstr "" -#: apps/activity/models.py:235 +#: apps/activity/models.py:242 msgid "guests" msgstr "" -#: apps/activity/models.py:247 +#: apps/activity/models.py:254 msgid "Invitation" msgstr "" @@ -170,7 +178,7 @@ msgstr "" msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 msgid "Note" msgstr "" @@ -182,7 +190,7 @@ msgstr "" msgid "Activities" msgstr "" -#: apps/activity/views.py:147 +#: apps/activity/views.py:149 msgid "Entry for activity \"{}\"" msgstr "" @@ -305,8 +313,7 @@ msgid "" "members can renew their membership." msgstr "" -#: apps/member/models.py:104 apps/note/models/notes.py:141 -#: apps/note/models/notes.py:197 +#: apps/member/models.py:104 apps/note/models/notes.py:139 msgid "club" msgstr "" @@ -371,104 +378,104 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:30 +#: apps/note/models/notes.py:28 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:34 +#: apps/note/models/notes.py:32 msgid "last negative date" msgstr "" -#: apps/note/models/notes.py:35 +#: apps/note/models/notes.py:33 msgid "last time the balance was negative" msgstr "" -#: apps/note/models/notes.py:40 +#: apps/note/models/notes.py:38 msgid "active" msgstr "" -#: apps/note/models/notes.py:43 +#: apps/note/models/notes.py:41 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:47 +#: apps/note/models/notes.py:45 msgid "display image" msgstr "" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "" -#: apps/note/models/notes.py:61 +#: apps/note/models/notes.py:59 msgid "notes" msgstr "" -#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 +#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:123 +#: apps/note/models/notes.py:121 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:124 +#: apps/note/models/notes.py:122 msgid "users note" msgstr "" -#: apps/note/models/notes.py:130 +#: apps/note/models/notes.py:128 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:145 +#: apps/note/models/notes.py:143 msgid "club note" msgstr "" -#: apps/note/models/notes.py:146 +#: apps/note/models/notes.py:144 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:152 +#: apps/note/models/notes.py:150 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:172 +#: apps/note/models/notes.py:170 msgid "special note" msgstr "" -#: apps/note/models/notes.py:173 +#: apps/note/models/notes.py:171 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:225 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:241 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "" -#: apps/note/models/notes.py:242 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:264 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:282 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8a6fa1f8..08c1b174 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-30 00:38+0200\n" +"POT-Creation-Date: 2020-03-30 17:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,21 +18,29 @@ msgstr "" msgid "activity" msgstr "activité" -#: apps/activity/forms.py:52 apps/activity/models.py:221 +#: apps/activity/forms.py:45 apps/activity/models.py:217 +msgid "You can't invite someone once the activity is started." +msgstr "Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré." + +#: apps/activity/forms.py:48 apps/activity/models.py:220 +msgid "This activity is not validated yet." +msgstr "Cette activité n'est pas encore validée." + +#: apps/activity/forms.py:58 apps/activity/models.py:228 msgid "This person has been already invited 5 times this year." msgstr "Cette personne a déjà été invitée 5 fois cette année." -#: apps/activity/forms.py:56 apps/activity/models.py:225 +#: apps/activity/forms.py:62 apps/activity/models.py:232 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:60 apps/activity/models.py:229 +#: apps/activity/forms.py:66 apps/activity/models.py:236 msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:23 apps/activity/models.py:48 #: apps/member/models.py:64 apps/member/models.py:122 -#: apps/note/models/notes.py:219 apps/note/models/transactions.py:24 +#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" @@ -59,14 +67,14 @@ msgstr "types d'activité" msgid "description" msgstr "description" -#: apps/activity/models.py:60 apps/note/models/notes.py:166 +#: apps/activity/models.py:60 apps/note/models/notes.py:164 #: apps/note/models/transactions.py:62 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" #: apps/activity/models.py:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:119 +#: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -75,7 +83,7 @@ msgid "organizer" msgstr "organisateur" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:60 +#: apps/note/models/notes.py:58 msgid "note" msgstr "note" @@ -132,15 +140,15 @@ msgstr "prénom" msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:234 +#: apps/activity/models.py:241 msgid "guest" msgstr "invité" -#: apps/activity/models.py:235 +#: apps/activity/models.py:242 msgid "guests" msgstr "invités" -#: apps/activity/models.py:247 +#: apps/activity/models.py:254 msgid "Invitation" msgstr "Invitation" @@ -165,7 +173,7 @@ msgstr "Nom de famille" msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:81 apps/note/models/notes.py:67 msgid "Note" msgstr "Note" @@ -177,7 +185,7 @@ msgstr "Solde du compte" msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:147 +#: apps/activity/views.py:149 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -304,8 +312,7 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:104 apps/note/models/notes.py:141 -#: apps/note/models/notes.py:197 +#: apps/member/models.py:104 apps/note/models/notes.py:139 msgid "club" msgstr "club" @@ -370,105 +377,105 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/models/notes.py:29 +#: apps/note/models/notes.py:27 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:30 +#: apps/note/models/notes.py:28 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:34 +#: apps/note/models/notes.py:32 msgid "last negative date" msgstr "dernier date de négatif" -#: apps/note/models/notes.py:35 +#: apps/note/models/notes.py:33 msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:40 +#: apps/note/models/notes.py:38 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:43 +#: apps/note/models/notes.py:41 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:47 +#: apps/note/models/notes.py:45 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:61 +#: apps/note/models/notes.py:59 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:79 apps/note/models/notes.py:103 +#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:123 +#: apps/note/models/notes.py:121 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:124 +#: apps/note/models/notes.py:122 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:130 +#: apps/note/models/notes.py:128 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:145 +#: apps/note/models/notes.py:143 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:146 +#: apps/note/models/notes.py:144 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:152 +#: apps/note/models/notes.py:150 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:172 +#: apps/note/models/notes.py:170 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:173 +#: apps/note/models/notes.py:171 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:225 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:241 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:242 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:33 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:264 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:282 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal."