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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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/66] 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." From c384ee02ebfe24e817655f316f901351739e4b40 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 01:03:30 +0200 Subject: [PATCH 22/66] Implement a new type of note (see #45) --- apps/member/forms.py | 28 +++++++- apps/member/urls.py | 16 ++++- apps/member/views.py | 94 ++++++++++++++++++++++--- apps/note/admin.py | 12 +++- apps/note/api/serializers.py | 21 +++++- apps/note/models/notes.py | 36 ++++++++++ apps/note/tables.py | 20 +++++- static/js/base.js | 2 +- templates/member/club_detail.html | 9 +++ templates/member/club_info.html | 7 +- templates/member/noteowner_detail.html | 2 +- templates/note/noteactivity_detail.html | 57 +++++++++++++++ templates/note/noteactivity_form.html | 16 +++++ templates/note/noteactivity_list.html | 27 +++++++ 14 files changed, 326 insertions(+), 21 deletions(-) create mode 100644 templates/note/noteactivity_detail.html create mode 100644 templates/note/noteactivity_form.html create mode 100644 templates/note/noteactivity_list.html diff --git a/apps/member/forms.py b/apps/member/forms.py index 20f0acfe..d731c10c 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -7,7 +7,8 @@ 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 Autocomplete +from note.models.notes import NoteActivity +from note_kfet.inputs import Autocomplete, AmountInput from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -47,6 +48,31 @@ class ClubForm(forms.ModelForm): class Meta: model = Club fields = '__all__' + widgets = { + "membership_fee": AmountInput() + } + + +class NoteActivityForm(forms.ModelForm): + class Meta: + model = NoteActivity + fields = ('note_name', 'club', 'controller', ) + widgets = { + "club": Autocomplete( + Club, + attrs={ + 'api_url': '/api/members/club/', + } + ), + "controller": Autocomplete( + User, + attrs={ + 'api_url': '/api/user/', + 'name_field': 'username', + 'placeholder': 'Nom ...', + } + ) + } class AddMembersForm(forms.Form): diff --git a/apps/member/urls.py b/apps/member/urls.py index 085a3fec..f1a5c2bd 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -8,13 +8,23 @@ from . import views app_name = 'member' urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), + path('club/', views.ClubListView.as_view(), name="club_list"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), path('club/create/', views.ClubCreateView.as_view(), name="club_create"), - path('club//update', views.ClubUpdateView.as_view(), name="club_update"), - path('club//update_pic', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), - path('club//aliases', views.ClubAliasView.as_view(), name="club_alias"), + path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), + path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), + path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), + path('club//linked_notes/', views.ClubLinkedNotesView.as_view(), + name="club_linked_note_list"), + path('club//linked_notes/create/', views.ClubLinkedNoteCreateView.as_view(), + name="club_linked_note_create"), + path('club//linked_notes//', views.ClubLinkedNoteDetailView.as_view(), + name="club_linked_note_detail"), + path('club//linked_notes//update/', views.ClubLinkedNoteUpdateView.as_view(), + name="club_linked_note_update"), + path('user/', views.UserListView.as_view(), name="user_list"), path('user/', views.UserDetailView.as_view(), name="user_detail"), path('user//update', views.UserUpdateView.as_view(), name="user_update_profile"), diff --git a/apps/member/views.py b/apps/member/views.py index 8145b5e9..e8bde67d 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -18,13 +18,14 @@ from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm from note.models import Alias, NoteUser +from note.models.notes import NoteActivity from note.models.transactions import Transaction -from note.tables import HistoryTable, AliasTable +from note.tables import HistoryTable, AliasTable, NoteActivityTable from permission.backends import PermissionBackend from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm + CustomAuthenticationForm, NoteActivityForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -134,7 +135,8 @@ class UserDetailView(LoginRequiredMixin, DetailView): context = super().get_context_data(**kwargs) user = context['user_object'] history_list = \ - Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id") + Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) club_list = \ Membership.objects.all().filter(user=user).only("club") @@ -179,8 +181,8 @@ class ProfileAliasView(LoginRequiredMixin, DetailView): class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView): form_class = ImageForm - def get_context_data(self, *args, **kwargs): - context = super().get_context_data(*args, **kwargs) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) context['form'] = self.form_class(self.request.POST, self.request.FILES) return context @@ -290,8 +292,8 @@ class ClubDetailView(LoginRequiredMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) club = context["club"] - club_transactions = \ - Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note)) + club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) club_member = \ Membership.objects.all().filter(club=club) @@ -317,7 +319,9 @@ class ClubUpdateView(LoginRequiredMixin, UpdateView): context_object_name = "club" form_class = ClubForm template_name = "member/club_form.html" - success_url = reverse_lazy("member:club_detail") + + def get_success_url(self): + return reverse_lazy("member:club_detail", kwargs={"pk": self.object.pk}) class ClubPictureUpdateView(PictureUpdateView): @@ -361,3 +365,77 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): def form_valid(self, formset): formset.save() return super().form_valid(formset) + + +class ClubLinkedNotesView(LoginRequiredMixin, SingleTableView): + model = NoteActivity + table_class = NoteActivityTable + + def get_queryset(self): + return super().get_queryset().filter(club=self.get_object())\ + .filter(PermissionBackend.filter_queryset(self.request.user, NoteActivity, "view")) + + def get_object(self): + if hasattr(self, 'object'): + return self.object + self.object = Club.objects.get(pk=int(self.kwargs["pk"])) + return self.object + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + ctx["object"] = ctx["club"] = self.get_object() + + return ctx + + +class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): + model = NoteActivity + form_class = NoteActivityForm + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + club = Club.objects.get(pk=self.kwargs["club_pk"]) + ctx["object"] = ctx["club"] = club + ctx["form"].fields["club"].initial = club + + return ctx + + def get_success_url(self): + self.object.refresh_from_db() + return reverse_lazy('member:club_linked_note_detail', + kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) + + +class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): + model = NoteActivity + form_class = NoteActivityForm + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + ctx["club"] = Club.objects.get(pk=self.kwargs["club_pk"]) + + return ctx + + def get_success_url(self): + return reverse_lazy('member:club_linked_note_detail', + kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) + + +class ClubLinkedNoteDetailView(LoginRequiredMixin, DetailView): + model = NoteActivity + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + note = NoteActivity.objects.get(pk=self.kwargs["pk"]) + + transactions = Transaction.objects.all().filter(Q(source=note) | Q(destination=note))\ + .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") + ctx['history_list'] = HistoryTable(transactions) + ctx["note"] = note + ctx["club"] = note.club + + return ctx diff --git a/apps/note/admin.py b/apps/note/admin.py index 702d3350..f0dede17 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from polymorphic.admin import PolymorphicChildModelAdmin, \ PolymorphicChildModelFilter, PolymorphicParentModelAdmin -from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser +from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \ RecurrentTransaction, MembershipTransaction @@ -24,7 +24,7 @@ class NoteAdmin(PolymorphicParentModelAdmin): """ Parent regrouping all note types as children """ - child_models = (NoteClub, NoteSpecial, NoteUser) + child_models = (NoteClub, NoteSpecial, NoteUser, NoteActivity) list_filter = ( PolymorphicChildModelFilter, 'is_active', @@ -74,6 +74,14 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin): readonly_fields = ('balance',) +@admin.register(NoteActivity) +class NoteActivityAdmin(PolymorphicChildModelAdmin): + """ + Child for a special note, see NoteAdmin + """ + readonly_fields = ('balance',) + + @admin.register(NoteUser) class NoteUserAdmin(PolymorphicChildModelAdmin): """ diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index fbd12038..a445fef9 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from rest_polymorphic.serializers import PolymorphicSerializer -from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias +from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, NoteActivity from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \ RecurrentTransaction, SpecialTransaction @@ -69,6 +69,22 @@ class NoteUserSerializer(serializers.ModelSerializer): return str(obj) +class NoteActivitySerializer(serializers.ModelSerializer): + """ + REST API Serializer for User's notes. + The djangorestframework plugin will analyse the model `NoteActivity` and parse all fields in the API. + """ + name = serializers.SerializerMethodField() + + class Meta: + model = NoteActivity + fields = '__all__' + read_only_fields = ('note', 'user', ) + + def get_name(self, obj): + return str(obj) + + class AliasSerializer(serializers.ModelSerializer): """ REST API Serializer for Aliases. @@ -90,7 +106,8 @@ class NotePolymorphicSerializer(PolymorphicSerializer): Note: NoteSerializer, NoteUser: NoteUserSerializer, NoteClub: NoteClubSerializer, - NoteSpecial: NoteSpecialSerializer + NoteSpecial: NoteSpecialSerializer, + NoteActivity: NoteActivitySerializer, } class Meta: diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 9282bde9..64ec524f 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -4,11 +4,13 @@ import unicodedata from django.conf import settings +from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import RegexValidator 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,40 @@ class NoteSpecial(Note): return self.special_type +class NoteActivity(Note): + """ + A :model:`note.Note` for accounts that are not attached to a user neither to a club, + that only need to store and transfer money (notes for activities, departments, ...) + """ + + note_name = models.CharField( + verbose_name=_('name'), + max_length=255, + unique=True, + ) + + club = models.ForeignKey( + Club, + on_delete=models.PROTECT, + related_name="linked_notes", + verbose_name=_("club"), + ) + + controller = models.ForeignKey( + User, + on_delete=models.PROTECT, + related_name="+", + verbose_name=_("controller"), + ) + + 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/apps/note/tables.py b/apps/note/tables.py index 0d83e3cc..2aba4684 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django.utils.html import format_html from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ -from .models.notes import Alias +from .models.notes import Alias, NoteActivity from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money @@ -121,6 +121,24 @@ class AliasTable(tables.Table): attrs={'td': {'class': 'col-sm-1'}}) +class NoteActivityTable(tables.Table): + note_name = tables.LinkColumn( + "member:club_linked_note_detail", + args=[A("club.pk"), A("pk")], + ) + + def render_balance(self, value): + return pretty_money(value) + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = NoteActivity + fields = ('note_name', 'balance',) + template_name = 'django_tables2/bootstrap4.html' + + class ButtonTable(tables.Table): class Meta: attrs = { diff --git a/static/js/base.js b/static/js/base.js index 22d1366a..7febd3d6 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -70,7 +70,7 @@ function refreshBalance() { * @param fun For each found note with the matched alias `alias`, fun(note, alias) is called. */ function getMatchedNotes(pattern, fun) { - $.getJSON("/api/note/alias/?format=json&alias=" + pattern + "&search=user|club&ordering=normalized_name", fun); + $.getJSON("/api/note/alias/?format=json&alias=" + pattern + "&search=user|club|activity&ordering=normalized_name", fun); } /** diff --git a/templates/member/club_detail.html b/templates/member/club_detail.html index 979c0897..3ad29901 100644 --- a/templates/member/club_detail.html +++ b/templates/member/club_detail.html @@ -7,3 +7,12 @@ {% block profile_content %} {% include "member/club_tables.html" %} {% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 1c8e8661..907914be 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -34,7 +34,10 @@
    {{ object.note.alias_set.all|join:", " }}
    {% trans 'email'|capfirst %}
    -
    {{ club.email}}
    +
    {{ club.email }}
    + +
    {% trans 'linked notes'|capfirst %}
    +
    {{ club.linked_notes.all|join:", " }}
    @@ -43,6 +46,6 @@ {% trans "Add roles" %} {% url 'member:club_detail' club.pk as club_detail_url %} {%if request.get_full_path != club_detail_url %} - {% trans 'View Profile' %} + {% trans 'View Profile' %} {% endif %}
    diff --git a/templates/member/noteowner_detail.html b/templates/member/noteowner_detail.html index ad329aee..fc781549 100644 --- a/templates/member/noteowner_detail.html +++ b/templates/member/noteowner_detail.html @@ -19,7 +19,7 @@ {% block extrajavascript %} +{% endblock %} diff --git a/templates/note/noteactivity_form.html b/templates/note/noteactivity_form.html new file mode 100644 index 00000000..5088c790 --- /dev/null +++ b/templates/note/noteactivity_form.html @@ -0,0 +1,16 @@ +{% extends "member/noteowner_detail.html" %} + +{% load i18n %} +{% load crispy_forms_tags %} + +{% block profile_info %} +{% include "member/club_info.html" %} +{% endblock %} + +{% block profile_content %} +
    + {% csrf_token %} + {{ form|crispy }} + +
    +{% endblock %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html new file mode 100644 index 00000000..b4d69536 --- /dev/null +++ b/templates/note/noteactivity_list.html @@ -0,0 +1,27 @@ +{% extends "member/noteowner_detail.html" %} + +{% load i18n %} +{% load render_table from django_tables2 %} + +{% block profile_info %} +{% include "member/club_info.html" %} +{% endblock %} + +{% block profile_content %} +
    +
    +
    +
    +
    {% trans "linked notes of club"|capfirst %} {{ club.name }}
    +
    +
    + {% render_table table %} +
    +
    + + + + +
    +
    +{% endblock %} From 1aae18e6a66f0bd2993dec89fdc97ff2724be7ce Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 04:16:30 +0200 Subject: [PATCH 23/66] Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) --- apps/activity/views.py | 24 +++-- apps/member/forms.py | 8 +- apps/member/views.py | 83 +++++++-------- apps/note/models/__init__.py | 4 +- apps/note/views.py | 30 +++--- apps/permission/backends.py | 5 +- apps/permission/fixtures/initial.json | 134 ++++++++++++++++++++++-- apps/permission/models.py | 17 ++- apps/permission/views.py | 11 ++ apps/treasury/forms.py | 4 +- apps/treasury/views.py | 40 ++++--- templates/note/noteactivity_detail.html | 9 +- templates/note/noteactivity_list.html | 8 +- 13 files changed, 272 insertions(+), 105 deletions(-) create mode 100644 apps/permission/views.py diff --git a/apps/activity/views.py b/apps/activity/views.py index feb7591d..51e2ebf5 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, timezone from django.contrib.auth.mixins import LoginRequiredMixin @@ -11,13 +12,14 @@ from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView from note.models import NoteUser, Alias, NoteSpecial from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import ActivityForm, GuestForm from .models import Activity, Guest, Entry from .tables import ActivityTable, GuestTable, EntryTable -class ActivityCreateView(LoginRequiredMixin, CreateView): +class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Activity form_class = ActivityForm @@ -30,13 +32,12 @@ class ActivityCreateView(LoginRequiredMixin, CreateView): return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk}) -class ActivityListView(LoginRequiredMixin, SingleTableView): +class ActivityListView(ProtectQuerysetMixin, 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() + return super().get_queryset().reverse() def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) @@ -50,7 +51,7 @@ class ActivityListView(LoginRequiredMixin, SingleTableView): return ctx -class ActivityDetailView(LoginRequiredMixin, DetailView): +class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Activity context_object_name = "activity" @@ -66,7 +67,7 @@ class ActivityDetailView(LoginRequiredMixin, DetailView): return ctx -class ActivityUpdateView(LoginRequiredMixin, UpdateView): +class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = Activity form_class = ActivityForm @@ -74,18 +75,20 @@ class ActivityUpdateView(LoginRequiredMixin, UpdateView): return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]}) -class ActivityInviteView(LoginRequiredMixin, CreateView): +class ActivityInviteView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Guest 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"]) + form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ + .get(pk=self.kwargs["pk"]) return form def form_valid(self, form): - form.instance.activity = Activity.objects.get(pk=self.kwargs["pk"]) + form.instance.activity = Activity.objects\ + .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).get(pk=self.kwargs["pk"]) return super().form_valid(form) def get_success_url(self, **kwargs): @@ -98,7 +101,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - activity = Activity.objects.get(pk=self.kwargs["pk"]) + activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ + .get(pk=self.kwargs["pk"]) ctx["activity"] = activity matched = [] diff --git a/apps/member/forms.py b/apps/member/forms.py index d731c10c..9c25f2c2 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -49,7 +49,13 @@ class ClubForm(forms.ModelForm): model = Club fields = '__all__' widgets = { - "membership_fee": AmountInput() + "membership_fee": AmountInput(), + "parent_club": Autocomplete( + Club, + attrs={ + 'api_url': '/api/members/club/', + } + ), } diff --git a/apps/member/views.py b/apps/member/views.py index e8bde67d..932899ff 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -22,6 +22,7 @@ from note.models.notes import NoteActivity from note.models.transactions import Transaction from note.tables import HistoryTable, AliasTable, NoteActivityTable from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ @@ -64,7 +65,7 @@ class UserCreateView(CreateView): return super().form_valid(form) -class UserUpdateView(LoginRequiredMixin, UpdateView): +class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = User fields = ['first_name', 'last_name', 'username', 'email'] template_name = 'member/profile_update.html' @@ -98,7 +99,8 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): if form.is_valid() and profile_form.is_valid(): new_username = form.data['username'] alias = Alias.objects.filter(name=new_username) - # Si le nouveau pseudo n'est pas un de nos alias, on supprime éventuellement un alias similaire pour le remplacer + # Si le nouveau pseudo n'est pas un de nos alias, + # on supprime éventuellement un alias similaire pour le remplacer if not alias.exists(): similar = Alias.objects.filter( normalized_name=Alias.normalize(new_username)) @@ -120,7 +122,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): return reverse_lazy('member:user_detail', args=(self.object.id,)) -class UserDetailView(LoginRequiredMixin, DetailView): +class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ Affiche les informations sur un utilisateur, sa note, ses clubs... """ @@ -128,9 +130,6 @@ class UserDetailView(LoginRequiredMixin, DetailView): context_object_name = "user_object" template_name = "member/profile_detail.html" - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, User, "view")) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) user = context['user_object'] @@ -138,13 +137,13 @@ class UserDetailView(LoginRequiredMixin, DetailView): Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) - club_list = \ - Membership.objects.all().filter(user=user).only("club") + club_list = Membership.objects.all().filter(user=user)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") context['club_list'] = ClubTable(club_list) return context -class UserListView(LoginRequiredMixin, SingleTableView): +class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ Affiche la liste des utilisateurs, avec une fonction de recherche statique """ @@ -155,7 +154,7 @@ class UserListView(LoginRequiredMixin, SingleTableView): formhelper_class = UserFilterFormHelper def get_queryset(self, **kwargs): - qs = super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, User, "view")) + qs = super().get_queryset() self.filter = self.filter_class(self.request.GET, queryset=qs) self.filter.form.helper = self.formhelper_class() return self.filter.qs @@ -166,7 +165,7 @@ class UserListView(LoginRequiredMixin, SingleTableView): return context -class ProfileAliasView(LoginRequiredMixin, DetailView): +class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = User template_name = 'member/profile_alias.html' context_object_name = 'user_object' @@ -178,7 +177,7 @@ class ProfileAliasView(LoginRequiredMixin, DetailView): return context -class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView): +class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView): form_class = ImageForm def get_context_data(self, **kwargs): @@ -239,8 +238,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): template_name = "member/manage_auth_tokens.html" def get(self, request, *args, **kwargs): - if 'regenerate' in request.GET and Token.objects.filter( - user=request.user).exists(): + if 'regenerate' in request.GET and Token.objects.filter(user=request.user).exists(): Token.objects.get(user=self.request.user).delete() return redirect(reverse_lazy('member:auth_token') + "?show", permanent=True) @@ -249,8 +247,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['token'] = Token.objects.get_or_create( - user=self.request.user)[0] + context['token'] = Token.objects.get_or_create(user=self.request.user)[0] return context @@ -259,7 +256,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView): # ******************************* # -class ClubCreateView(LoginRequiredMixin, CreateView): +class ClubCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Club """ @@ -271,38 +268,32 @@ class ClubCreateView(LoginRequiredMixin, CreateView): return super().form_valid(form) -class ClubListView(LoginRequiredMixin, SingleTableView): +class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List existing Clubs """ model = Club table_class = ClubTable - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) - -class ClubDetailView(LoginRequiredMixin, DetailView): +class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Club context_object_name = "club" - def get_queryset(self, **kwargs): - return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) - def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) club = context["club"] club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) - club_member = \ - Membership.objects.all().filter(club=club) + club_member = Membership.objects.filter(club=club)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() # TODO: consider only valid Membership context['member_list'] = club_member return context -class ClubAliasView(LoginRequiredMixin, DetailView): +class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = Club template_name = 'member/club_alias.html' context_object_name = 'club' @@ -314,7 +305,7 @@ class ClubAliasView(LoginRequiredMixin, DetailView): return context -class ClubUpdateView(LoginRequiredMixin, UpdateView): +class ClubUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = Club context_object_name = "club" form_class = ClubForm @@ -333,7 +324,7 @@ class ClubPictureUpdateView(PictureUpdateView): return reverse_lazy('member:club_detail', kwargs={'pk': self.object.id}) -class ClubAddMemberView(LoginRequiredMixin, CreateView): +class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = Membership form_class = MembershipForm template_name = 'member/add_members.html' @@ -344,7 +335,8 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): "change")) def get_context_data(self, **kwargs): - club = Club.objects.get(pk=self.kwargs["pk"]) + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) context['formset'] = MemberFormSet() context['helper'] = FormSetHelper() @@ -367,36 +359,40 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView): return super().form_valid(formset) -class ClubLinkedNotesView(LoginRequiredMixin, SingleTableView): +class ClubLinkedNotesView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): model = NoteActivity table_class = NoteActivityTable def get_queryset(self): - return super().get_queryset().filter(club=self.get_object())\ - .filter(PermissionBackend.filter_queryset(self.request.user, NoteActivity, "view")) + return super().get_queryset().filter(club=self.get_object()) def get_object(self): if hasattr(self, 'object'): return self.object - self.object = Club.objects.get(pk=int(self.kwargs["pk"])) + self.object = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=int(self.kwargs["pk"])) return self.object def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["object"] = ctx["club"] = self.get_object() + club = ctx["object"] = ctx["club"] = self.get_object() + + empty_note = NoteActivity(note_name="", club=club, controller=self.request.user) + ctx["can_create"] = PermissionBackend().has_perm(self.request.user, "note.add_noteactivity", empty_note) return ctx -class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): +class ClubLinkedNoteCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): model = NoteActivity form_class = NoteActivityForm def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - club = Club.objects.get(pk=self.kwargs["club_pk"]) + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["club_pk"]) ctx["object"] = ctx["club"] = club ctx["form"].fields["club"].initial = club @@ -408,14 +404,15 @@ class ClubLinkedNoteCreateView(LoginRequiredMixin, CreateView): kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) -class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): +class ClubLinkedNoteUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = NoteActivity form_class = NoteActivityForm def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["club"] = Club.objects.get(pk=self.kwargs["club_pk"]) + ctx["club"] = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["club_pk"]) return ctx @@ -424,15 +421,15 @@ class ClubLinkedNoteUpdateView(LoginRequiredMixin, UpdateView): kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) -class ClubLinkedNoteDetailView(LoginRequiredMixin, DetailView): +class ClubLinkedNoteDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): model = NoteActivity def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - note = NoteActivity.objects.get(pk=self.kwargs["pk"]) + note = self.get_queryset().filter(pk=self.kwargs["pk"]).get() - transactions = Transaction.objects.all().filter(Q(source=note) | Q(destination=note))\ + transactions = Transaction.objects.filter(Q(source=note) | Q(destination=note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") ctx['history_list'] = HistoryTable(transactions) ctx["note"] = note diff --git a/apps/note/models/__init__.py b/apps/note/models/__init__.py index e9c8a0a9..dd024963 100644 --- a/apps/note/models/__init__.py +++ b/apps/note/models/__init__.py @@ -1,13 +1,13 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser +from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity from .transactions import MembershipTransaction, Transaction, \ TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction __all__ = [ # Notes - 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', + 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', 'NoteActivity', # Transactions 'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate', 'RecurrentTransaction', 'SpecialTransaction', diff --git a/apps/note/views.py b/apps/note/views.py index 25279281..ac9b3e40 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -9,6 +9,7 @@ from django_tables2 import SingleTableView from django.urls import reverse_lazy from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import TransactionTemplateForm from .models import Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial @@ -16,7 +17,7 @@ from .models.transactions import SpecialTransaction from .tables import HistoryTable, ButtonTable -class TransactionCreateView(LoginRequiredMixin, SingleTableView): +class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ View for the creation of Transaction between two note which are not :models:`transactions.RecurrentTransaction`. e.g. for donation/transfer between people and clubs or for credit/debit with :models:`note.NoteSpecial` @@ -26,12 +27,9 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): model = Transaction # Transaction history table table_class = HistoryTable - table_pagination = {"per_page": 50} - def get_queryset(self): - return Transaction.objects.filter(PermissionBackend.filter_queryset( - self.request.user, Transaction, "view") - ).order_by("-id").all()[:50] + def get_queryset(self, **kwargs): + return super().get_queryset(**kwargs).order_by("-id").all()[:50] def get_context_data(self, **kwargs): """ @@ -42,12 +40,14 @@ class TransactionCreateView(LoginRequiredMixin, SingleTableView): 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() + context['special_types'] = NoteSpecial.objects\ + .filter(PermissionBackend.filter_queryset(self.request.user, NoteSpecial, "view"))\ + .order_by("special_type").all() return context -class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): +class TransactionTemplateCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create TransactionTemplate """ @@ -56,7 +56,7 @@ class TransactionTemplateCreateView(LoginRequiredMixin, CreateView): success_url = reverse_lazy('note:template_list') -class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): +class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List TransactionsTemplates """ @@ -64,7 +64,7 @@ class TransactionTemplateListView(LoginRequiredMixin, SingleTableView): table_class = ButtonTable -class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): +class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ """ model = TransactionTemplate @@ -72,21 +72,19 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView): success_url = reverse_lazy('note:template_list') -class ConsoView(LoginRequiredMixin, SingleTableView): +class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ The Magic View that make people pay their beer and burgers. (Most of the magic happens in the dark world of Javascript see consos.js) """ + model = Transaction template_name = "note/conso_form.html" # Transaction history table table_class = HistoryTable - table_pagination = {"per_page": 50} - def get_queryset(self): - return Transaction.objects.filter( - PermissionBackend.filter_queryset(self.request.user, Transaction, "view") - ).order_by("-id").all()[:50] + def get_queryset(self, **kwargs): + return super().get_queryset(**kwargs).order_by("-id").all()[:50] def get_context_data(self, **kwargs): """ diff --git a/apps/permission/backends.py b/apps/permission/backends.py index e61b0719..f838fc1f 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -5,7 +5,7 @@ from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.db.models import Q, F -from note.models import Note, NoteUser, NoteClub, NoteSpecial +from note.models import Note, NoteUser, NoteClub, NoteSpecial, NoteActivity from note_kfet.middlewares import get_current_session from member.models import Membership, Club @@ -35,7 +35,7 @@ class PermissionBackend(ModelBackend): model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): - if not isinstance(model, permission.model.__class__): + if not isinstance(model, permission.model.__class__) or not permission.club: continue club = Club.objects.get(pk=permission.club) @@ -49,6 +49,7 @@ class PermissionBackend(ModelBackend): NoteUser=NoteUser, NoteClub=NoteClub, NoteSpecial=NoteSpecial, + NoteActivity=NoteActivity, F=F, Q=Q ) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 31b59069..e0430530 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -176,7 +176,7 @@ "note", "alias" ], - "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]", + "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}, {\"note__in\": [\"NoteActivity\", \"objects\", [\"all\"]]}]", "type": "view", "mask": 1, "field": "", @@ -386,7 +386,7 @@ "note", "transaction" ], - "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}]", + "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, "field": "", @@ -783,6 +783,111 @@ "description": "Validate invitation transactions" } }, + { + "model": "permission.permission", + "pk": 47, + "fields": { + "model": [ + "member", + "club" + ], + "query": "{\"pk\": [\"club\", \"pk\"]}", + "type": "change", + "mask": 1, + "field": "", + "description": "Update club" + } + }, + { + "model": "permission.permission", + "pk": 48, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"club\": [\"club\"]}", + "type": "change", + "mask": 1, + "field": "", + "description": "Manage notes that are linked to a club" + } + }, + { + "model": "permission.permission", + "pk": 49, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"club\": [\"club\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View notes that are linked to a club" + } + }, + { + "model": "permission.permission", + "pk": 50, + "fields": { + "model": [ + "note", + "transaction" + ], + "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", + "type": "add", + "mask": 2, + "field": "", + "description": "Add transactions linked to a noteactivity" + } + }, + { + "model": "permission.permission", + "pk": 51, + "fields": { + "model": [ + "note", + "transaction" + ], + "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}]]", + "type": "view", + "mask": 1, + "field": "", + "description": "View transactions linked to a noteactivity" + } + }, + { + "model": "permission.permission", + "pk": 52, + "fields": { + "model": [ + "note", + "note" + ], + "query": "{\"noteactivity__controller\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View note activity" + } + }, + { + "model": "permission.permission", + "pk": 53, + "fields": { + "model": [ + "note", + "noteactivity" + ], + "query": "{\"controller\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View note activity" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -810,7 +915,6 @@ 3, 4, 5, - 6, 7, 8, 9, @@ -827,7 +931,12 @@ 35, 36, 39, - 40 + 40, + 6, + 52, + 53, + 51, + 50 ] } }, @@ -838,9 +947,9 @@ "role": 8, "permissions": [ 19, - 20, 21, - 22 + 22, + 20 ] } }, @@ -880,5 +989,18 @@ 46 ] } + }, + { + "model": "permission.rolepermissions", + "pk": 6, + "fields": { + "role": 7, + "permissions": [ + 22, + 47, + 48, + 49 + ] + } } ] diff --git a/apps/permission/models.py b/apps/permission/models.py index 205f5b41..d1b55090 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -38,20 +38,29 @@ class InstancedPermission: if permission_type == self.type: self.update_query() - # Don't increase indexes - obj.pk = 0 + # Don't increase indexes, if the primary key is an AutoField + if not hasattr(obj, "pk") or not obj.pk: + obj.pk = 0 + oldpk = None + else: + oldpk = obj.pk + # Ensure previous models are deleted + self.model.model_class().objects.filter(pk=obj.pk).delete() # Force insertion, no data verification, no trigger Model.save(obj, force_insert=True) - ret = obj in self.model.model_class().objects.filter(self.query).all() + ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object Model.delete(obj) + + # If the primary key was specified, we restore it + obj.pk = oldpk return ret if permission_type == self.type: if self.field and field_name != self.field: return False self.update_query() - return obj in self.model.model_class().objects.filter(self.query).all() + return self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() else: return False diff --git a/apps/permission/views.py b/apps/permission/views.py new file mode 100644 index 00000000..bbd9872f --- /dev/null +++ b/apps/permission/views.py @@ -0,0 +1,11 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from permission.backends import PermissionBackend + + +class ProtectQuerysetMixin: + def get_queryset(self, **kwargs): + qs = super().get_queryset(**kwargs) + + return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")) diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index 7fe7de4c..ad479e14 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -8,6 +8,7 @@ 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 permission.backends import PermissionBackend from .models import Invoice, Product, Remittance, SpecialTransactionProxy @@ -131,7 +132,8 @@ class LinkTransactionToRemittanceForm(forms.ModelForm): # Add submit button self.helper.add_input(Submit('submit', _("Submit"), attr={'class': 'btn btn-block btn-primary'})) - self.fields["remittance"].queryset = Remittance.objects.filter(closed=False) + self.fields["remittance"].queryset = Remittance.objects.filter(closed=False)\ + .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) def clean_last_name(self): """ diff --git a/apps/treasury/views.py b/apps/treasury/views.py index c374ced1..adf38aaa 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -19,13 +19,15 @@ from django.views.generic.base import View, TemplateView from django_tables2 import SingleTableView from note.models import SpecialTransaction, NoteSpecial from note_kfet.settings.base import BASE_DIR +from permission.backends import PermissionBackend +from permission.views import ProtectQuerysetMixin from .forms import InvoiceForm, ProductFormSet, ProductFormSetHelper, RemittanceForm, LinkTransactionToRemittanceForm from .models import Invoice, Product, Remittance, SpecialTransactionProxy from .tables import InvoiceTable, RemittanceTable, SpecialTransactionTable -class InvoiceCreateView(LoginRequiredMixin, CreateView): +class InvoiceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Invoice """ @@ -67,7 +69,7 @@ class InvoiceCreateView(LoginRequiredMixin, CreateView): return reverse_lazy('treasury:invoice_list') -class InvoiceListView(LoginRequiredMixin, SingleTableView): +class InvoiceListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List existing Invoices """ @@ -75,7 +77,7 @@ class InvoiceListView(LoginRequiredMixin, SingleTableView): table_class = InvoiceTable -class InvoiceUpdateView(LoginRequiredMixin, UpdateView): +class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Create Invoice """ @@ -130,7 +132,7 @@ class InvoiceRenderView(LoginRequiredMixin, View): def get(self, request, **kwargs): pk = kwargs["pk"] - invoice = Invoice.objects.get(pk=pk) + invoice = Invoice.objects.filter(PermissionBackend.filter_queryset(request.user, Invoice, "view")).get(pk=pk) products = Product.objects.filter(invoice=invoice).all() # Informations of the BDE. Should be updated when the school will move. @@ -188,7 +190,7 @@ class InvoiceRenderView(LoginRequiredMixin, View): return response -class RemittanceCreateView(LoginRequiredMixin, CreateView): +class RemittanceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ Create Remittance """ @@ -201,7 +203,9 @@ class RemittanceCreateView(LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.all()) + ctx["table"] = RemittanceTable(data=Remittance.objects + .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) + .all()) ctx["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) return ctx @@ -216,22 +220,28 @@ class RemittanceListView(LoginRequiredMixin, TemplateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["opened_remittances"] = RemittanceTable(data=Remittance.objects.filter(closed=False).all()) - ctx["closed_remittances"] = RemittanceTable(data=Remittance.objects.filter(closed=True).reverse().all()) + ctx["opened_remittances"] = RemittanceTable( + data=Remittance.objects.filter(closed=False).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + ctx["closed_remittances"] = RemittanceTable( + data=Remittance.objects.filter(closed=True).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all()) ctx["special_transactions_no_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), - specialtransactionproxy__remittance=None).all(), + specialtransactionproxy__remittance=None).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_remove', )) ctx["special_transactions_with_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), - specialtransactionproxy__remittance__closed=False).all(), + specialtransactionproxy__remittance__closed=False).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_add', )) return ctx -class RemittanceUpdateView(LoginRequiredMixin, UpdateView): +class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Update Remittance """ @@ -244,8 +254,10 @@ class RemittanceUpdateView(LoginRequiredMixin, UpdateView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.all()) - data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).all() + ctx["table"] = RemittanceTable(data=Remittance.objects.filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() ctx["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) @@ -253,7 +265,7 @@ class RemittanceUpdateView(LoginRequiredMixin, UpdateView): return ctx -class LinkTransactionToRemittanceView(LoginRequiredMixin, UpdateView): +class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Attach a special transaction to a remittance """ diff --git a/templates/note/noteactivity_detail.html b/templates/note/noteactivity_detail.html index 731707f6..aab9e055 100644 --- a/templates/note/noteactivity_detail.html +++ b/templates/note/noteactivity_detail.html @@ -3,6 +3,7 @@ {% load i18n %} {% load render_table from django_tables2 %} {% load pretty_money %} +{% load perms %} {% block profile_info %} {% include "member/club_info.html" %} @@ -25,9 +26,11 @@
    {{ note.balance|pretty_money }}
    -
    - {% trans "Edit" %} -
    + {% if "change_"|has_perm:note %} +
    + {% trans "Edit" %} +
    + {% endif %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html index b4d69536..3cd5b786 100644 --- a/templates/note/noteactivity_list.html +++ b/templates/note/noteactivity_list.html @@ -19,9 +19,11 @@ - - - + {% if can_create %} + + + + {% endif %} {% endblock %} From 12945945bc57308e568f05a49459285b985d3917 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 14:10:30 +0200 Subject: [PATCH 24/66] Update translations --- apps/note/models/notes.py | 4 +- apps/treasury/views.py | 4 +- locale/de/LC_MESSAGES/django.po | 162 +++++++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 165 ++++++++++++++++++++------------ 4 files changed, 206 insertions(+), 129 deletions(-) diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 64ec524f..1228ca00 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -203,8 +203,8 @@ class NoteActivity(Note): ) class Meta: - verbose_name = _("common note") - verbose_name_plural = _("common notes") + verbose_name = _("activity note") + verbose_name_plural = _("activity notes") def __str__(self): return self.note_name diff --git a/apps/treasury/views.py b/apps/treasury/views.py index adf38aaa..f564ccb2 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -255,9 +255,9 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView) ctx = super().get_context_data(**kwargs) ctx["table"] = RemittanceTable(data=Remittance.objects.filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() ctx["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e2c8075e..c83bf321 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 17:31+0200\n" +"POT-Creation-Date: 2020-03-31 04:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,9 +45,10 @@ 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/transactions.py:44 apps/note/models/transactions.py:231 -#: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 +#: 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 "" @@ -68,18 +69,18 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:60 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:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:117 +#: apps/note/models/notes.py:119 msgid "user" msgstr "" @@ -88,7 +89,7 @@ msgid "organizer" msgstr "" #: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/note/models/notes.py:60 msgid "note" msgstr "" @@ -169,16 +170,16 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +#: apps/activity/tables.py:77 apps/treasury/forms.py:121 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: apps/activity/tables.py:79 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:92 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 "" @@ -186,11 +187,11 @@ msgstr "" msgid "Balance" msgstr "" -#: apps/activity/views.py:44 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:94 msgid "Activities" msgstr "" -#: apps/activity/views.py:149 +#: apps/activity/views.py:153 msgid "Entry for activity \"{}\"" msgstr "" @@ -226,12 +227,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 msgid "delete" msgstr "" @@ -313,7 +314,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:195 msgid "club" msgstr "" @@ -321,7 +323,7 @@ msgstr "" msgid "clubs" msgstr "" -#: apps/member/models.py:128 apps/permission/models.py:275 +#: apps/member/models.py:128 apps/permission/models.py:284 msgid "role" msgstr "" @@ -353,19 +355,19 @@ msgstr "" msgid "memberships" msgstr "" -#: apps/member/views.py:76 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:89 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "" -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:128 apps/note/models/transactions.py:94 msgid "source" msgstr "" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:136 apps/note/admin.py:164 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -378,104 +380,116 @@ 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:202 templates/note/noteactivity_detail.html:22 +msgid "controller" +msgstr "" + +#: apps/note/models/notes.py:206 +msgid "activity note" +msgstr "" + +#: apps/note/models/notes.py:207 +msgid "activity notes" +msgstr "" + +#: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:246 msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:247 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:269 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:274 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:287 msgid "You can't delete your main alias." msgstr "" @@ -578,29 +592,29 @@ msgstr "" msgid "No reason specified" msgstr "" -#: apps/note/views.py:41 +#: apps/note/views.py:39 msgid "Transfer money" msgstr "" -#: apps/note/views.py:102 templates/base.html:79 +#: apps/note/views.py:100 templates/base.html:79 msgid "Consumptions" msgstr "" -#: apps/permission/models.py:69 apps/permission/models.py:262 +#: apps/permission/models.py:78 apps/permission/models.py:271 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:71 apps/permission/models.py:264 +#: apps/permission/models.py:80 apps/permission/models.py:273 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:84 +#: apps/permission/models.py:93 msgid "rank" msgstr "" -#: apps/permission/models.py:147 +#: apps/permission/models.py:156 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -608,31 +622,32 @@ msgstr "" msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: 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:9 templates/treasury/invoice_form.html:46 +#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:87 msgid "Close" msgstr "" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:96 msgid "Remittance is already closed." msgstr "" -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:101 msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:98 msgid "Bank" msgstr "" -#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -879,19 +894,24 @@ msgstr "" msgid "Club Parent" msgstr "" -#: templates/member/club_info.html:41 +#: templates/member/club_info.html:39 +msgid "linked notes" +msgstr "" + +#: templates/member/club_info.html:44 msgid "Add member" msgstr "" -#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:46 msgid "Add roles" msgstr "" -#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +#: templates/member/club_info.html:49 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" @@ -912,6 +932,7 @@ msgid "Member of the Club" msgstr "" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "" @@ -944,6 +965,7 @@ msgid "Change password" msgstr "" #: templates/member/profile_info.html:33 +#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "" @@ -992,6 +1014,22 @@ msgstr "" msgid "Recent transactions history" msgstr "" +#: templates/note/noteactivity_detail.html:15 +msgid "Linked note:" +msgstr "" + +#: templates/note/noteactivity_detail.html:19 +msgid "attached club" +msgstr "" + +#: templates/note/noteactivity_list.html:15 +msgid "linked notes of club" +msgstr "" + +#: templates/note/noteactivity_list.html:24 +msgid "Add new note" +msgstr "" + #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 08c1b174..cd01499d 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 17:31+0200\n" +"POT-Creation-Date: 2020-03-31 04:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,8 @@ msgstr "activité" #: 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é." +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." @@ -40,9 +41,10 @@ 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/transactions.py:44 apps/note/models/transactions.py:231 -#: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: apps/note/models/notes.py:186 apps/note/models/notes.py:224 +#: 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" @@ -63,18 +65,18 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:90 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:60 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:66 apps/logs/models.py:21 -#: apps/note/models/notes.py:117 +#: apps/note/models/notes.py:119 msgid "user" msgstr "utilisateur" @@ -83,7 +85,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:58 +#: apps/note/models/notes.py:60 msgid "note" msgstr "note" @@ -164,16 +166,16 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/treasury/forms.py:120 +#: apps/activity/tables.py:77 apps/treasury/forms.py:121 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/treasury/forms.py:122 +#: apps/activity/tables.py:79 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:92 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" @@ -181,11 +183,11 @@ msgstr "Note" msgid "Balance" msgstr "Solde du compte" -#: apps/activity/views.py:44 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:94 msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:149 +#: apps/activity/views.py:153 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -221,12 +223,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 msgid "delete" msgstr "Supprimer" @@ -312,7 +314,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:195 msgid "club" msgstr "club" @@ -320,7 +323,7 @@ msgstr "club" msgid "clubs" msgstr "clubs" -#: apps/member/models.py:128 apps/permission/models.py:275 +#: apps/member/models.py:128 apps/permission/models.py:284 msgid "role" msgstr "rôle" @@ -352,19 +355,19 @@ msgstr "adhésion" msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:76 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:89 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:128 apps/note/models/transactions.py:94 msgid "source" msgstr "source" -#: apps/note/admin.py:128 apps/note/admin.py:156 +#: apps/note/admin.py:136 apps/note/admin.py:164 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -377,105 +380,117 @@ 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:202 templates/note/noteactivity_detail.html:22 +msgid "controller" +msgstr "contrôleur" + +#: apps/note/models/notes.py:206 +msgid "activity note" +msgstr "note d'activité" + +#: apps/note/models/notes.py:207 +msgid "activity notes" +msgstr "notes d'activité" + +#: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:246 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:33 +#: apps/note/models/notes.py:247 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:269 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:274 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:287 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -578,29 +593,29 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/views.py:41 +#: apps/note/views.py:39 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:102 templates/base.html:79 +#: apps/note/views.py:100 templates/base.html:79 msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:69 apps/permission/models.py:262 +#: apps/permission/models.py:78 apps/permission/models.py:271 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:71 apps/permission/models.py:264 +#: apps/permission/models.py:80 apps/permission/models.py:273 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:84 +#: apps/permission/models.py:93 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:147 +#: apps/permission/models.py:156 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -608,31 +623,32 @@ msgstr "" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:85 apps/treasury/forms.py:133 #: 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:9 templates/treasury/invoice_form.html:46 +#: templates/member/club_form.html:9 templates/note/noteactivity_form.html:14 +#: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:87 msgid "Close" msgstr "Fermer" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:96 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:101 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:124 templates/note/transaction_form.html:98 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:98 msgid "Bank" msgstr "Banque" -#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -881,19 +897,24 @@ msgstr "Ajouter un alias" msgid "Club Parent" msgstr "Club parent" -#: templates/member/club_info.html:41 +#: templates/member/club_info.html:39 +msgid "linked notes" +msgstr "notes liées" + +#: templates/member/club_info.html:44 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:42 templates/note/conso_form.html:121 +#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:46 msgid "Add roles" msgstr "Ajouter des rôles" -#: templates/member/club_info.html:46 templates/member/profile_info.html:48 +#: templates/member/club_info.html:49 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -914,6 +935,7 @@ msgid "Member of the Club" msgstr "Membre du club" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "Historique des transactions" @@ -946,6 +968,7 @@ msgid "Change password" msgstr "Changer le mot de passe" #: templates/member/profile_info.html:33 +#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "solde du compte" @@ -994,6 +1017,22 @@ msgstr "Consommations doubles" msgid "Recent transactions history" msgstr "Historique des transactions récentes" +#: templates/note/noteactivity_detail.html:15 +msgid "Linked note:" +msgstr "note attachée :" + +#: templates/note/noteactivity_detail.html:19 +msgid "attached club" +msgstr "club lié" + +#: templates/note/noteactivity_list.html:15 +msgid "linked notes of club" +msgstr "Notes liées au club" + +#: templates/note/noteactivity_list.html:24 +msgid "Add new note" +msgstr "Ajouter une note" + #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "Don" From dd3b7bd7e5ab6a5c598e8f1afdece81516bfc14e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 14:57:44 +0200 Subject: [PATCH 25/66] Remove note activities --- apps/member/forms.py | 23 ----- apps/member/urls.py | 8 -- apps/member/views.py | 84 +------------------ apps/note/admin.py | 12 +-- apps/note/api/serializers.py | 19 +---- apps/note/models/__init__.py | 4 +- apps/note/models/notes.py | 36 -------- apps/note/tables.py | 20 +---- apps/permission/backends.py | 3 +- apps/permission/fixtures/initial.json | 106 ++---------------------- locale/de/LC_MESSAGES/django.po | 33 +------- locale/fr/LC_MESSAGES/django.po | 33 +------- templates/note/noteactivity_detail.html | 60 -------------- templates/note/noteactivity_form.html | 16 ---- templates/note/noteactivity_list.html | 29 ------- 15 files changed, 16 insertions(+), 470 deletions(-) delete mode 100644 templates/note/noteactivity_detail.html delete mode 100644 templates/note/noteactivity_form.html delete mode 100644 templates/note/noteactivity_list.html diff --git a/apps/member/forms.py b/apps/member/forms.py index 9c25f2c2..80c2b49e 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.models.notes import NoteActivity from note_kfet.inputs import Autocomplete, AmountInput from permission.models import PermissionMask @@ -59,28 +58,6 @@ class ClubForm(forms.ModelForm): } -class NoteActivityForm(forms.ModelForm): - class Meta: - model = NoteActivity - fields = ('note_name', 'club', 'controller', ) - widgets = { - "club": Autocomplete( - Club, - attrs={ - 'api_url': '/api/members/club/', - } - ), - "controller": Autocomplete( - User, - attrs={ - 'api_url': '/api/user/', - 'name_field': 'username', - 'placeholder': 'Nom ...', - } - ) - } - - class AddMembersForm(forms.Form): class Meta: fields = ('',) diff --git a/apps/member/urls.py b/apps/member/urls.py index f1a5c2bd..7f4bf0d5 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -16,14 +16,6 @@ urlpatterns = [ path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), - path('club//linked_notes/', views.ClubLinkedNotesView.as_view(), - name="club_linked_note_list"), - path('club//linked_notes/create/', views.ClubLinkedNoteCreateView.as_view(), - name="club_linked_note_create"), - path('club//linked_notes//', views.ClubLinkedNoteDetailView.as_view(), - name="club_linked_note_detail"), - path('club//linked_notes//update/', views.ClubLinkedNoteUpdateView.as_view(), - name="club_linked_note_update"), path('user/', views.UserListView.as_view(), name="user_list"), path('user/', views.UserDetailView.as_view(), name="user_detail"), diff --git a/apps/member/views.py b/apps/member/views.py index 932899ff..9ca7d76a 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -18,15 +18,14 @@ from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm from note.models import Alias, NoteUser -from note.models.notes import NoteActivity from note.models.transactions import Transaction -from note.tables import HistoryTable, AliasTable, NoteActivityTable +from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm, NoteActivityForm + CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -357,82 +356,3 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): def form_valid(self, formset): formset.save() return super().form_valid(formset) - - -class ClubLinkedNotesView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): - model = NoteActivity - table_class = NoteActivityTable - - def get_queryset(self): - return super().get_queryset().filter(club=self.get_object()) - - def get_object(self): - if hasattr(self, 'object'): - return self.object - self.object = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=int(self.kwargs["pk"])) - return self.object - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - club = ctx["object"] = ctx["club"] = self.get_object() - - empty_note = NoteActivity(note_name="", club=club, controller=self.request.user) - ctx["can_create"] = PermissionBackend().has_perm(self.request.user, "note.add_noteactivity", empty_note) - - return ctx - - -class ClubLinkedNoteCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): - model = NoteActivity - form_class = NoteActivityForm - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["club_pk"]) - ctx["object"] = ctx["club"] = club - ctx["form"].fields["club"].initial = club - - return ctx - - def get_success_url(self): - self.object.refresh_from_db() - return reverse_lazy('member:club_linked_note_detail', - kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) - - -class ClubLinkedNoteUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): - model = NoteActivity - form_class = NoteActivityForm - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - ctx["club"] = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["club_pk"]) - - return ctx - - def get_success_url(self): - return reverse_lazy('member:club_linked_note_detail', - kwargs={"club_pk": self.object.club.pk, "pk": self.object.pk}) - - -class ClubLinkedNoteDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): - model = NoteActivity - - def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) - - note = self.get_queryset().filter(pk=self.kwargs["pk"]).get() - - transactions = Transaction.objects.filter(Q(source=note) | Q(destination=note))\ - .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by("-id") - ctx['history_list'] = HistoryTable(transactions) - ctx["note"] = note - ctx["club"] = note.club - - return ctx diff --git a/apps/note/admin.py b/apps/note/admin.py index f0dede17..702d3350 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from polymorphic.admin import PolymorphicChildModelAdmin, \ PolymorphicChildModelFilter, PolymorphicParentModelAdmin -from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity +from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \ RecurrentTransaction, MembershipTransaction @@ -24,7 +24,7 @@ class NoteAdmin(PolymorphicParentModelAdmin): """ Parent regrouping all note types as children """ - child_models = (NoteClub, NoteSpecial, NoteUser, NoteActivity) + child_models = (NoteClub, NoteSpecial, NoteUser) list_filter = ( PolymorphicChildModelFilter, 'is_active', @@ -74,14 +74,6 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin): readonly_fields = ('balance',) -@admin.register(NoteActivity) -class NoteActivityAdmin(PolymorphicChildModelAdmin): - """ - Child for a special note, see NoteAdmin - """ - readonly_fields = ('balance',) - - @admin.register(NoteUser) class NoteUserAdmin(PolymorphicChildModelAdmin): """ diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index a445fef9..5625e5b5 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from rest_polymorphic.serializers import PolymorphicSerializer -from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, NoteActivity +from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \ RecurrentTransaction, SpecialTransaction @@ -69,22 +69,6 @@ class NoteUserSerializer(serializers.ModelSerializer): return str(obj) -class NoteActivitySerializer(serializers.ModelSerializer): - """ - REST API Serializer for User's notes. - The djangorestframework plugin will analyse the model `NoteActivity` and parse all fields in the API. - """ - name = serializers.SerializerMethodField() - - class Meta: - model = NoteActivity - fields = '__all__' - read_only_fields = ('note', 'user', ) - - def get_name(self, obj): - return str(obj) - - class AliasSerializer(serializers.ModelSerializer): """ REST API Serializer for Aliases. @@ -107,7 +91,6 @@ class NotePolymorphicSerializer(PolymorphicSerializer): NoteUser: NoteUserSerializer, NoteClub: NoteClubSerializer, NoteSpecial: NoteSpecialSerializer, - NoteActivity: NoteActivitySerializer, } class Meta: diff --git a/apps/note/models/__init__.py b/apps/note/models/__init__.py index dd024963..e9c8a0a9 100644 --- a/apps/note/models/__init__.py +++ b/apps/note/models/__init__.py @@ -1,13 +1,13 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, NoteActivity +from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser from .transactions import MembershipTransaction, Transaction, \ TemplateCategory, TransactionTemplate, RecurrentTransaction, SpecialTransaction __all__ = [ # Notes - 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', 'NoteActivity', + 'Alias', 'Note', 'NoteClub', 'NoteSpecial', 'NoteUser', # Transactions 'MembershipTransaction', 'Transaction', 'TemplateCategory', 'TransactionTemplate', 'RecurrentTransaction', 'SpecialTransaction', diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 1228ca00..9282bde9 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -4,13 +4,11 @@ import unicodedata from django.conf import settings -from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import RegexValidator 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 @@ -176,40 +174,6 @@ class NoteSpecial(Note): return self.special_type -class NoteActivity(Note): - """ - A :model:`note.Note` for accounts that are not attached to a user neither to a club, - that only need to store and transfer money (notes for activities, departments, ...) - """ - - note_name = models.CharField( - verbose_name=_('name'), - max_length=255, - unique=True, - ) - - club = models.ForeignKey( - Club, - on_delete=models.PROTECT, - related_name="linked_notes", - verbose_name=_("club"), - ) - - controller = models.ForeignKey( - User, - on_delete=models.PROTECT, - related_name="+", - verbose_name=_("controller"), - ) - - class Meta: - verbose_name = _("activity note") - verbose_name_plural = _("activity 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/apps/note/tables.py b/apps/note/tables.py index 2aba4684..0d83e3cc 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -9,7 +9,7 @@ from django.utils.html import format_html from django_tables2.utils import A from django.utils.translation import gettext_lazy as _ -from .models.notes import Alias, NoteActivity +from .models.notes import Alias from .models.transactions import Transaction, TransactionTemplate from .templatetags.pretty_money import pretty_money @@ -121,24 +121,6 @@ class AliasTable(tables.Table): attrs={'td': {'class': 'col-sm-1'}}) -class NoteActivityTable(tables.Table): - note_name = tables.LinkColumn( - "member:club_linked_note_detail", - args=[A("club.pk"), A("pk")], - ) - - def render_balance(self, value): - return pretty_money(value) - - class Meta: - attrs = { - 'class': 'table table-condensed table-striped table-hover' - } - model = NoteActivity - fields = ('note_name', 'balance',) - template_name = 'django_tables2/bootstrap4.html' - - class ButtonTable(tables.Table): class Meta: attrs = { diff --git a/apps/permission/backends.py b/apps/permission/backends.py index f838fc1f..30a273cc 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -5,7 +5,7 @@ from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.db.models import Q, F -from note.models import Note, NoteUser, NoteClub, NoteSpecial, NoteActivity +from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club @@ -49,7 +49,6 @@ class PermissionBackend(ModelBackend): NoteUser=NoteUser, NoteClub=NoteClub, NoteSpecial=NoteSpecial, - NoteActivity=NoteActivity, F=F, Q=Q ) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index e0430530..04920cfb 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -176,7 +176,7 @@ "note", "alias" ], - "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}, {\"note__in\": [\"NoteActivity\", \"objects\", [\"all\"]]}]", + "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]", "type": "view", "mask": 1, "field": "", @@ -798,96 +798,6 @@ "description": "Update club" } }, - { - "model": "permission.permission", - "pk": 48, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"club\": [\"club\"]}", - "type": "change", - "mask": 1, - "field": "", - "description": "Manage notes that are linked to a club" - } - }, - { - "model": "permission.permission", - "pk": 49, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"club\": [\"club\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View notes that are linked to a club" - } - }, - { - "model": "permission.permission", - "pk": 50, - "fields": { - "model": [ - "note", - "transaction" - ], - "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", - "type": "add", - "mask": 2, - "field": "", - "description": "Add transactions linked to a noteactivity" - } - }, - { - "model": "permission.permission", - "pk": 51, - "fields": { - "model": [ - "note", - "transaction" - ], - "query": "[\"AND\", [\"OR\", {\"source__noteactivity__controller\": [\"user\"]}, {\"destination__noteactivity__controller\": [\"user\"]}]]", - "type": "view", - "mask": 1, - "field": "", - "description": "View transactions linked to a noteactivity" - } - }, - { - "model": "permission.permission", - "pk": 52, - "fields": { - "model": [ - "note", - "note" - ], - "query": "{\"noteactivity__controller\": [\"user\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View note activity" - } - }, - { - "model": "permission.permission", - "pk": 53, - "fields": { - "model": [ - "note", - "noteactivity" - ], - "query": "{\"controller\": [\"user\"]}", - "type": "view", - "mask": 1, - "field": "", - "description": "View note activity" - } - }, { "model": "permission.rolepermissions", "pk": 1, @@ -915,6 +825,7 @@ 3, 4, 5, + 6, 7, 8, 9, @@ -932,11 +843,6 @@ 36, 39, 40, - 6, - 52, - 53, - 51, - 50 ] } }, @@ -947,9 +853,9 @@ "role": 8, "permissions": [ 19, + 20, 21, - 22, - 20 + 22 ] } }, @@ -997,9 +903,7 @@ "role": 7, "permissions": [ 22, - 47, - 48, - 49 + 47 ] } } diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c83bf321..695bdf95 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -456,18 +456,6 @@ msgstr "" msgid "special notes" msgstr "" -#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 -msgid "controller" -msgstr "" - -#: apps/note/models/notes.py:206 -msgid "activity note" -msgstr "" - -#: apps/note/models/notes.py:207 -msgid "activity notes" -msgstr "" - #: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "" @@ -626,7 +614,7 @@ msgstr "" #: 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:9 templates/note/noteactivity_form.html:14 +#: templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" @@ -903,7 +891,6 @@ msgid "Add member" msgstr "" #: templates/member/club_info.html:45 templates/note/conso_form.html:121 -#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "" @@ -932,7 +919,6 @@ msgid "Member of the Club" msgstr "" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 -#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "" @@ -965,7 +951,6 @@ msgid "Change password" msgstr "" #: templates/member/profile_info.html:33 -#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "" @@ -1014,22 +999,6 @@ msgstr "" msgid "Recent transactions history" msgstr "" -#: templates/note/noteactivity_detail.html:15 -msgid "Linked note:" -msgstr "" - -#: templates/note/noteactivity_detail.html:19 -msgid "attached club" -msgstr "" - -#: templates/note/noteactivity_list.html:15 -msgid "linked notes of club" -msgstr "" - -#: templates/note/noteactivity_list.html:24 -msgid "Add new note" -msgstr "" - #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index cd01499d..d2a78d06 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -457,18 +457,6 @@ msgstr "note spéciale" msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:202 templates/note/noteactivity_detail.html:22 -msgid "controller" -msgstr "contrôleur" - -#: apps/note/models/notes.py:206 -msgid "activity note" -msgstr "note d'activité" - -#: apps/note/models/notes.py:207 -msgid "activity notes" -msgstr "notes d'activité" - #: apps/note/models/notes.py:230 msgid "Invalid alias" msgstr "Alias invalide" @@ -627,7 +615,7 @@ msgstr "Trésorerie" #: 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:9 templates/note/noteactivity_form.html:14 +#: templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" @@ -906,7 +894,6 @@ msgid "Add member" msgstr "Ajouter un membre" #: templates/member/club_info.html:45 templates/note/conso_form.html:121 -#: templates/note/noteactivity_detail.html:31 msgid "Edit" msgstr "Éditer" @@ -935,7 +922,6 @@ msgid "Member of the Club" msgstr "Membre du club" #: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 -#: templates/note/noteactivity_detail.html:42 msgid "Transaction history" msgstr "Historique des transactions" @@ -968,7 +954,6 @@ msgid "Change password" msgstr "Changer le mot de passe" #: templates/member/profile_info.html:33 -#: templates/note/noteactivity_detail.html:25 msgid "balance" msgstr "solde du compte" @@ -1017,22 +1002,6 @@ msgstr "Consommations doubles" msgid "Recent transactions history" msgstr "Historique des transactions récentes" -#: templates/note/noteactivity_detail.html:15 -msgid "Linked note:" -msgstr "note attachée :" - -#: templates/note/noteactivity_detail.html:19 -msgid "attached club" -msgstr "club lié" - -#: templates/note/noteactivity_list.html:15 -msgid "linked notes of club" -msgstr "Notes liées au club" - -#: templates/note/noteactivity_list.html:24 -msgid "Add new note" -msgstr "Ajouter une note" - #: templates/note/transaction_form.html:15 msgid "Gift" msgstr "Don" diff --git a/templates/note/noteactivity_detail.html b/templates/note/noteactivity_detail.html deleted file mode 100644 index aab9e055..00000000 --- a/templates/note/noteactivity_detail.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load render_table from django_tables2 %} -{% load pretty_money %} -{% load perms %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
    -
    -

    {% trans "Linked note:" %} {{ note.note_name }}

    -
    -
    -
    -
    {% trans 'attached club'|capfirst %}
    -
    {{ club }}
    - -
    {% trans 'controller'|capfirst %}
    -
    {{ note.controller }}
    - -
    {% trans 'balance'|capfirst %}
    -
    {{ note.balance|pretty_money }}
    -
    - - {% if "change_"|has_perm:note %} -
    - {% trans "Edit" %} -
    - {% endif %} -
    - - -
    - -
    -
    - {% render_table history_list %} -
    -
    -
    -{% endblock %} - -{% block extrajavascript %} - -{% endblock %} diff --git a/templates/note/noteactivity_form.html b/templates/note/noteactivity_form.html deleted file mode 100644 index 5088c790..00000000 --- a/templates/note/noteactivity_form.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
    - {% csrf_token %} - {{ form|crispy }} - -
    -{% endblock %} diff --git a/templates/note/noteactivity_list.html b/templates/note/noteactivity_list.html deleted file mode 100644 index 3cd5b786..00000000 --- a/templates/note/noteactivity_list.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "member/noteowner_detail.html" %} - -{% load i18n %} -{% load render_table from django_tables2 %} - -{% block profile_info %} -{% include "member/club_info.html" %} -{% endblock %} - -{% block profile_content %} -
    -
    -
    -
    -
    {% trans "linked notes of club"|capfirst %} {{ club.name }}
    -
    -
    - {% render_table table %} -
    -
    - - {% if can_create %} - - - - {% endif %} -
    -
    -{% endblock %} From e98693b21403d32f0e2d91a379f964ab8ef4f6f7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 16:22:11 +0200 Subject: [PATCH 26/66] Memberships are optional for clubs --- apps/member/fixtures/initial.json | 2 ++ apps/member/models.py | 21 +++++++++++++++++++++ apps/permission/fixtures/initial.json | 2 +- templates/member/club_form.html | 20 ++++++++++++++++++++ templates/member/club_info.html | 21 ++++++++++----------- 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index bba1e7ac..649cbbc1 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -5,6 +5,7 @@ "fields": { "name": "BDE", "email": "tresorerie.bde@example.com", + "require_memberships": true, "membership_fee": 500, "membership_duration": "396 00:00:00", "membership_start": "213 00:00:00", @@ -17,6 +18,7 @@ "fields": { "name": "Kfet", "email": "tresorerie.bde@example.com", + "require_memberships": true, "membership_fee": 3500, "membership_duration": "396 00:00:00", "membership_start": "213 00:00:00", diff --git a/apps/member/models.py b/apps/member/models.py index d0051e59..377cc010 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -77,22 +77,34 @@ class Club(models.Model): ) # Memberships + + # When set to False, the membership system won't be used. + # Useful to create notes for activities or departments. + require_memberships = models.BooleanField( + default=True, + verbose_name=_("require memberships"), + ) + membership_fee = models.PositiveIntegerField( + default=0, verbose_name=_('membership fee'), ) membership_duration = models.DurationField( + blank=True, null=True, verbose_name=_('membership duration'), help_text=_('The longest time a membership can last ' '(NULL = infinite).'), ) membership_start = models.DurationField( + blank=True, null=True, verbose_name=_('membership start'), help_text=_('How long after January 1st the members can renew ' 'their membership.'), ) membership_end = models.DurationField( + blank=True, null=True, verbose_name=_('membership end'), help_text=_('How long the membership can last after January 1st ' @@ -100,6 +112,15 @@ class Club(models.Model): 'membership.'), ) + def save(self, force_insert=False, force_update=False, using=None, + update_fields=None): + if not self.require_memberships: + self.membership_fee = 0 + self.membership_duration = None + self.membership_start = None + self.membership_end = None + super().save(force_insert, force_update, update_fields) + class Meta: verbose_name = _("club") verbose_name_plural = _("clubs") diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 04920cfb..5bf0d77d 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -842,7 +842,7 @@ 35, 36, 39, - 40, + 40 ] } }, diff --git a/templates/member/club_form.html b/templates/member/club_form.html index 99c254e3..7abe9db9 100644 --- a/templates/member/club_form.html +++ b/templates/member/club_form.html @@ -9,3 +9,23 @@ {% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 907914be..039583c5 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -18,26 +18,25 @@
    {{ club.parent_club.name}}
    {% endif %} -
    {% trans 'membership start'|capfirst %}
    -
    {{ club.membership_start }}
    + {% if club.require_memberships %} +
    {% trans 'membership start'|capfirst %}
    +
    {{ club.membership_start }}
    -
    {% trans 'membership end'|capfirst %}
    -
    {{ club.membership_end }}
    +
    {% trans 'membership end'|capfirst %}
    +
    {{ club.membership_end }}
    -
    {% trans 'membership duration'|capfirst %}
    -
    {{ club.membership_duration }}
    +
    {% trans 'membership duration'|capfirst %}
    +
    {{ club.membership_duration }}
    -
    {% trans 'membership fee'|capfirst %}
    -
    {{ club.membership_fee|pretty_money }}
    +
    {% trans 'membership fee'|capfirst %}
    +
    {{ club.membership_fee|pretty_money }}
    + {% endif %}
    {% trans 'aliases'|capfirst %}
    {{ object.note.alias_set.all|join:", " }}
    {% trans 'email'|capfirst %}
    {{ club.email }}
    - -
    {% trans 'linked notes'|capfirst %}
    -
    {{ club.linked_notes.all|join:", " }}
    From bf9789bd9e650baaf2811b4350d7d2ff6b468fc4 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 31 Mar 2020 23:54:14 +0200 Subject: [PATCH 27/66] Restructurate memberships, closes #16 --- apps/member/fixtures/initial.json | 12 +-- apps/member/forms.py | 32 +------ apps/member/models.py | 47 +++++++-- apps/member/views.py | 41 ++++---- apps/permission/backends.py | 1 + locale/de/LC_MESSAGES/django.po | 154 ++++++++++++++++-------------- locale/fr/LC_MESSAGES/django.po | 147 +++++++++++++++------------- note_kfet/inputs.py | 3 +- templates/member/add_members.html | 16 +--- templates/member/club_info.html | 2 +- 10 files changed, 231 insertions(+), 224 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index 649cbbc1..094d2c3f 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -7,9 +7,9 @@ "email": "tresorerie.bde@example.com", "require_memberships": true, "membership_fee": 500, - "membership_duration": "396 00:00:00", - "membership_start": "213 00:00:00", - "membership_end": "273 00:00:00" + "membership_duration": 396, + "membership_start": "2019-08-31", + "membership_end": "2020-09-30" } }, { @@ -20,9 +20,9 @@ "email": "tresorerie.bde@example.com", "require_memberships": true, "membership_fee": 3500, - "membership_duration": "396 00:00:00", - "membership_start": "213 00:00:00", - "membership_end": "273 00:00:00" + "membership_duration": 396, + "membership_start": "2019-08-31", + "membership_end": "2020-09-30" } } ] diff --git a/apps/member/forms.py b/apps/member/forms.py index 80c2b49e..9ac4ffa9 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -1,13 +1,10 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from crispy_forms.bootstrap import Div -from crispy_forms.helper import FormHelper -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 Autocomplete, AmountInput +from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask from .models import Profile, Club, Membership @@ -55,6 +52,8 @@ class ClubForm(forms.ModelForm): 'api_url': '/api/members/club/', } ), + "membership_start": DatePickerInput(), + "membership_end": DatePickerInput(), } @@ -80,28 +79,5 @@ class MembershipForm(forms.ModelForm): 'placeholder': 'Nom ...', }, ), + 'date_start': DatePickerInput(), } - - -MemberFormSet = forms.modelformset_factory( - Membership, - form=MembershipForm, - extra=2, - can_delete=True, -) - - -class FormSetHelper(FormHelper): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.form_tag = False - self.form_method = 'POST' - self.form_class = 'form-inline' - # self.template = 'bootstrap/table_inline_formset.html' - self.layout = Layout( - Div( - Div('user', css_class='col-sm-2'), - Div('roles', css_class='col-sm-2'), - Div('date_start', css_class='col-sm-2'), - css_class="row formset-row", - )) diff --git a/apps/member/models.py b/apps/member/models.py index 377cc010..8906af9c 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -83,27 +83,31 @@ class Club(models.Model): require_memberships = models.BooleanField( default=True, verbose_name=_("require memberships"), + help_text=_("Uncheck if this club don't require memberships."), ) membership_fee = models.PositiveIntegerField( default=0, verbose_name=_('membership fee'), ) - membership_duration = models.DurationField( + + membership_duration = models.IntegerField( blank=True, null=True, verbose_name=_('membership duration'), - help_text=_('The longest time a membership can last ' + help_text=_('The longest time (in days) a membership can last ' '(NULL = infinite).'), ) - membership_start = models.DurationField( + + membership_start = models.DateField( blank=True, null=True, verbose_name=_('membership start'), help_text=_('How long after January 1st the members can renew ' 'their membership.'), ) - membership_end = models.DurationField( + + membership_end = models.DateField( blank=True, null=True, verbose_name=_('membership end'), @@ -112,6 +116,20 @@ class Club(models.Model): 'membership.'), ) + def update_membership_dates(self): + """ + This function is called each time the club detail view is displayed. + Update the year of the membership dates. + """ + today = datetime.date.today() + + if (today - self.membership_start).days >= 365: + self.membership_start = datetime.date(self.membership_start.year + 1, + self.membership_start.month, self.membership_start.day) + self.membership_end = datetime.date(self.membership_end.year + 1, + self.membership_end.month, self.membership_end.day) + self.save(force_update=True) + def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.require_memberships: @@ -135,9 +153,6 @@ class Club(models.Model): class Role(models.Model): """ Role that an :model:`auth.User` can have in a :model:`member.Club` - - TODO: Integrate the right management, and create some standard Roles at the - creation of the club. """ name = models.CharField( verbose_name=_('name'), @@ -162,21 +177,25 @@ class Membership(models.Model): settings.AUTH_USER_MODEL, on_delete=models.PROTECT, ) + club = models.ForeignKey( Club, on_delete=models.PROTECT, ) - roles = models.ForeignKey( + + roles = models.ManyToManyField( Role, - on_delete=models.PROTECT, ) + date_start = models.DateField( verbose_name=_('membership starts on'), ) + date_end = models.DateField( verbose_name=_('membership ends on'), null=True, ) + fee = models.PositiveIntegerField( verbose_name=_('fee'), ) @@ -189,8 +208,16 @@ class Membership(models.Model): def save(self, *args, **kwargs): if self.club.parent_club is not None: - if not Membership.objects.filter(user=self.user, club=self.club.parent_club): + if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): raise ValidationError(_('User is not a member of the parent club')) + + created = not self.pk + if created: + self.fee = self.club.membership_fee + self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) + if self.date_end > self.club.membership_end: + self.date_end = self.club.membership_end + super().save(*args, **kwargs) class Meta: diff --git a/apps/member/views.py b/apps/member/views.py index 9ca7d76a..651dfc35 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later import io +from datetime import datetime from PIL import Image from django.conf import settings @@ -24,8 +25,7 @@ from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper -from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, MemberFormSet, FormSetHelper, \ - CustomAuthenticationForm +from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable @@ -281,13 +281,19 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + club = context["club"] + if PermissionBackend().has_perm(self.request.user, "member.change_club_membership_start", club): + club.update_membership_dates() + club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') context['history_list'] = HistoryTable(club_transactions) - club_member = Membership.objects.filter(club=club)\ - .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() - # TODO: consider only valid Membership + club_member = Membership.objects.filter( + club=club, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() context['member_list'] = club_member return context @@ -328,31 +334,20 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form_class = MembershipForm template_name = 'member/add_members.html' - def get_queryset(self, **kwargs): - 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.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) - context['formset'] = MemberFormSet() - context['helper'] = FormSetHelper() context['club'] = club context['no_cache'] = True return context - def post(self, request, *args, **kwargs): - return - # TODO: Implement POST - # formset = MembershipFormset(request.POST) - # if formset.is_valid(): - # return self.form_valid(formset) - # else: - # return self.form_invalid(formset) + def form_valid(self, form): + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["pk"]) + form.instance.club = club + return super().form_valid(form) - def form_valid(self, formset): - formset.save() - return super().form_valid(formset) + def get_success_url(self): + return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 30a273cc..f478cd5d 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -32,6 +32,7 @@ class PermissionBackend(ModelBackend): for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ .filter( rolepermissions__role__membership__user=user, + rolepermissions__role__membership__valid=True, model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 695bdf95..a4bfb939 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-31 04:16+0200\n" +"POT-Creation-Date: 2020-03-31 23:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,11 +44,10 @@ 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:186 apps/note/models/notes.py:224 -#: 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 +#: apps/member/models.py:64 apps/member/models.py:158 +#: 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 "" @@ -73,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 "" @@ -89,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 "" @@ -179,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 "" @@ -227,12 +226,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:160 +#: apps/logs/models.py:61 apps/note/tables.py:142 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "" @@ -276,7 +275,7 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:69 templates/member/club_info.html:36 +#: apps/member/models.py:69 templates/member/club_info.html:38 msgid "email" msgstr "" @@ -284,90 +283,97 @@ msgstr "" msgid "parent club" msgstr "" -#: apps/member/models.py:81 templates/member/club_info.html:30 -msgid "membership fee" -msgstr "" - -#: apps/member/models.py:85 templates/member/club_info.html:27 -msgid "membership duration" +#: apps/member/models.py:85 +msgid "require memberships" msgstr "" #: apps/member/models.py:86 -msgid "The longest time a membership can last (NULL = infinite)." +msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:91 templates/member/club_info.html:21 -msgid "membership start" +#: apps/member/models.py:91 templates/member/club_info.html:31 +msgid "membership fee" msgstr "" -#: apps/member/models.py:92 -msgid "How long after January 1st the members can renew their membership." -msgstr "" - -#: apps/member/models.py:97 templates/member/club_info.html:24 -msgid "membership end" +#: apps/member/models.py:97 templates/member/club_info.html:28 +msgid "membership duration" msgstr "" #: apps/member/models.py:98 +msgid "The longest time (in days) a membership can last (NULL = infinite)." +msgstr "" + +#: apps/member/models.py:105 templates/member/club_info.html:22 +msgid "membership start" +msgstr "" + +#: apps/member/models.py:106 +msgid "How long after January 1st the members can renew their membership." +msgstr "" + +#: apps/member/models.py:113 templates/member/club_info.html:25 +msgid "membership end" +msgstr "" + +#: apps/member/models.py:114 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:104 apps/note/models/notes.py:141 -#: apps/note/models/notes.py:195 +#: apps/member/models.py:143 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:105 +#: apps/member/models.py:144 msgid "clubs" msgstr "" -#: apps/member/models.py:128 apps/permission/models.py:284 +#: apps/member/models.py:164 apps/permission/models.py:284 msgid "role" msgstr "" -#: apps/member/models.py:129 +#: apps/member/models.py:165 msgid "roles" msgstr "" -#: apps/member/models.py:153 +#: apps/member/models.py:191 msgid "membership starts on" msgstr "" -#: apps/member/models.py:156 +#: apps/member/models.py:195 msgid "membership ends on" msgstr "" -#: apps/member/models.py:160 +#: apps/member/models.py:200 msgid "fee" msgstr "" -#: apps/member/models.py:172 +#: apps/member/models.py:212 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:176 +#: apps/member/models.py:224 msgid "membership" msgstr "" -#: apps/member/models.py:177 +#: apps/member/models.py:225 msgid "memberships" msgstr "" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/views.py:77 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:91 +#: apps/member/views.py:90 msgid "An alias with a similar name already exists." msgstr "" -#: apps/note/admin.py:128 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" -#: apps/note/admin.py:136 apps/note/admin.py:164 +#: apps/note/admin.py:128 apps/note/admin.py:156 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -380,104 +386,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:230 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:246 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "" -#: apps/note/models/notes.py:247 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:35 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:274 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:287 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "" @@ -614,7 +620,7 @@ msgstr "" #: 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:9 +#: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "" @@ -882,23 +888,23 @@ msgstr "" msgid "Club Parent" msgstr "" -#: templates/member/club_info.html:39 -msgid "linked notes" +#: templates/member/club_info.html:29 +msgid "days" msgstr "" -#: templates/member/club_info.html:44 +#: templates/member/club_info.html:43 msgid "Add member" msgstr "" -#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/member/club_info.html:44 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:46 +#: templates/member/club_info.html:45 msgid "Add roles" msgstr "" -#: templates/member/club_info.html:49 templates/member/profile_info.html:48 +#: templates/member/club_info.html:48 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d2a78d06..f4568da4 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-31 04:16+0200\n" +"POT-Creation-Date: 2020-03-31 23:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,11 +40,10 @@ 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:186 apps/note/models/notes.py:224 -#: 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 +#: apps/member/models.py:64 apps/member/models.py:158 +#: 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" @@ -69,14 +68,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" @@ -85,7 +84,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" @@ -175,7 +174,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" @@ -223,12 +222,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:160 +#: apps/logs/models.py:61 apps/note/tables.py:142 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:164 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 msgid "delete" msgstr "Supprimer" @@ -272,7 +271,7 @@ msgstr "payé" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:69 templates/member/club_info.html:36 +#: apps/member/models.py:69 templates/member/club_info.html:38 msgid "email" msgstr "courriel" @@ -280,33 +279,41 @@ msgstr "courriel" msgid "parent club" msgstr "club parent" -#: apps/member/models.py:81 templates/member/club_info.html:30 +#: apps/member/models.py:85 +msgid "require memberships" +msgstr "nécessite des adhésions" + +#: apps/member/models.py:86 +msgid "Uncheck if this club don't require memberships." +msgstr "Décochez si ce club n'utilise pas d'adhésions." + +#: apps/member/models.py:91 templates/member/club_info.html:31 msgid "membership fee" msgstr "cotisation pour adhérer" -#: apps/member/models.py:85 templates/member/club_info.html:27 +#: apps/member/models.py:97 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: 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:98 +msgid "The longest time (in days) a membership can last (NULL = infinite)." +msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:91 templates/member/club_info.html:21 +#: apps/member/models.py:105 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:92 +#: apps/member/models.py:106 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:97 templates/member/club_info.html:24 +#: apps/member/models.py:113 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:98 +#: apps/member/models.py:114 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -314,60 +321,59 @@ 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:195 +#: apps/member/models.py:143 apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:105 +#: apps/member/models.py:144 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:128 apps/permission/models.py:284 +#: apps/member/models.py:164 apps/permission/models.py:284 msgid "role" msgstr "rôle" -#: apps/member/models.py:129 +#: apps/member/models.py:165 msgid "roles" msgstr "rôles" -#: apps/member/models.py:153 +#: apps/member/models.py:191 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:156 +#: apps/member/models.py:195 msgid "membership ends on" msgstr "l'adhésion finie le" -#: apps/member/models.py:160 +#: apps/member/models.py:200 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:172 +#: apps/member/models.py:212 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:176 +#: apps/member/models.py:224 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:177 +#: apps/member/models.py:225 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/views.py:77 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:91 +#: apps/member/views.py:90 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/note/admin.py:128 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" -#: apps/note/admin.py:136 apps/note/admin.py:164 +#: apps/note/admin.py:128 apps/note/admin.py:156 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -380,105 +386,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:230 +#: apps/note/models/notes.py:194 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:246 +#: apps/note/models/notes.py:210 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:247 templates/member/club_info.html:33 +#: apps/note/models/notes.py:211 templates/member/club_info.html:35 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:269 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:274 +#: 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:287 +#: apps/note/models/notes.py:251 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -615,7 +621,7 @@ msgstr "Trésorerie" #: 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:9 +#: templates/member/add_members.html:14 templates/member/club_form.html:9 #: templates/treasury/invoice_form.html:46 msgid "Submit" msgstr "Envoyer" @@ -885,23 +891,23 @@ msgstr "Ajouter un alias" msgid "Club Parent" msgstr "Club parent" -#: templates/member/club_info.html:39 -msgid "linked notes" -msgstr "notes liées" +#: templates/member/club_info.html:29 +msgid "days" +msgstr "jours" -#: templates/member/club_info.html:44 +#: templates/member/club_info.html:43 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:45 templates/note/conso_form.html:121 +#: templates/member/club_info.html:44 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:46 +#: templates/member/club_info.html:45 msgid "Add roles" msgstr "Ajouter des rôles" -#: templates/member/club_info.html:49 templates/member/profile_info.html:48 +#: templates/member/club_info.html:48 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -1210,3 +1216,6 @@ 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 "linked notes" +#~ msgstr "notes liées" diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index a3170007..81f55dee 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -1,6 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +import datetime from json import dumps as json_dumps from django.forms.widgets import DateTimeBaseInput, NumberInput, TextInput @@ -299,4 +300,4 @@ class YearPickerInput(BasePickerInput): 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 + self.config['options']['format'] = yformat diff --git a/templates/member/add_members.html b/templates/member/add_members.html index 8b57e7d4..c44440bf 100644 --- a/templates/member/add_members.html +++ b/templates/member/add_members.html @@ -1,29 +1,21 @@ {% extends "member/noteowner_detail.html" %} {% load crispy_forms_tags %} {% load static %} +{% load i18n %} {% block profile_info %} {% include "member/club_info.html" %} {% endblock %} -{% block profile_content %} +{% block profile_content %}
    {% csrf_token %} - {% crispy formset helper %} -
    - -
    + {{ form|crispy }} +
    {% endblock %} {% block extrajavascript %} - {% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 039583c5..da747ccd 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -26,7 +26,7 @@
    {{ club.membership_end }}
    {% trans 'membership duration'|capfirst %}
    -
    {{ club.membership_duration }}
    +
    {{ club.membership_duration }} {% trans "days" %}
    {% trans 'membership fee'|capfirst %}
    {{ club.membership_fee|pretty_money }}
    From d5b010980b6e1da604ae0b345c1fbb4c827e420c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 03:42:19 +0200 Subject: [PATCH 28/66] Full membership support --- apps/logs/signals.py | 6 +++ apps/member/fixtures/initial.json | 1 + apps/member/forms.py | 6 +-- apps/member/models.py | 40 +++++++++++++--- apps/member/tables.py | 38 ++++++++++++++- apps/member/urls.py | 9 ++-- apps/member/views.py | 77 +++++++++++++++++++++++++++++-- apps/note/admin.py | 7 +++ apps/note/models/transactions.py | 1 + apps/permission/backends.py | 5 +- apps/permission/models.py | 4 +- apps/permission/signals.py | 26 +++-------- note_kfet/inputs.py | 1 - templates/member/club_info.html | 11 +++-- 14 files changed, 186 insertions(+), 46 deletions(-) diff --git a/apps/logs/signals.py b/apps/logs/signals.py index 43fc1e13..37e9ba79 100644 --- a/apps/logs/signals.py +++ b/apps/logs/signals.py @@ -50,6 +50,9 @@ def save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_save"): + return + # noinspection PyProtectedMember previous = instance._previous @@ -106,6 +109,9 @@ def delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_delete"): + return + # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP user, ip = get_current_authenticated_user(), get_current_ip() diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index 094d2c3f..d72377f8 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -18,6 +18,7 @@ "fields": { "name": "Kfet", "email": "tresorerie.bde@example.com", + "parent_club": 1, "require_memberships": true, "membership_fee": 3500, "membership_duration": 396, diff --git a/apps/member/forms.py b/apps/member/forms.py index 9ac4ffa9..87d5322e 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask @@ -57,11 +58,6 @@ class ClubForm(forms.ModelForm): } -class AddMembersForm(forms.Form): - class Meta: - fields = ('',) - - class MembershipForm(forms.ModelForm): class Meta: model = Membership diff --git a/apps/member/models.py b/apps/member/models.py index 8906af9c..180839d8 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -4,11 +4,14 @@ import datetime from django.conf import settings -from django.core.exceptions import ValidationError +from django.contrib.auth.models import User +from django.core.exceptions import ValidationError, PermissionDenied from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ +from note.models import MembershipTransaction + class Profile(models.Model): """ @@ -91,7 +94,7 @@ class Club(models.Model): verbose_name=_('membership fee'), ) - membership_duration = models.IntegerField( + membership_duration = models.PositiveIntegerField( blank=True, null=True, verbose_name=_('membership duration'), @@ -174,7 +177,7 @@ class Membership(models.Model): """ user = models.ForeignKey( - settings.AUTH_USER_MODEL, + User, on_delete=models.PROTECT, ) @@ -185,6 +188,7 @@ class Membership(models.Model): roles = models.ManyToManyField( Role, + verbose_name=_("roles"), ) date_start = models.DateField( @@ -209,17 +213,41 @@ class Membership(models.Model): def save(self, *args, **kwargs): if self.club.parent_club is not None: if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): - raise ValidationError(_('User is not a member of the parent club')) + raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name) created = not self.pk if created: + if Membership.objects.filter( + user=self.user, + club=self.club, + date_start__lte=datetime.datetime.now().date(), + date_end__gte=datetime.datetime.now().date(), + ).exists(): + raise ValidationError(_('User is already a member of the club')) + self.fee = self.club.membership_fee - self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) - if self.date_end > self.club.membership_end: + if self.club.membership_duration is not None: + self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) + else: + self.date_end = self.date_start + datetime.timedelta(days=0x7FFFFFFF) + if self.club.membership_end is not None and self.date_end > self.club.membership_end: self.date_end = self.club.membership_end super().save(*args, **kwargs) + if created and self.fee: + try: + MembershipTransaction.objects.create( + membership=self, + source=self.user.note, + destination=self.club.note, + quantity=1, + amount=self.fee, + reason="Adhésion", + ) + except PermissionDenied: + self.delete() + class Meta: verbose_name = _('membership') verbose_name_plural = _('memberships') diff --git a/apps/member/tables.py b/apps/member/tables.py index d0c37a6e..18a2a555 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -3,8 +3,14 @@ import django_tables2 as tables from django.contrib.auth.models import User +from django.urls import reverse_lazy +from django.utils.html import format_html +from django_tables2 import A -from .models import Club +from note.templatetags.pretty_money import pretty_money +from note_kfet.middlewares import get_current_authenticated_user +from permission.backends import PermissionBackend +from .models import Club, Membership class ClubTable(tables.Table): @@ -33,3 +39,33 @@ class UserTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('last_name', 'first_name', 'username', 'email') model = User + + +class MembershipTable(tables.Table): + roles = tables.Column( + attrs={ + "td": { + "class": "text-truncate", + } + } + ) + + def render_fee(self, value): + return pretty_money(value) + + def render_roles(self, record): + roles = record.roles.all() + s = ", ".join(str(role) for role in roles) + if PermissionBackend().has_perm(get_current_authenticated_user(), "member.change_membership_roles", record): + s = format_html("" + s + "") + return s + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover', + 'style': 'table-layout: fixed;' + } + template_name = 'django_tables2/bootstrap4.html' + fields = ('user', 'club', 'date_start', 'date_end', 'roles', 'fee', ) + model = Membership diff --git a/apps/member/urls.py b/apps/member/urls.py index 7f4bf0d5..2000a6e4 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -12,15 +12,16 @@ urlpatterns = [ path('club/', views.ClubListView.as_view(), name="club_list"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), + path('club/manage_roles//', views.ClubManageRolesView.as_view(), name="club_manage_roles"), path('club/create/', views.ClubCreateView.as_view(), name="club_create"), path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), path('user/', views.UserListView.as_view(), name="user_list"), - path('user/', views.UserDetailView.as_view(), name="user_detail"), - path('user//update', views.UserUpdateView.as_view(), name="user_update_profile"), - path('user//update_pic', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"), - path('user//aliases', views.ProfileAliasView.as_view(), name="user_alias"), + path('user//', views.UserDetailView.as_view(), name="user_detail"), + path('user//update/', views.UserUpdateView.as_view(), name="user_update_profile"), + 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'), ] diff --git a/apps/member/views.py b/apps/member/views.py index 651dfc35..ad01e2a2 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -10,6 +10,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.auth.views import LoginView from django.db.models import Q +from django.forms import HiddenInput from django.shortcuts import redirect from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -27,7 +28,7 @@ from permission.views import ProtectQuerysetMixin from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership -from .tables import ClubTable, UserTable +from .tables import ClubTable, UserTable, MembershipTable class CustomLoginView(LoginView): @@ -138,7 +139,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context['history_list'] = HistoryTable(history_list) club_list = Membership.objects.all().filter(user=user)\ .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") - context['club_list'] = ClubTable(club_list) + context['club_list'] = MembershipTable(data=club_list) return context @@ -294,7 +295,19 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): date_start__lte=datetime.now().date(), date_end__gte=datetime.now().date(), ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() - context['member_list'] = club_member + + context['member_list'] = MembershipTable(data=club_member) + + empty_membership = Membership( + club=club, + user=User.objects.first(), + date_start=datetime.now().date(), + date_end=datetime.now().date(), + fee=0, + ) + context["can_add_members"] = PermissionBackend()\ + .has_perm(self.request.user, "member.add_membership", empty_membership) + return context @@ -339,7 +352,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) context['club'] = club - context['no_cache'] = True return context @@ -347,6 +359,63 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) form.instance.club = club + + if club.parent_club is not None: + if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): + form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) + return super().form_invalid(form) + + if Membership.objects.filter( + user=form.instance.user, + club=club, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).exists(): + form.add_error('user', _('User is already a member of the club')) + return super().form_invalid(form) + + if form.instance.date_start < form.instance.club.membership_start: + form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + if form.instance.date_start > form.instance.club.membership_end: + form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) + + +class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + model = Membership + form_class = MembershipForm + template_name = 'member/add_members.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + club = self.object.club + context['club'] = club + form = context['form'] + form.fields['user'].disabled = True + form.fields['date_start'].widget = HiddenInput() + + return context + + def form_valid(self, form): + if form.instance.date_start < form.instance.club.membership_start: + form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + + if form.instance.date_start > form.instance.club.membership_end: + form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + .format(form.instance.club.membership_start)) + return super().form_invalid(form) + return super().form_valid(form) def get_success_url(self): diff --git a/apps/note/admin.py b/apps/note/admin.py index 702d3350..7b4ba870 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -138,6 +138,13 @@ class TransactionAdmin(PolymorphicParentModelAdmin): return [] +@admin.register(MembershipTransaction) +class MembershipTransactionAdmin(PolymorphicChildModelAdmin): + """ + Admin customisation for Transaction + """ + + @admin.register(TransactionTemplate) class TransactionTemplateAdmin(admin.ModelAdmin): """ diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index d1dcd788..d9b860ae 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -140,6 +140,7 @@ class Transaction(PolymorphicModel): max_length=255, default=None, null=True, + blank=True, ) class Meta: diff --git a/apps/permission/backends.py b/apps/permission/backends.py index f478cd5d..b95f8203 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -1,6 +1,8 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +import datetime + from django.contrib.auth.backends import ModelBackend from django.contrib.auth.models import User, AnonymousUser from django.contrib.contenttypes.models import ContentType @@ -32,7 +34,8 @@ class PermissionBackend(ModelBackend): for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ .filter( rolepermissions__role__membership__user=user, - rolepermissions__role__membership__valid=True, + rolepermissions__role__membership__date_start__lte=datetime.date.today(), + rolepermissions__role__membership__date_end__gte=datetime.date.today(), model__app_label=model.app_label, # For polymorphic models, we don't filter on model type type=type, ).all(): diff --git a/apps/permission/models.py b/apps/permission/models.py index d1b55090..c8df07c0 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -45,11 +45,13 @@ class InstancedPermission: else: oldpk = obj.pk # Ensure previous models are deleted - self.model.model_class().objects.filter(pk=obj.pk).delete() + self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk") + 1).delete() # Force insertion, no data verification, no trigger + obj._force_save = True Model.save(obj, force_insert=True) ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object + obj._force_delete = True Model.delete(obj) # If the primary key was specified, we restore it diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 1e30f56f..5ccb9c0b 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -29,6 +29,9 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_save"): + return + user = get_current_authenticated_user() if user is None: # Action performed on shell is always granted @@ -58,32 +61,14 @@ def pre_save_object(sender, instance, **kwargs): if not PermissionBackend().has_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): raise PermissionDenied else: - # We check if the user can add the model - - # While checking permissions, the object will be inserted in the DB, then removed. - # We disable temporary the connectors - pre_save.disconnect(pre_save_object) - pre_delete.disconnect(pre_delete_object) - # We disable also logs connectors - pre_save.disconnect(logs_signals.pre_save_object) - post_save.disconnect(logs_signals.save_object) - post_delete.disconnect(logs_signals.delete_object) - # We check if the user has right to add the object has_perm = PermissionBackend().has_perm(user, app_label + ".add_" + model_name, instance) - # Then we reconnect all - pre_save.connect(pre_save_object) - pre_delete.connect(pre_delete_object) - pre_save.connect(logs_signals.pre_save_object) - post_save.connect(logs_signals.save_object) - post_delete.connect(logs_signals.delete_object) - if not has_perm: raise PermissionDenied -def pre_delete_object(sender, instance, **kwargs): +def pre_delete_object(instance, **kwargs): """ Before a model get deleted, we check the permissions """ @@ -91,6 +76,9 @@ def pre_delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return + if hasattr(instance, "_force_delete"): + return + user = get_current_authenticated_user() if user is None: # Action performed on shell is always granted diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index 81f55dee..ecd758e0 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -1,7 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -import datetime from json import dumps as json_dumps from django.forms.widgets import DateTimeBaseInput, NumberInput, TextInput diff --git a/templates/member/club_info.html b/templates/member/club_info.html index da747ccd..23a41c1c 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -1,4 +1,4 @@ -{% load i18n static pretty_money %} +{% load i18n static pretty_money perms %}

    Club {{ club.name }}

    @@ -40,9 +40,12 @@
    - {% trans "Add member" %} - {% trans "Edit" %} - {% trans "Add roles" %} + {% if can_add_members %} + {% trans "Add member" %} + {% endif %} + {% if ".change_"|has_perm:club %} + {% trans "Edit" %} + {% endif %} {% url 'member:club_detail' club.pk as club_detail_url %} {%if request.get_full_path != club_detail_url %} {% trans 'View Profile' %} From 0df0f3f66b7089fbba29580500be74c90181eb90 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:07:55 +0200 Subject: [PATCH 29/66] Membership fees for paid and unpaid students, closes #43 --- apps/member/fixtures/initial.json | 6 +- apps/member/forms.py | 4 +- apps/member/models.py | 47 +++++---- apps/member/tables.py | 3 +- apps/member/views.py | 4 +- apps/permission/fixtures/initial.json | 107 ++++++++++++++++++++- apps/permission/models.py | 2 + apps/permission/signals.py | 6 +- locale/de/LC_MESSAGES/django.po | 126 +++++++++++++----------- locale/fr/LC_MESSAGES/django.po | 133 ++++++++++++++------------ templates/member/club_form.html | 6 +- templates/member/club_info.html | 7 +- 12 files changed, 301 insertions(+), 150 deletions(-) diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json index d72377f8..e27eb72d 100644 --- a/apps/member/fixtures/initial.json +++ b/apps/member/fixtures/initial.json @@ -6,7 +6,8 @@ "name": "BDE", "email": "tresorerie.bde@example.com", "require_memberships": true, - "membership_fee": 500, + "membership_fee_paid": 500, + "membership_fee_unpaid": 500, "membership_duration": 396, "membership_start": "2019-08-31", "membership_end": "2020-09-30" @@ -20,7 +21,8 @@ "email": "tresorerie.bde@example.com", "parent_club": 1, "require_memberships": true, - "membership_fee": 3500, + "membership_fee_paid": 3500, + "membership_fee_unpaid": 3500, "membership_duration": 396, "membership_start": "2019-08-31", "membership_end": "2020-09-30" diff --git a/apps/member/forms.py b/apps/member/forms.py index 87d5322e..a37d143e 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,7 +4,6 @@ from django import forms from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.contrib.auth.models import User -from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask @@ -46,7 +45,8 @@ class ClubForm(forms.ModelForm): model = Club fields = '__all__' widgets = { - "membership_fee": AmountInput(), + "membership_fee_paid": AmountInput(), + "membership_fee_unpaid": AmountInput(), "parent_club": Autocomplete( Club, attrs={ diff --git a/apps/member/models.py b/apps/member/models.py index 180839d8..47807976 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError, PermissionDenied from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ - from note.models import MembershipTransaction @@ -89,9 +88,14 @@ class Club(models.Model): help_text=_("Uncheck if this club don't require memberships."), ) - membership_fee = models.PositiveIntegerField( + membership_fee_paid = models.PositiveIntegerField( default=0, - verbose_name=_('membership fee'), + verbose_name=_('membership fee (paid students)'), + ) + + membership_fee_unpaid = models.PositiveIntegerField( + default=0, + verbose_name=_('membership fee (unpaid students)'), ) membership_duration = models.PositiveIntegerField( @@ -136,7 +140,8 @@ class Club(models.Model): def save(self, force_insert=False, force_update=False, using=None, update_fields=None): if not self.require_memberships: - self.membership_fee = 0 + self.membership_fee_paid = 0 + self.membership_fee_unpaid = 0 self.membership_duration = None self.membership_start = None self.membership_end = None @@ -225,7 +230,10 @@ class Membership(models.Model): ).exists(): raise ValidationError(_('User is already a member of the club')) - self.fee = self.club.membership_fee + if self.user.profile.paid: + self.fee = self.club.membership_fee_paid + else: + self.fee = self.club.membership_fee_unpaid if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: @@ -235,18 +243,23 @@ class Membership(models.Model): super().save(*args, **kwargs) - if created and self.fee: - try: - MembershipTransaction.objects.create( - membership=self, - source=self.user.note, - destination=self.club.note, - quantity=1, - amount=self.fee, - reason="Adhésion", - ) - except PermissionDenied: - self.delete() + self.make_transaction() + + def make_transaction(self): + if self.transaction is not None or not self.fee: + return + + if self.fee: + transaction = MembershipTransaction( + membership=self, + source=self.user.note, + destination=self.club.note, + quantity=1, + amount=self.fee, + reason="Adhésion", + ) + transaction._force_save = True + transaction.save(force_insert=True) class Meta: verbose_name = _('membership') diff --git a/apps/member/tables.py b/apps/member/tables.py index 18a2a555..ec21c712 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -5,11 +5,10 @@ import django_tables2 as tables from django.contrib.auth.models import User from django.urls import reverse_lazy from django.utils.html import format_html -from django_tables2 import A - from note.templatetags.pretty_money import pretty_money from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend + from .models import Club, Membership diff --git a/apps/member/views.py b/apps/member/views.py index ad01e2a2..226cafab 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -380,7 +380,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): return super().form_invalid(form) if form.instance.date_start > form.instance.club.membership_end: - form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) @@ -412,7 +412,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return super().form_invalid(form) if form.instance.date_start > form.instance.club.membership_end: - form.add_error('user', _("The membership must end before {:%m-%d-%Y}.") + form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 5bf0d77d..4cf3ecfa 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -798,6 +798,51 @@ "description": "Update club" } }, + { + "model": "permission.permission", + "pk": 48, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"user\": [\"user\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View our memberships" + } + }, + { + "model": "permission.permission", + "pk": 49, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"club\": [\"club\"]}", + "type": "view", + "mask": 1, + "field": "", + "description": "View club's memberships" + } + }, + { + "model": "permission.permission", + "pk": 50, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{\"club\": [\"club\"]}", + "type": "add", + "mask": 2, + "field": "", + "description": "Add a membership to a club" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -810,7 +855,8 @@ 8, 9, 10, - 11 + 11, + 48 ] } }, @@ -906,5 +952,64 @@ 47 ] } + }, + { + "model": "permission.rolepermissions", + "pk": 7, + "fields": { + "role": 5, + "permissions": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50 + ] + } } ] diff --git a/apps/permission/models.py b/apps/permission/models.py index c8df07c0..b1012159 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -49,6 +49,8 @@ class InstancedPermission: # Force insertion, no data verification, no trigger obj._force_save = True Model.save(obj, force_insert=True) + # We don't want log anything + obj._no_log = True ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() # Delete testing object obj._force_delete = True diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 5ccb9c0b..3bb79897 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -2,8 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.core.exceptions import PermissionDenied -from django.db.models.signals import pre_save, pre_delete, post_save, post_delete -from logs import signals as logs_signals from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend @@ -29,7 +27,7 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_save"): + if hasattr(instance, "_no_log"): return user = get_current_authenticated_user() @@ -76,7 +74,7 @@ def pre_delete_object(instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_delete"): + if hasattr(instance, "_no_log"): return user = get_current_authenticated_user() diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a4bfb939..9348a93a 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-31 23:49+0200\n" +"POT-Creation-Date: 2020-04-01 04:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,9 +44,9 @@ 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:158 +#: apps/member/models.py:66 apps/member/models.py:166 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "" @@ -68,7 +68,7 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "" @@ -251,129 +251,145 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/models.py:26 +#: apps/member/models.py:28 msgid "phone number" msgstr "" -#: apps/member/models.py:32 templates/member/profile_info.html:27 +#: apps/member/models.py:34 templates/member/profile_info.html:27 msgid "section" msgstr "" -#: apps/member/models.py:33 +#: apps/member/models.py:35 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:39 templates/member/profile_info.html:30 +#: apps/member/models.py:41 templates/member/profile_info.html:30 msgid "address" msgstr "" -#: apps/member/models.py:45 +#: apps/member/models.py:47 msgid "paid" msgstr "" -#: apps/member/models.py:50 apps/member/models.py:51 +#: apps/member/models.py:52 apps/member/models.py:53 msgid "user profile" msgstr "" -#: apps/member/models.py:69 templates/member/club_info.html:38 +#: apps/member/models.py:71 templates/member/club_info.html:41 msgid "email" msgstr "" -#: apps/member/models.py:76 +#: apps/member/models.py:78 msgid "parent club" msgstr "" -#: apps/member/models.py:85 +#: apps/member/models.py:87 msgid "require memberships" msgstr "" -#: apps/member/models.py:86 +#: apps/member/models.py:88 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:91 templates/member/club_info.html:31 -msgid "membership fee" +#: apps/member/models.py:93 templates/member/club_info.html:31 +msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:97 templates/member/club_info.html:28 +#: apps/member/models.py:98 templates/member/club_info.html:34 +msgid "membership fee (unpaid students)" +msgstr "" + +#: apps/member/models.py:104 templates/member/club_info.html:28 msgid "membership duration" msgstr "" -#: apps/member/models.py:98 +#: apps/member/models.py:105 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:105 templates/member/club_info.html:22 +#: apps/member/models.py:112 templates/member/club_info.html:22 msgid "membership start" msgstr "" -#: apps/member/models.py:106 +#: apps/member/models.py:113 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:113 templates/member/club_info.html:25 +#: apps/member/models.py:120 templates/member/club_info.html:25 msgid "membership end" msgstr "" -#: apps/member/models.py:114 +#: apps/member/models.py:121 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:143 apps/note/models/notes.py:139 +#: apps/member/models.py:151 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:144 +#: apps/member/models.py:152 msgid "clubs" msgstr "" -#: apps/member/models.py:164 apps/permission/models.py:284 +#: apps/member/models.py:172 apps/permission/models.py:288 msgid "role" msgstr "" -#: apps/member/models.py:165 +#: apps/member/models.py:173 apps/member/models.py:196 msgid "roles" msgstr "" -#: apps/member/models.py:191 +#: apps/member/models.py:200 msgid "membership starts on" msgstr "" -#: apps/member/models.py:195 +#: apps/member/models.py:204 msgid "membership ends on" msgstr "" -#: apps/member/models.py:200 +#: apps/member/models.py:209 msgid "fee" msgstr "" -#: apps/member/models.py:212 +#: apps/member/models.py:221 apps/member/views.py:365 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:224 +#: apps/member/models.py:231 apps/member/views.py:374 +msgid "User is already a member of the club" +msgstr "" + +#: apps/member/models.py:265 msgid "membership" msgstr "" -#: apps/member/models.py:225 +#: apps/member/models.py:266 msgid "memberships" msgstr "" -#: apps/member/views.py:77 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:90 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "" +#: apps/member/views.py:378 apps/member/views.py:410 +msgid "The membership must start after {:%m-%d-%Y}." +msgstr "" + +#: apps/member/views.py:383 apps/member/views.py:415 +msgid "The membership must start before {:%m-%d-%Y}." +msgstr "" + #: 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/admin.py:128 apps/note/admin.py:163 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "" @@ -470,7 +486,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:35 +#: apps/note/models/notes.py:211 templates/member/club_info.html:38 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" @@ -532,45 +548,45 @@ msgstr "" msgid "invalidity reason" msgstr "" -#: apps/note/models/transactions.py:146 +#: apps/note/models/transactions.py:147 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:148 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:201 templates/base.html:84 +#: apps/note/models/transactions.py:202 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:221 +#: apps/note/models/transactions.py:222 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:236 +#: apps/note/models/transactions.py:237 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:241 +#: apps/note/models/transactions.py:242 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 +#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:264 +#: apps/note/models/transactions.py:265 msgid "membership transactions" msgstr "" @@ -594,21 +610,21 @@ msgstr "" msgid "Consumptions" msgstr "" -#: apps/permission/models.py:78 apps/permission/models.py:271 +#: apps/permission/models.py:82 apps/permission/models.py:275 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:80 apps/permission/models.py:273 +#: apps/permission/models.py:84 apps/permission/models.py:277 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:93 +#: apps/permission/models.py:97 msgid "rank" msgstr "" -#: apps/permission/models.py:156 +#: apps/permission/models.py:160 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -892,19 +908,15 @@ msgstr "" msgid "days" msgstr "" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:47 msgid "Add member" msgstr "" -#: templates/member/club_info.html:44 templates/note/conso_form.html:121 +#: templates/member/club_info.html:50 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:45 -msgid "Add roles" -msgstr "" - -#: templates/member/club_info.html:48 templates/member/profile_info.html:48 +#: templates/member/club_info.html:54 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f4568da4..aeb565cc 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-31 23:49+0200\n" +"POT-Creation-Date: 2020-04-01 04:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,9 +40,9 @@ 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:158 +#: apps/member/models.py:66 apps/member/models.py:166 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:231 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 msgid "name" msgstr "nom" @@ -64,7 +64,7 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:53 apps/note/models/transactions.py:69 -#: apps/permission/models.py:99 templates/activity/activity_detail.html:16 +#: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" @@ -247,73 +247,77 @@ msgstr "Les logs ne peuvent pas être détruits." msgid "member" msgstr "adhérent" -#: apps/member/models.py:26 +#: apps/member/models.py:28 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:32 templates/member/profile_info.html:27 +#: apps/member/models.py:34 templates/member/profile_info.html:27 msgid "section" msgstr "section" -#: apps/member/models.py:33 +#: apps/member/models.py:35 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:39 templates/member/profile_info.html:30 +#: apps/member/models.py:41 templates/member/profile_info.html:30 msgid "address" msgstr "adresse" -#: apps/member/models.py:45 +#: apps/member/models.py:47 msgid "paid" msgstr "payé" -#: apps/member/models.py:50 apps/member/models.py:51 +#: apps/member/models.py:52 apps/member/models.py:53 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:69 templates/member/club_info.html:38 +#: apps/member/models.py:71 templates/member/club_info.html:41 msgid "email" msgstr "courriel" -#: apps/member/models.py:76 +#: apps/member/models.py:78 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:85 +#: apps/member/models.py:87 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:86 +#: apps/member/models.py:88 msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:91 templates/member/club_info.html:31 -msgid "membership fee" -msgstr "cotisation pour adhérer" +#: apps/member/models.py:93 templates/member/club_info.html:31 +msgid "membership fee (paid students)" +msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:97 templates/member/club_info.html:28 +#: apps/member/models.py:98 templates/member/club_info.html:34 +msgid "membership fee (unpaid students)" +msgstr "cotisation pour adhérer (normalien étudiant)" + +#: apps/member/models.py:104 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:98 +#: apps/member/models.py:105 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:105 templates/member/club_info.html:22 +#: apps/member/models.py:112 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:106 +#: apps/member/models.py:113 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:113 templates/member/club_info.html:25 +#: apps/member/models.py:120 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:114 +#: apps/member/models.py:121 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -321,59 +325,71 @@ 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:143 apps/note/models/notes.py:139 +#: apps/member/models.py:151 apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:144 +#: apps/member/models.py:152 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:164 apps/permission/models.py:284 +#: apps/member/models.py:172 apps/permission/models.py:288 msgid "role" msgstr "rôle" -#: apps/member/models.py:165 +#: apps/member/models.py:173 apps/member/models.py:196 msgid "roles" msgstr "rôles" -#: apps/member/models.py:191 +#: apps/member/models.py:200 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:195 +#: apps/member/models.py:204 msgid "membership ends on" -msgstr "l'adhésion finie le" +msgstr "l'adhésion finit le" -#: apps/member/models.py:200 +#: apps/member/models.py:209 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:212 +#: apps/member/models.py:221 apps/member/views.py:365 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:224 +#: apps/member/models.py:231 apps/member/views.py:374 +msgid "User is already a member of the club" +msgstr "L'utilisateur est déjà membre du club" + +#: apps/member/models.py:265 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:225 +#: apps/member/models.py:266 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:77 templates/member/profile_info.html:45 +#: apps/member/views.py:78 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:90 +#: apps/member/views.py:91 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." +#: apps/member/views.py:378 apps/member/views.py:410 +msgid "The membership must start after {:%m-%d-%Y}." +msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." + +#: apps/member/views.py:383 apps/member/views.py:415 +msgid "The membership must begin before {:%m-%d-%Y}." +msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." + #: 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/admin.py:128 apps/note/admin.py:163 #: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 msgid "destination" msgstr "destination" @@ -471,7 +487,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:35 +#: apps/note/models/notes.py:211 templates/member/club_info.html:38 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" @@ -533,45 +549,45 @@ msgstr "raison" msgid "invalidity reason" msgstr "Motif d'invalidité" -#: apps/note/models/transactions.py:146 +#: apps/note/models/transactions.py:147 msgid "transaction" msgstr "transaction" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:148 msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:201 templates/base.html:84 +#: apps/note/models/transactions.py:202 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:221 +#: apps/note/models/transactions.py:222 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:236 +#: apps/note/models/transactions.py:237 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:241 +#: apps/note/models/transactions.py:242 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:247 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:263 apps/note/models/transactions.py:268 +#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:264 +#: apps/note/models/transactions.py:265 msgid "membership transactions" msgstr "transactions d'adhésion" @@ -595,21 +611,21 @@ msgstr "Transférer de l'argent" msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:78 apps/permission/models.py:271 +#: apps/permission/models.py:82 apps/permission/models.py:275 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:80 apps/permission/models.py:273 +#: apps/permission/models.py:84 apps/permission/models.py:277 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:93 +#: apps/permission/models.py:97 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:156 +#: apps/permission/models.py:160 msgid "Specifying field applies only to view and change permission types." msgstr "" @@ -895,19 +911,15 @@ msgstr "Club parent" msgid "days" msgstr "jours" -#: templates/member/club_info.html:43 +#: templates/member/club_info.html:47 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:44 templates/note/conso_form.html:121 +#: templates/member/club_info.html:50 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:45 -msgid "Add roles" -msgstr "Ajouter des rôles" - -#: templates/member/club_info.html:48 templates/member/profile_info.html:48 +#: templates/member/club_info.html:54 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -1217,5 +1229,8 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte." msgid "Closed remittances" msgstr "Remises fermées" +#~ msgid "Add roles" +#~ msgstr "Ajouter des rôles" + #~ msgid "linked notes" #~ msgstr "notes liées" diff --git a/templates/member/club_form.html b/templates/member/club_form.html index 7abe9db9..9810ccab 100644 --- a/templates/member/club_form.html +++ b/templates/member/club_form.html @@ -15,14 +15,16 @@ require_memberships_obj = $("#id_require_memberships"); if (!require_memberships_obj.is(":checked")) { - $("#div_id_membership_fee").toggle(); + $("#div_id_membership_fee_paid").toggle(); + $("#div_id_membership_fee_unpaid").toggle(); $("#div_id_membership_duration").toggle(); $("#div_id_membership_start").toggle(); $("#div_id_membership_end").toggle(); } require_memberships_obj.change(function () { - $("#div_id_membership_fee").toggle(); + $("#div_id_membership_fee_paid").toggle(); + $("#div_id_membership_fee_unpaid").toggle(); $("#div_id_membership_duration").toggle(); $("#div_id_membership_start").toggle(); $("#div_id_membership_end").toggle(); diff --git a/templates/member/club_info.html b/templates/member/club_info.html index 23a41c1c..ef5c59f1 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -28,8 +28,11 @@
    {% trans 'membership duration'|capfirst %}
    {{ club.membership_duration }} {% trans "days" %}
    -
    {% trans 'membership fee'|capfirst %}
    -
    {{ club.membership_fee|pretty_money }}
    +
    {% trans 'membership fee (paid students)'|capfirst %}
    +
    {{ club.membership_fee_paid|pretty_money }}
    + +
    {% trans 'membership fee (unpaid students)'|capfirst %}
    +
    {{ club.membership_fee_unpaid|pretty_money }}
    {% endif %}
    {% trans 'aliases'|capfirst %}
    From 535c493bc7434a36f8f26b355535931cf028440c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:20:47 +0200 Subject: [PATCH 30/66] Fix some issues --- apps/member/models.py | 9 ++++++--- locale/de/LC_MESSAGES/django.po | 11 ++++++++--- locale/fr/LC_MESSAGES/django.po | 15 +++++++-------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 47807976..be4fe7e9 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -5,7 +5,7 @@ import datetime from django.conf import settings from django.contrib.auth.models import User -from django.core.exceptions import ValidationError, PermissionDenied +from django.core.exceptions import ValidationError from django.db import models from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -246,7 +246,7 @@ class Membership(models.Model): self.make_transaction() def make_transaction(self): - if self.transaction is not None or not self.fee: + if not self.fee or MembershipTransaction.objects.filter(membership=self).exists(): return if self.fee: @@ -256,11 +256,14 @@ class Membership(models.Model): destination=self.club.note, quantity=1, amount=self.fee, - reason="Adhésion", + reason="Adhésion " + self.club.name, ) transaction._force_save = True transaction.save(force_insert=True) + def __str__(self): + return _("Membership of {user} for the club {club}").format(user=self.user.username, club=self.club.name, ) + class Meta: verbose_name = _('membership') verbose_name_plural = _('memberships') diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 9348a93a..39f5818c 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-04-01 04:00+0200\n" +"POT-Creation-Date: 2020-04-01 04:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -362,10 +362,15 @@ msgid "User is already a member of the club" msgstr "" #: apps/member/models.py:265 +#, python-brace-format +msgid "Membership of {user} for the club {club}" +msgstr "" + +#: apps/member/models.py:268 msgid "membership" msgstr "" -#: apps/member/models.py:266 +#: apps/member/models.py:269 msgid "memberships" msgstr "" @@ -382,7 +387,7 @@ msgid "The membership must start after {:%m-%d-%Y}." msgstr "" #: apps/member/views.py:383 apps/member/views.py:415 -msgid "The membership must start before {:%m-%d-%Y}." +msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" #: apps/note/admin.py:120 apps/note/models/transactions.py:94 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index aeb565cc..24f7bf8a 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-04-01 04:00+0200\n" +"POT-Creation-Date: 2020-04-01 04:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -362,10 +362,15 @@ msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" #: apps/member/models.py:265 +#, python-brace-format +msgid "Membership of {user} for the club {club}" +msgstr "Adhésion de {user} pour le club {club}" + +#: apps/member/models.py:268 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:266 +#: apps/member/models.py:269 msgid "memberships" msgstr "adhésions" @@ -1228,9 +1233,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 "Add roles" -#~ msgstr "Ajouter des rôles" - -#~ msgid "linked notes" -#~ msgstr "notes liées" From 92ab5ee3af0633f70f52c0212052a9f41d50a978 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 04:34:42 +0200 Subject: [PATCH 31/66] Fix memberships with clubs without memberships (we always need treasurers...) --- apps/member/models.py | 5 ++++- apps/member/views.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index be4fe7e9..c2f27473 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -128,6 +128,9 @@ class Club(models.Model): This function is called each time the club detail view is displayed. Update the year of the membership dates. """ + if not self.membership_start: + return + today = datetime.date.today() if (today - self.membership_start).days >= 365: @@ -237,7 +240,7 @@ class Membership(models.Model): if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: - self.date_end = self.date_start + datetime.timedelta(days=0x7FFFFFFF) + self.date_end = self.date_start + datetime.timedelta(days=424242) if self.club.membership_end is not None and self.date_end > self.club.membership_end: self.date_end = self.club.membership_end diff --git a/apps/member/views.py b/apps/member/views.py index 226cafab..243ff265 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -374,12 +374,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.add_error('user', _('User is already a member of the club')) return super().form_invalid(form) - if form.instance.date_start < form.instance.club.membership_start: + if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) - if form.instance.date_start > form.instance.club.membership_end: + if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) @@ -406,12 +406,12 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return context def form_valid(self, form): - if form.instance.date_start < form.instance.club.membership_start: + if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) - if form.instance.date_start > form.instance.club.membership_end: + if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) From 356c8588e78586f0a1dc99a4412816888c6ff8fe Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 17:00:06 +0200 Subject: [PATCH 32/66] Users that are not member of the club Kfet can't have a negative balance --- apps/member/models.py | 4 ++-- apps/member/views.py | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index c2f27473..0af52736 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -228,8 +228,8 @@ class Membership(models.Model): if Membership.objects.filter( user=self.user, club=self.club, - date_start__lte=datetime.datetime.now().date(), - date_end__gte=datetime.datetime.now().date(), + date_start__lte=self.date_start, + date_end__gte=self.date_start, ).exists(): raise ValidationError(_('User is already a member of the club')) diff --git a/apps/member/views.py b/apps/member/views.py index 243ff265..d3a1848f 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -358,8 +358,25 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): def form_valid(self, form): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) + user = self.request.user form.instance.club = club + if user.profile.paid: + fee = club.membership_fee_paid + else: + fee = club.membership_fee_unpaid + if user.note.balance < fee and not Membership.objects.filter( + club=2, + user=user, + date_start__lte=datetime.now().date(), + date_end__gte=datetime.now().date(), + ).exists(): + # Users without a valid Kfet membership can't have a negative balance. + # Club 2 = Kfet (hard-code :'( ) + # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note + form.add_error('user', + _("This user don't have enough money to join this club, and can't have a negative balance.")) + if club.parent_club is not None: if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) @@ -368,8 +385,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): if Membership.objects.filter( user=form.instance.user, club=club, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), + date_start__lte=form.instance.date_start, + date_end__gte=form.instance.date_start, ).exists(): form.add_error('user', _('User is already a member of the club')) return super().form_invalid(form) From 2853fe252b1aedcc8e62372202e8380ccec794bf Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 18:47:56 +0200 Subject: [PATCH 33/66] Renew memberships --- apps/member/models.py | 3 ++ apps/member/tables.py | 37 ++++++++++++++++- apps/member/urls.py | 3 +- apps/member/views.py | 40 +++++++++++++++---- locale/de/LC_MESSAGES/django.po | 71 +++++++++++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 71 +++++++++++++++++++++------------ templates/member/club_info.html | 13 ++++-- 7 files changed, 172 insertions(+), 66 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 0af52736..693854af 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -187,11 +187,13 @@ class Membership(models.Model): user = models.ForeignKey( User, on_delete=models.PROTECT, + verbose_name=_("user"), ) club = models.ForeignKey( Club, on_delete=models.PROTECT, + verbose_name=_("club"), ) roles = models.ManyToManyField( @@ -237,6 +239,7 @@ class Membership(models.Model): self.fee = self.club.membership_fee_paid else: self.fee = self.club.membership_fee_unpaid + if self.club.membership_duration is not None: self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) else: diff --git a/apps/member/tables.py b/apps/member/tables.py index ec21c712..7365320d 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -1,8 +1,10 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import datetime import django_tables2 as tables from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ from django.urls import reverse_lazy from django.utils.html import format_html from note.templatetags.pretty_money import pretty_money @@ -49,8 +51,39 @@ class MembershipTable(tables.Table): } ) - def render_fee(self, value): - return pretty_money(value) + def render_club(self, value): + s = value.name + if PermissionBackend().has_perm(get_current_authenticated_user(), "member.view_club", value): + s = format_html("{name}", + url=reverse_lazy('member:club_detail', kwargs={"pk": value.pk}), name=s) + + return s + + def render_fee(self, value, record): + t = pretty_money(value) + + # If it is required and if the user has the right, the renew button is displayed. + if record.club.membership_start is not None: + if record.date_start < record.club.membership_start: # If the renew is available + if not Membership.objects.filter( + club=record.club, + user=record.user, + date_start__gte=record.club.membership_start, + date_end__lte=record.club.membership_end, + ).exists(): # If the renew is not yet performed + empty_membership = Membership( + club=record.club, + user=record.user, + date_start=datetime.now().date(), + date_end=datetime.now().date(), + fee=0, + ) + if PermissionBackend().has_perm(get_current_authenticated_user(), + "member:add_membership", empty_membership): # If the user has right + t = format_html(t + ' {text}', + url=reverse_lazy('member:club_renew_membership', + kwargs={"pk": record.pk}), text=_("Renew")) + return t def render_roles(self, record): roles = record.roles.all() diff --git a/apps/member/urls.py b/apps/member/urls.py index 2000a6e4..1214f024 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -10,10 +10,11 @@ urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), path('club/', views.ClubListView.as_view(), name="club_list"), + path('club/create/', views.ClubCreateView.as_view(), name="club_create"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), path('club/manage_roles//', views.ClubManageRolesView.as_view(), name="club_manage_roles"), - path('club/create/', views.ClubCreateView.as_view(), name="club_create"), + path('club/renew_membership//', views.ClubRenewMembershipView.as_view(), name="club_renew_membership"), path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), diff --git a/apps/member/views.py b/apps/member/views.py index d3a1848f..c3f0425c 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -2,19 +2,21 @@ # SPDX-License-Identifier: GPL-3.0-or-later import io -from datetime import datetime +from datetime import datetime, timedelta from PIL import Image from django.conf import settings 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.forms import HiddenInput 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 +from django.views.generic.base import View from django.views.generic.edit import FormMixin from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token @@ -137,8 +139,8 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) context['history_list'] = HistoryTable(history_list) - club_list = Membership.objects.all().filter(user=user)\ - .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).only("club") + club_list = Membership.objects.filter(user=user, date_end__gte=datetime.today())\ + .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) context['club_list'] = MembershipTable(data=club_list) return context @@ -292,9 +294,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context['history_list'] = HistoryTable(club_transactions) club_member = Membership.objects.filter( club=club, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), - ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")).all() + date_end__gte=datetime.today(), + ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) context['member_list'] = MembershipTable(data=club_member) @@ -366,7 +367,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): else: fee = club.membership_fee_unpaid if user.note.balance < fee and not Membership.objects.filter( - club=2, + club__name="Kfet", user=user, date_start__lte=datetime.now().date(), date_end__gte=datetime.now().date(), @@ -437,3 +438,28 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): def get_success_url(self): return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) + + +class ClubRenewMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, View): + def get(self, *args, **kwargs): + user = self.request.user + membership = Membership.objects.filter(PermissionBackend.filter_queryset(user, Membership, "change"))\ + .filter(pk=self.kwargs["pk"]).get() + + if Membership.objects.filter( + club=membership.club, + user=membership.user, + date_start__gte=membership.club.membership_start, + date_end__lte=membership.club.membership_end, + ).exists(): + raise ValidationError(_("This membership is already renewed")) + + new_membership = Membership.objects.create( + user=user, + club=membership.club, + date_start=membership.date_end + timedelta(days=1), + ) + new_membership.roles.set(membership.roles.all()) + new_membership.save() + + return redirect(reverse_lazy('member:club_detail', kwargs={'pk': membership.club.pk})) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 39f5818c..69cd883e 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-04-01 04:12+0200\n" +"POT-Creation-Date: 2020-04-01 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ 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:66 apps/member/models.py:166 +#: apps/member/models.py:66 apps/member/models.py:169 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -78,7 +78,7 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 #: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -275,7 +275,7 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:71 templates/member/club_info.html:41 +#: apps/member/models.py:71 templates/member/club_info.html:46 msgid "email" msgstr "" @@ -291,11 +291,11 @@ msgstr "" msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:93 templates/member/club_info.html:31 +#: apps/member/models.py:93 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:98 templates/member/club_info.html:34 +#: apps/member/models.py:98 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "" @@ -325,71 +325,86 @@ msgid "" "members can renew their membership." msgstr "" -#: apps/member/models.py:151 apps/note/models/notes.py:139 +#: apps/member/models.py:154 apps/member/models.py:196 +#: apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:152 +#: apps/member/models.py:155 msgid "clubs" msgstr "" -#: apps/member/models.py:172 apps/permission/models.py:288 +#: apps/member/models.py:175 apps/permission/models.py:288 msgid "role" msgstr "" -#: apps/member/models.py:173 apps/member/models.py:196 +#: apps/member/models.py:176 apps/member/models.py:201 msgid "roles" msgstr "" -#: apps/member/models.py:200 +#: apps/member/models.py:205 msgid "membership starts on" msgstr "" -#: apps/member/models.py:204 +#: apps/member/models.py:209 msgid "membership ends on" msgstr "" -#: apps/member/models.py:209 +#: apps/member/models.py:214 msgid "fee" msgstr "" -#: apps/member/models.py:221 apps/member/views.py:365 +#: apps/member/models.py:226 apps/member/views.py:383 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:231 apps/member/views.py:374 +#: apps/member/models.py:236 apps/member/views.py:392 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:265 +#: apps/member/models.py:271 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:268 +#: apps/member/models.py:274 msgid "membership" msgstr "" -#: apps/member/models.py:269 +#: apps/member/models.py:275 msgid "memberships" msgstr "" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/tables.py:73 +msgid "Renew" +msgstr "" + +#: apps/member/views.py:80 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "" -#: apps/member/views.py:91 +#: apps/member/views.py:93 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:378 apps/member/views.py:410 +#: apps/member/views.py:379 +msgid "" +"This user don't have enough money to join this club, and can't have a " +"negative balance." +msgstr "" + +#: apps/member/views.py:396 apps/member/views.py:428 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:383 apps/member/views.py:415 +#: apps/member/views.py:401 apps/member/views.py:433 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" +#: apps/member/views.py:455 +msgid "This membership is already renewed" +msgstr "" + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "" @@ -491,7 +506,7 @@ msgstr "" msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:38 +#: apps/note/models/notes.py:211 templates/member/club_info.html:43 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "" @@ -913,15 +928,19 @@ msgstr "" msgid "days" msgstr "" -#: templates/member/club_info.html:47 +#: templates/member/club_info.html:32 +msgid "membership fee" +msgstr "" + +#: templates/member/club_info.html:52 msgid "Add member" msgstr "" -#: templates/member/club_info.html:50 templates/note/conso_form.html:121 +#: templates/member/club_info.html:55 templates/note/conso_form.html:121 msgid "Edit" msgstr "" -#: templates/member/club_info.html:54 templates/member/profile_info.html:48 +#: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 24f7bf8a..76bc90f6 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-04-01 04:12+0200\n" +"POT-Creation-Date: 2020-04-01 18:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ 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:66 apps/member/models.py:166 +#: apps/member/models.py:66 apps/member/models.py:169 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -74,7 +74,7 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:66 apps/logs/models.py:21 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 #: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -271,7 +271,7 @@ msgstr "payé" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:71 templates/member/club_info.html:41 +#: apps/member/models.py:71 templates/member/club_info.html:46 msgid "email" msgstr "courriel" @@ -287,11 +287,11 @@ msgstr "nécessite des adhésions" msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:93 templates/member/club_info.html:31 +#: apps/member/models.py:93 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:98 templates/member/club_info.html:34 +#: apps/member/models.py:98 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" @@ -325,71 +325,86 @@ 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:151 apps/note/models/notes.py:139 +#: apps/member/models.py:154 apps/member/models.py:196 +#: apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:152 +#: apps/member/models.py:155 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:172 apps/permission/models.py:288 +#: apps/member/models.py:175 apps/permission/models.py:288 msgid "role" msgstr "rôle" -#: apps/member/models.py:173 apps/member/models.py:196 +#: apps/member/models.py:176 apps/member/models.py:201 msgid "roles" msgstr "rôles" -#: apps/member/models.py:200 +#: apps/member/models.py:205 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:204 +#: apps/member/models.py:209 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:209 +#: apps/member/models.py:214 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:221 apps/member/views.py:365 +#: apps/member/models.py:226 apps/member/views.py:383 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:231 apps/member/views.py:374 +#: apps/member/models.py:236 apps/member/views.py:392 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:265 +#: apps/member/models.py:271 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:268 +#: apps/member/models.py:274 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:269 +#: apps/member/models.py:275 msgid "memberships" msgstr "adhésions" -#: apps/member/views.py:78 templates/member/profile_info.html:45 +#: apps/member/tables.py:73 +msgid "Renew" +msgstr "" + +#: apps/member/views.py:80 templates/member/profile_info.html:45 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:91 +#: apps/member/views.py:93 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:378 apps/member/views.py:410 +#: apps/member/views.py:379 +msgid "" +"This user don't have enough money to join this club, and can't have a " +"negative balance." +msgstr "" + +#: apps/member/views.py:396 apps/member/views.py:428 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:383 apps/member/views.py:415 +#: apps/member/views.py:401 apps/member/views.py:433 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." +#: apps/member/views.py:455 +msgid "This membership is already renewed" +msgstr "Cette adhésion est déjà renouvelée" + #: apps/note/admin.py:120 apps/note/models/transactions.py:94 msgid "source" msgstr "source" @@ -492,7 +507,7 @@ msgstr "Alias invalide" msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:38 +#: apps/note/models/notes.py:211 templates/member/club_info.html:43 #: templates/member/profile_info.html:36 msgid "aliases" msgstr "alias" @@ -916,15 +931,19 @@ msgstr "Club parent" msgid "days" msgstr "jours" -#: templates/member/club_info.html:47 +#: templates/member/club_info.html:32 +msgid "membership fee" +msgstr "cotisation pour adhérer" + +#: templates/member/club_info.html:52 msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:50 templates/note/conso_form.html:121 +#: templates/member/club_info.html:55 templates/note/conso_form.html:121 msgid "Edit" msgstr "Éditer" -#: templates/member/club_info.html:54 templates/member/profile_info.html:48 +#: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" diff --git a/templates/member/club_info.html b/templates/member/club_info.html index ef5c59f1..a781bea8 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -28,11 +28,16 @@
    {% trans 'membership duration'|capfirst %}
    {{ club.membership_duration }} {% trans "days" %}
    -
    {% trans 'membership fee (paid students)'|capfirst %}
    -
    {{ club.membership_fee_paid|pretty_money }}
    + {% if club.membership_fee_paid == club.membership_fee_unpaid %} +
    {% trans 'membership fee'|capfirst %}
    +
    {{ club.membership_fee_paid|pretty_money }}
    + {% else %} +
    {% trans 'membership fee (paid students)'|capfirst %}
    +
    {{ club.membership_fee_paid|pretty_money }}
    -
    {% trans 'membership fee (unpaid students)'|capfirst %}
    -
    {{ club.membership_fee_unpaid|pretty_money }}
    +
    {% trans 'membership fee (unpaid students)'|capfirst %}
    +
    {{ club.membership_fee_unpaid|pretty_money }}
    + {% endif %} {% endif %}
    {% trans 'aliases'|capfirst %}
    From 5eb08fd822809563a053a2f89d47c82819c3e83f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 20:14:16 +0200 Subject: [PATCH 34/66] Dynamic user research --- apps/member/filters.py | 33 -------------------------- apps/member/tables.py | 10 +++++++- apps/member/views.py | 24 +++++++++++++------ locale/de/LC_MESSAGES/django.po | 2 +- locale/fr/LC_MESSAGES/django.po | 4 ++-- templates/member/club_list.html | 2 +- templates/member/user_list.html | 42 +++++++++++++++++++++++---------- 7 files changed, 59 insertions(+), 58 deletions(-) delete mode 100644 apps/member/filters.py diff --git a/apps/member/filters.py b/apps/member/filters.py deleted file mode 100644 index 951723e8..00000000 --- a/apps/member/filters.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout, Submit -from django.contrib.auth.models import User -from django.db.models import CharField -from django_filters import FilterSet, CharFilter - - -class UserFilter(FilterSet): - class Meta: - model = User - fields = ['last_name', 'first_name', 'username', 'profile__section'] - filter_overrides = { - CharField: { - 'filter_class': CharFilter, - 'extra': lambda f: { - 'lookup_expr': 'icontains' - } - } - } - - -class UserFilterFormHelper(FormHelper): - form_method = 'GET' - layout = Layout( - 'last_name', - 'first_name', - 'username', - 'profile__section', - Submit('Submit', 'Apply Filter'), - ) diff --git a/apps/member/tables.py b/apps/member/tables.py index 7365320d..a9999c11 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -31,7 +31,11 @@ class ClubTable(tables.Table): class UserTable(tables.Table): section = tables.Column(accessor='profile.section') - solde = tables.Column(accessor='note.balance') + + balance = tables.Column(accessor='note.balance', verbose_name=_("Balance")) + + def render_balance(self, value): + return pretty_money(value) class Meta: attrs = { @@ -40,6 +44,10 @@ class UserTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('last_name', 'first_name', 'username', 'email') model = User + row_attrs = { + 'class': 'table-row', + 'data-href': lambda record: record.pk + } class MembershipTable(tables.Table): diff --git a/apps/member/views.py b/apps/member/views.py index c3f0425c..e507c2cf 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -27,7 +27,6 @@ from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin -from .filters import UserFilter, UserFilterFormHelper from .forms import SignUpForm, ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm from .models import Club, Membership from .tables import ClubTable, UserTable, MembershipTable @@ -152,18 +151,29 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): model = User table_class = UserTable template_name = 'member/user_list.html' - filter_class = UserFilter - formhelper_class = UserFilterFormHelper def get_queryset(self, **kwargs): qs = super().get_queryset() - self.filter = self.filter_class(self.request.GET, queryset=qs) - self.filter.form.helper = self.formhelper_class() - return self.filter.qs + if "search" in self.request.GET: + pattern = self.request.GET["search"] + + if not pattern: + return qs.none() + + qs = qs.filter( + Q(first_name__iregex=pattern) + | Q(last_name__iregex=pattern) + | Q(profile__section__iregex=pattern) + | Q(note__alias__name__iregex="^" + pattern) + | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern)) + ) + else: + qs = qs.none() + + return qs def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["filter"] = self.filter return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 69cd883e..16c73f35 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -949,7 +949,7 @@ msgid "search clubs" msgstr "" #: templates/member/club_list.html:12 -msgid "Créer un club" +msgid "Create club" msgstr "" #: templates/member/club_list.html:19 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 76bc90f6..9754fa9c 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -952,8 +952,8 @@ msgid "search clubs" msgstr "Chercher un club" #: templates/member/club_list.html:12 -msgid "Créer un club" -msgstr "" +msgid "Create club" +msgstr "Créer un club" #: templates/member/club_list.html:19 msgid "club listing " diff --git a/templates/member/club_list.html b/templates/member/club_list.html index 7f0b02a1..2653ace8 100644 --- a/templates/member/club_list.html +++ b/templates/member/club_list.html @@ -9,7 +9,7 @@
    - {% trans "Créer un club" %} + {% trans "Create club" %}
    diff --git a/templates/member/user_list.html b/templates/member/user_list.html index 821ea619..d0eaaedb 100644 --- a/templates/member/user_list.html +++ b/templates/member/user_list.html @@ -2,28 +2,44 @@ {% load render_table from django_tables2 %} {% load crispy_forms_tags%} {% block content %} + -New User +
    -
    -{% crispy filter.form filter.form.helper %} -
    -
    -
    - {% render_table table %} +
    + {% render_table table %}
    -
    {% endblock %} {% block extrajavascript %} {% endblock %} From 3f5faa0b0525c9a3331303b6807b08c614885a24 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 1 Apr 2020 20:56:24 +0200 Subject: [PATCH 35/66] Add tab for user list --- apps/member/views.py | 5 ++- apps/note/models/transactions.py | 5 +++ apps/note/tables.py | 10 ++++-- apps/permission/templatetags/perms.py | 48 +++++++++++++++++++++---- templates/activity/activity_detail.html | 10 +++--- templates/base.html | 5 +++ 6 files changed, 68 insertions(+), 15 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index e507c2cf..96550e14 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -170,10 +170,13 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): else: qs = qs.none() - return qs + return qs[:20] def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + + context["title"] = _("Search user") + return context diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index d9b860ae..83f8f914 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -46,12 +46,14 @@ class TransactionTemplate(models.Model): unique=True, error_messages={'unique': _("A template with this name already exist")}, ) + destination = models.ForeignKey( NoteClub, on_delete=models.PROTECT, related_name='+', # no reverse verbose_name=_('destination'), ) + amount = models.PositiveIntegerField( verbose_name=_('amount'), help_text=_('in centimes'), @@ -62,9 +64,12 @@ class TransactionTemplate(models.Model): verbose_name=_('type'), max_length=31, ) + display = models.BooleanField( default=True, + verbose_name=_("display"), ) + description = models.CharField( verbose_name=_('description'), max_length=255, diff --git a/apps/note/tables.py b/apps/note/tables.py index 0d83e3cc..a38beb9a 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -118,7 +118,8 @@ class AliasTable(tables.Table): delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) + attrs={'td': {'class': 'col-sm-1'}}, + verbose_name=_("Delete"),) class ButtonTable(tables.Table): @@ -134,17 +135,20 @@ class ButtonTable(tables.Table): } model = TransactionTemplate + exclude = ('id',) edit = tables.LinkColumn('note:template_update', args=[A('pk')], attrs={'td': {'class': 'col-sm-1'}, 'a': {'class': 'btn btn-sm btn-primary'}}, text=_('edit'), - accessor='pk') + accessor='pk', + verbose_name=_("Edit"),) delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE, extra_context={"delete_trans": _('delete')}, - attrs={'td': {'class': 'col-sm-1'}}) + attrs={'td': {'class': 'col-sm-1'}}, + verbose_name=_("Delete"),) def render_amount(self, value): return pretty_money(value) diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index aa2feeca..b06fdd9a 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -4,6 +4,7 @@ from django.contrib.contenttypes.models import ContentType from django.template.defaultfilters import stringfilter from django import template +from note.models import Transaction from note_kfet.middlewares import get_current_authenticated_user, get_current_session from permission.backends import PermissionBackend @@ -21,9 +22,7 @@ def not_empty_model_list(model_name): return True if session.get("not_empty_model_list_" + model_name, None): return session.get("not_empty_model_list_" + model_name, None) == 1 - spl = model_name.split(".") - ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) - qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, "view")).all() + qs = model_list(model_name) session["not_empty_model_list_" + model_name] = 1 if qs.exists() else 2 return session.get("not_empty_model_list_" + model_name) == 1 @@ -41,18 +40,55 @@ def not_empty_model_change_list(model_name): return True if session.get("not_empty_model_change_list_" + model_name, None): return session.get("not_empty_model_change_list_" + model_name, None) == 1 - spl = model_name.split(".") - ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) - qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, "change")) + qs = model_list(model_name, "change") session["not_empty_model_change_list_" + model_name] = 1 if qs.exists() else 2 return session.get("not_empty_model_change_list_" + model_name) == 1 +@stringfilter +def model_list(model_name, t="view"): + """ + Return the queryset of all visible instances of the given model. + """ + user = get_current_authenticated_user() + if user is None: + return False + spl = model_name.split(".") + ct = ContentType.objects.get(app_label=spl[0], model=spl[1]) + qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, t)).all() + return qs + + def has_perm(perm, obj): return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) +def can_create_transaction(): + """ + :return: True iff the authenticated user can create a transaction. + """ + user = get_current_authenticated_user() + session = get_current_session() + if user is None: + return False + elif user.is_superuser and session.get("permission_mask", 0) >= 42: + return True + if session.get("can_create_transaction", None): + return session.get("can_create_transaction", None) == 1 + + empty_transaction = Transaction( + source=user.note, + destination=user.note, + quantity=1, + amount=0, + reason="Check permissions", + ) + session["can_create_transaction"] = PermissionBackend().has_perm(user, "note.add_transaction", empty_transaction) + return session.get("can_create_transaction") == 1 + + 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('model_list', model_list) register.filter('has_perm', has_perm) diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 0ed3c719..84182065 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -25,7 +25,7 @@
    {% trans 'end date'|capfirst %}
    {{ activity.date_end }}
    - {% if "view_"|has_perm:activity.creater %} + {% if ".view_"|has_perm:activity.creater %}
    {% trans 'creater'|capfirst %}
    {{ activity.creater }}
    {% endif %} @@ -53,17 +53,17 @@
    - {% if activity.open and "change__open"|has_perm:activity %} + {% if activity.open and ".change__open"|has_perm:activity %} {% trans "Entry page" %} {% endif %} - {% if activity.valid and "change__open"|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 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 %} + {% if ".view_"|has_perm:activity %} {% trans "edit"|capfirst %} {% endif %} {% if activity.activity_type.can_invite and not activity_started %} diff --git a/templates/base.html b/templates/base.html index 26903c2f..c44e2467 100644 --- a/templates/base.html +++ b/templates/base.html @@ -84,6 +84,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Transfer' %}
    • {% endif %} + {% if "auth.user"|model_list|length >= 2 %} +
  • + {% trans 'Users' %} +
    • + {% endif %} {% if "member.club"|not_empty_model_list %}
  • {% trans 'Clubs' %} From 5c9c0bbc2a2b05b3d3ee10ac31c4ada127ef665b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 00:30:22 +0200 Subject: [PATCH 36/66] Optimize permissions, use memoization --- apps/logs/signals.py | 4 +- apps/permission/backends.py | 50 ++++++++++++++++++------ apps/permission/decorators.py | 56 +++++++++++++++++++++++++++ apps/permission/models.py | 2 +- apps/permission/signals.py | 4 +- apps/permission/templatetags/perms.py | 10 +---- 6 files changed, 101 insertions(+), 25 deletions(-) create mode 100644 apps/permission/decorators.py diff --git a/apps/logs/signals.py b/apps/logs/signals.py index 37e9ba79..68bf95c0 100644 --- a/apps/logs/signals.py +++ b/apps/logs/signals.py @@ -50,7 +50,7 @@ def save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_save"): + if hasattr(instance, "_no_log"): return # noinspection PyProtectedMember @@ -109,7 +109,7 @@ def delete_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_force_delete"): + if hasattr(instance, "_no_log"): return # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP diff --git a/apps/permission/backends.py b/apps/permission/backends.py index b95f8203..ef58403b 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -10,6 +10,7 @@ from django.db.models import Q, F from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club +from .decorators import memoize from .models import Permission @@ -22,6 +23,28 @@ class PermissionBackend(ModelBackend): supports_anonymous_user = False supports_inactive_user = False + @staticmethod + @memoize + def get_raw_permissions(user, t): + """ + Query permissions of a certain type for a user, then memoize it. + :param user: The owner of the permissions + :param t: The type of the permissions: view, change, add or delete + :return: The queryset of the permissions of the user (memoized) grouped by clubs + """ + if isinstance(user, AnonymousUser): + # Unauthenticated users have no permissions + return Permission.objects.none() + + return Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ + .filter( + rolepermissions__role__membership__user=user, + rolepermissions__role__membership__date_start__lte=datetime.date.today(), + rolepermissions__role__membership__date_end__gte=datetime.date.today(), + type=t, + mask__rank__lte=get_current_session().get("permission_mask", 0), + ).distinct('club', 'pk') + @staticmethod def permissions(user, model, type): """ @@ -31,18 +54,16 @@ class PermissionBackend(ModelBackend): :param type: The type of the permissions: view, change, add or delete :return: A generator of the requested permissions """ - for permission in Permission.objects.annotate(club=F("rolepermissions__role__membership__club")) \ - .filter( - rolepermissions__role__membership__user=user, - rolepermissions__role__membership__date_start__lte=datetime.date.today(), - rolepermissions__role__membership__date_end__gte=datetime.date.today(), - model__app_label=model.app_label, # For polymorphic models, we don't filter on model type - type=type, - ).all(): - if not isinstance(model, permission.model.__class__) or not permission.club: + clubs = {} + + for permission in PermissionBackend.get_raw_permissions(user, type): + if not isinstance(model.model_class()(), permission.model.model_class()) or not permission.club: continue - club = Club.objects.get(pk=permission.club) + if permission.club not in clubs: + clubs[permission.club] = club = Club.objects.get(pk=permission.club) + else: + club = clubs[permission.club] permission = permission.about( user=user, club=club, @@ -56,10 +77,10 @@ class PermissionBackend(ModelBackend): F=F, Q=Q ) - if permission.mask.rank <= get_current_session().get("permission_mask", 0): - yield permission + yield permission @staticmethod + @memoize def filter_queryset(user, model, t, field=None): """ Filter a queryset by considering the permissions of a given user. @@ -93,10 +114,15 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query + @memoize def has_perm(self, user_obj, perm, obj=None): if user_obj is None or isinstance(user_obj, AnonymousUser): return False + sess = get_current_session() + if sess is not None and sess.session_key is None: + return Permission.objects.none() + if user_obj.is_superuser and get_current_session().get("permission_mask", 0) >= 42: return True diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py new file mode 100644 index 00000000..b6863f23 --- /dev/null +++ b/apps/permission/decorators.py @@ -0,0 +1,56 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from functools import lru_cache +from time import time + +from django.contrib.sessions.models import Session +from note_kfet.middlewares import get_current_session + + +def memoize(f): + """ + Memoize results and store in sessions + + This decorator is useful for permissions: they are loaded once needed, then stored for next calls. + The storage is contained with sessions since it depends on the selected mask. + """ + sess_funs = {} + last_collect = time() + + def collect(): + """ + Clear cache of results when sessions are invalid, to flush useless data. + This function is called every minute. + """ + nonlocal sess_funs + + new_sess_funs = {} + for sess_key in sess_funs: + if Session.objects.filter(session_key=sess_key).exists(): + new_sess_funs[sess_key] = sess_funs[sess_key] + sess_funs = new_sess_funs + + def func(*args, **kwargs): + nonlocal last_collect + + if time() - last_collect > 60: + # Clear cache + collect() + last_collect = time() + + # If there is no session, then we don't memoize anything. + sess = get_current_session() + if sess is None or sess.session_key is None: + return f(*args, **kwargs) + + sess_key = sess.session_key + if sess_key not in sess_funs: + # lru_cache makes the job of memoization + # We store only the 512 latest data per session. It has to be enough. + sess_funs[sess_key] = lru_cache(512)(f) + return sess_funs[sess_key](*args, **kwargs) + + func.func_name = f.__name__ + + return func \ No newline at end of file diff --git a/apps/permission/models.py b/apps/permission/models.py index b1012159..8aaf416c 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -45,7 +45,7 @@ class InstancedPermission: else: oldpk = obj.pk # Ensure previous models are deleted - self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk") + 1).delete() + self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk")).delete() # Force insertion, no data verification, no trigger obj._force_save = True Model.save(obj, force_insert=True) diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 3bb79897..4ee63ae3 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -27,7 +27,7 @@ def pre_save_object(sender, instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_no_log"): + if hasattr(instance, "_force_save"): return user = get_current_authenticated_user() @@ -74,7 +74,7 @@ def pre_delete_object(instance, **kwargs): if instance._meta.label_lower in EXCLUDED: return - if hasattr(instance, "_no_log"): + if hasattr(instance, "_force_delete"): return user = get_current_authenticated_user() diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index b06fdd9a..4f61fcfe 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -20,11 +20,8 @@ def not_empty_model_list(model_name): return False elif user.is_superuser and session.get("permission_mask", 0) >= 42: return True - if session.get("not_empty_model_list_" + model_name, None): - return session.get("not_empty_model_list_" + model_name, None) == 1 qs = model_list(model_name) - session["not_empty_model_list_" + model_name] = 1 if qs.exists() else 2 - return session.get("not_empty_model_list_" + model_name) == 1 + return qs.exists() @stringfilter @@ -38,11 +35,8 @@ def not_empty_model_change_list(model_name): return False elif user.is_superuser and session.get("permission_mask", 0) >= 42: return True - if session.get("not_empty_model_change_list_" + model_name, None): - return session.get("not_empty_model_change_list_" + model_name, None) == 1 qs = model_list(model_name, "change") - session["not_empty_model_change_list_" + model_name] = 1 if qs.exists() else 2 - return session.get("not_empty_model_change_list_" + model_name) == 1 + return qs.exists() @stringfilter From 8ad464ae0c0731f91f41542a1531c1639bc71928 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 00:42:00 +0200 Subject: [PATCH 37/66] Fix CI --- apps/permission/backends.py | 4 ++-- apps/permission/decorators.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/permission/backends.py b/apps/permission/backends.py index ef58403b..4cc0dd9e 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -10,8 +10,8 @@ from django.db.models import Q, F from note.models import Note, NoteUser, NoteClub, NoteSpecial from note_kfet.middlewares import get_current_session from member.models import Membership, Club -from .decorators import memoize +from .decorators import memoize from .models import Permission @@ -43,7 +43,7 @@ class PermissionBackend(ModelBackend): rolepermissions__role__membership__date_end__gte=datetime.date.today(), type=t, mask__rank__lte=get_current_session().get("permission_mask", 0), - ).distinct('club', 'pk') + ).distinct('club', 'pk',) @staticmethod def permissions(user, model, type): diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py index b6863f23..cb8649fd 100644 --- a/apps/permission/decorators.py +++ b/apps/permission/decorators.py @@ -53,4 +53,4 @@ def memoize(f): func.func_name = f.__name__ - return func \ No newline at end of file + return func From be428017090d8cbfe9ffc8859adc98a4f213ddb5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 14:50:28 +0200 Subject: [PATCH 38/66] The memoization doesn't work when objects don't have a primary key. --- apps/member/tables.py | 6 +++--- apps/member/views.py | 2 +- apps/permission/backends.py | 15 +++++++++++++-- apps/permission/decorators.py | 5 ++++- apps/permission/permissions.py | 2 +- apps/permission/signals.py | 8 ++++---- apps/permission/templatetags/perms.py | 4 ++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/apps/member/tables.py b/apps/member/tables.py index a9999c11..c8a510ff 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -61,7 +61,7 @@ class MembershipTable(tables.Table): def render_club(self, value): s = value.name - if PermissionBackend().has_perm(get_current_authenticated_user(), "member.view_club", value): + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.view_club", value): s = format_html("{name}", url=reverse_lazy('member:club_detail', kwargs={"pk": value.pk}), name=s) @@ -86,7 +86,7 @@ class MembershipTable(tables.Table): date_end=datetime.now().date(), fee=0, ) - if PermissionBackend().has_perm(get_current_authenticated_user(), + if PermissionBackend.check_perm(get_current_authenticated_user(), "member:add_membership", empty_membership): # If the user has right t = format_html(t + ' {text}', url=reverse_lazy('member:club_renew_membership', @@ -96,7 +96,7 @@ class MembershipTable(tables.Table): def render_roles(self, record): roles = record.roles.all() s = ", ".join(str(role) for role in roles) - if PermissionBackend().has_perm(get_current_authenticated_user(), "member.change_membership_roles", record): + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.change_membership_roles", record): s = format_html("" + s + "") return s diff --git a/apps/member/views.py b/apps/member/views.py index 96550e14..f695002f 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -299,7 +299,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context = super().get_context_data(**kwargs) club = context["club"] - if PermissionBackend().has_perm(self.request.user, "member.change_club_membership_start", club): + if PermissionBackend.check_perm(self.request.user, "member.change_club_membership_start", club): club.update_membership_dates() club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 4cc0dd9e..4fb7b577 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -114,8 +114,16 @@ class PermissionBackend(ModelBackend): query = query | perm.query return query + @staticmethod @memoize - def has_perm(self, user_obj, perm, obj=None): + def check_perm(user_obj, perm, obj=None): + """ + Check is the given user has the permission over a given object. + The result is then memoized. + Exception: for add permissions, since the object is not hashable since it doesn't have any + primary key, the result is not memoized. Moreover, the right could change + (e.g. for a transaction, the balance of the user could change) + """ if user_obj is None or isinstance(user_obj, AnonymousUser): return False @@ -134,10 +142,13 @@ class PermissionBackend(ModelBackend): perm_field = perm[2] if len(perm) == 3 else None ct = ContentType.objects.get_for_model(obj) if any(permission.applies(obj, perm_type, perm_field) - for permission in self.permissions(user_obj, ct, perm_type)): + for permission in PermissionBackend.permissions(user_obj, ct, perm_type)): return True return False + def has_perm(self, user_obj, perm, obj=None): + return PermissionBackend.check_perm(user_obj, perm, obj) + def has_module_perms(self, user_obj, app_label): return False diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py index cb8649fd..f144935a 100644 --- a/apps/permission/decorators.py +++ b/apps/permission/decorators.py @@ -49,7 +49,10 @@ def memoize(f): # lru_cache makes the job of memoization # We store only the 512 latest data per session. It has to be enough. sess_funs[sess_key] = lru_cache(512)(f) - return sess_funs[sess_key](*args, **kwargs) + try: + return sess_funs[sess_key](*args, **kwargs) + except TypeError: # For add permissions, objects are not hashable (not yet created). Don't memoize this case. + return f(*args, **kwargs) func.func_name = f.__name__ diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py index 7097085f..40321567 100644 --- a/apps/permission/permissions.py +++ b/apps/permission/permissions.py @@ -44,7 +44,7 @@ class StrongDjangoObjectPermissions(DjangoObjectPermissions): perms = self.get_required_object_permissions(request.method, model_cls) # if not user.has_perms(perms, obj): - if not all(PermissionBackend().has_perm(user, perm, obj) for perm in perms): + if not all(PermissionBackend.check_perm(user, perm, obj) for perm in perms): # If the user does not have permissions we need to determine if # they have read permissions to see 403, or not, and simply see # a 404 response. diff --git a/apps/permission/signals.py b/apps/permission/signals.py index 4ee63ae3..bf54b72f 100644 --- a/apps/permission/signals.py +++ b/apps/permission/signals.py @@ -44,7 +44,7 @@ def pre_save_object(sender, instance, **kwargs): # We check if the user can change the model # If the user has all right on a model, then OK - if PermissionBackend().has_perm(user, app_label + ".change_" + model_name, instance): + if PermissionBackend.check_perm(user, app_label + ".change_" + model_name, instance): return # In the other case, we check if he/she has the right to change one field @@ -56,11 +56,11 @@ def pre_save_object(sender, instance, **kwargs): # If the field wasn't modified, no need to check the permissions if old_value == new_value: continue - if not PermissionBackend().has_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): + if not PermissionBackend.check_perm(user, app_label + ".change_" + model_name + "_" + field_name, instance): raise PermissionDenied else: # We check if the user has right to add the object - has_perm = PermissionBackend().has_perm(user, app_label + ".add_" + model_name, instance) + has_perm = PermissionBackend.check_perm(user, app_label + ".add_" + model_name, instance) if not has_perm: raise PermissionDenied @@ -87,5 +87,5 @@ def pre_delete_object(instance, **kwargs): model_name = model_name_full[1] # We check if the user has rights to delete the object - if not PermissionBackend().has_perm(user, app_label + ".delete_" + model_name, instance): + if not PermissionBackend.check_perm(user, app_label + ".delete_" + model_name, instance): raise PermissionDenied diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py index 4f61fcfe..a89c7f49 100644 --- a/apps/permission/templatetags/perms.py +++ b/apps/permission/templatetags/perms.py @@ -54,7 +54,7 @@ def model_list(model_name, t="view"): def has_perm(perm, obj): - return PermissionBackend().has_perm(get_current_authenticated_user(), perm, obj) + return PermissionBackend.check_perm(get_current_authenticated_user(), perm, obj) def can_create_transaction(): @@ -77,7 +77,7 @@ def can_create_transaction(): amount=0, reason="Check permissions", ) - session["can_create_transaction"] = PermissionBackend().has_perm(user, "note.add_transaction", empty_transaction) + session["can_create_transaction"] = PermissionBackend.check_perm(user, "note.add_transaction", empty_transaction) return session.get("can_create_transaction") == 1 From 17ea2246ca2afa869acdbf8ace39f125a4519b89 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 15:43:41 +0200 Subject: [PATCH 39/66] Remove useless field in activities --- apps/activity/models.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/activity/models.py b/apps/activity/models.py index e3ff0c2f..ed2d94c9 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -73,15 +73,6 @@ class Activity(models.Model): verbose_name=_('organizer'), ) - note = models.ForeignKey( - 'note.Note', - on_delete=models.PROTECT, - blank=True, - null=True, - related_name='+', - verbose_name=_('note'), - ) - attendees_club = models.ForeignKey( 'member.Club', on_delete=models.PROTECT, @@ -160,9 +151,7 @@ class Entry(models.Model): if insert and self.guest: GuestTransaction.objects.create( source=self.note, - source_alias=self.note.user.username, - destination=self.note, - destination_alias=self.activity.organizer.name, + destination=self.activity.organizer.note, quantity=1, amount=self.activity.activity_type.guest_entry_fee, reason="Invitation " + self.activity.name + " " + self.guest.first_name + " " + self.guest.last_name, From 0cdc8ae004a6d18f366203c9b13946f38e57bb18 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 2 Apr 2020 16:06:58 +0200 Subject: [PATCH 40/66] RolePermissions were missing in the API --- apps/permission/api/serializers.py | 13 ++++++++++++- apps/permission/api/urls.py | 5 +++-- apps/permission/api/views.py | 20 ++++++++++++++++---- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/apps/permission/api/serializers.py b/apps/permission/api/serializers.py index 0a52f4fe..e30ed7dc 100644 --- a/apps/permission/api/serializers.py +++ b/apps/permission/api/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers -from ..models import Permission +from ..models import Permission, RolePermissions class PermissionSerializer(serializers.ModelSerializer): @@ -15,3 +15,14 @@ class PermissionSerializer(serializers.ModelSerializer): class Meta: model = Permission fields = '__all__' + + +class RolePermissionsSerializer(serializers.ModelSerializer): + """ + REST API Serializer for RolePermissions types. + The djangorestframework plugin will analyse the model `RolePermissions` and parse all fields in the API. + """ + + class Meta: + model = RolePermissions + fields = '__all__' diff --git a/apps/permission/api/urls.py b/apps/permission/api/urls.py index d50344ea..b5d53466 100644 --- a/apps/permission/api/urls.py +++ b/apps/permission/api/urls.py @@ -1,11 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from .views import PermissionViewSet +from .views import PermissionViewSet, RolePermissionsViewSet def register_permission_urls(router, path): """ Configure router for permission REST API. """ - router.register(path, PermissionViewSet) + router.register(path + "/permission", PermissionViewSet) + router.register(path + "/roles", RolePermissionsViewSet) diff --git a/apps/permission/api/views.py b/apps/permission/api/views.py index 965e82c9..6a068225 100644 --- a/apps/permission/api/views.py +++ b/apps/permission/api/views.py @@ -4,17 +4,29 @@ from django_filters.rest_framework import DjangoFilterBackend from api.viewsets import ReadOnlyProtectedModelViewSet -from .serializers import PermissionSerializer -from ..models import Permission +from .serializers import PermissionSerializer, RolePermissionsSerializer +from ..models import Permission, RolePermissions class PermissionViewSet(ReadOnlyProtectedModelViewSet): """ REST API View set. - The djangorestframework plugin will get all `Changelog` objects, serialize it to JSON with the given serializer, - then render it on /api/logs/ + The djangorestframework plugin will get all `Permission` objects, serialize it to JSON with the given serializer, + then render it on /api/permission/permission/ """ queryset = Permission.objects.all() serializer_class = PermissionSerializer filter_backends = [DjangoFilterBackend] filterset_fields = ['model', 'type', ] + + +class RolePermissionsViewSet(ReadOnlyProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `RolePermission` objects, serialize it to JSON with the given serializer + then render it on /api/permission/roles/ + """ + queryset = RolePermissions.objects.all() + serializer_class = RolePermissionsSerializer + filter_backends = [DjangoFilterBackend] + filterset_fields = ['role', ] From 04f9ae51ed2b63cd1b62f2da1d18aec5627f93c1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 3 Apr 2020 04:03:58 +0200 Subject: [PATCH 41/66] Fix docker setup, remove select2 files (unused) --- .coveragerc | 12 - .env_example | 24 +- Dockerfile | 1 - README.md | 24 +- static/vendor/select2/Gruntfile.js | 262 - static/vendor/select2/bower.json | 13 - static/vendor/select2/component.json | 19 - static/vendor/select2/composer.json | 22 - .../select2/docs/announcements-4.0.html | 12 - static/vendor/select2/docs/community.html | 12 - static/vendor/select2/docs/examples.html | 12 - static/vendor/select2/docs/index.html | 12 - static/vendor/select2/docs/options-old.html | 12 - static/vendor/select2/docs/options.html | 12 - static/vendor/select2/package.json | 65 - static/vendor/select2/src/js/banner.end.js | 6 - static/vendor/select2/src/js/banner.start.js | 6 - .../select2/src/js/jquery.mousewheel.shim.js | 6 - .../vendor/select2/src/js/jquery.select2.js | 58 - static/vendor/select2/src/js/jquery.shim.js | 14 - .../src/js/select2/compat/containerCss.js | 56 - .../src/js/select2/compat/dropdownCss.js | 56 - .../src/js/select2/compat/initSelection.js | 42 - .../src/js/select2/compat/inputData.js | 128 - .../select2/src/js/select2/compat/matcher.js | 42 - .../select2/src/js/select2/compat/query.js | 26 - .../select2/src/js/select2/compat/utils.js | 43 - static/vendor/select2/src/js/select2/core.js | 618 - .../select2/src/js/select2/data/ajax.js | 110 - .../select2/src/js/select2/data/array.js | 79 - .../select2/src/js/select2/data/base.js | 40 - .../src/js/select2/data/maximumInputLength.js | 31 - .../js/select2/data/maximumSelectionLength.js | 31 - .../src/js/select2/data/minimumInputLength.js | 30 - .../select2/src/js/select2/data/select.js | 285 - .../select2/src/js/select2/data/tags.js | 128 - .../select2/src/js/select2/data/tokenizer.js | 116 - .../vendor/select2/src/js/select2/defaults.js | 397 - .../select2/src/js/select2/diacritics.js | 850 -- .../vendor/select2/src/js/select2/dropdown.js | 42 - .../src/js/select2/dropdown/attachBody.js | 222 - .../js/select2/dropdown/attachContainer.js | 18 - .../src/js/select2/dropdown/closeOnSelect.js | 35 - .../js/select2/dropdown/hidePlaceholder.js | 42 - .../src/js/select2/dropdown/infiniteScroll.js | 89 - .../dropdown/minimumResultsForSearch.js | 39 - .../select2/src/js/select2/dropdown/search.js | 102 - .../src/js/select2/dropdown/selectOnClose.js | 50 - .../js/select2/dropdown/stopPropagation.js | 38 - .../vendor/select2/src/js/select2/i18n/af.js | 47 - .../vendor/select2/src/js/select2/i18n/ar.js | 33 - .../vendor/select2/src/js/select2/i18n/az.js | 30 - .../vendor/select2/src/js/select2/i18n/bg.js | 50 - .../vendor/select2/src/js/select2/i18n/bn.js | 45 - .../vendor/select2/src/js/select2/i18n/bs.js | 58 - .../vendor/select2/src/js/select2/i18n/ca.js | 55 - .../vendor/select2/src/js/select2/i18n/cs.js | 64 - .../vendor/select2/src/js/select2/i18n/da.js | 39 - .../vendor/select2/src/js/select2/i18n/de.js | 43 - .../vendor/select2/src/js/select2/i18n/dsb.js | 52 - .../vendor/select2/src/js/select2/i18n/el.js | 55 - .../vendor/select2/src/js/select2/i18n/en.js | 47 - .../vendor/select2/src/js/select2/i18n/es.js | 55 - .../vendor/select2/src/js/select2/i18n/et.js | 56 - .../vendor/select2/src/js/select2/i18n/eu.js | 54 - .../vendor/select2/src/js/select2/i18n/fa.js | 41 - .../vendor/select2/src/js/select2/i18n/fi.js | 33 - .../vendor/select2/src/js/select2/i18n/fr.js | 36 - .../vendor/select2/src/js/select2/i18n/gl.js | 42 - .../vendor/select2/src/js/select2/i18n/he.js | 59 - .../vendor/select2/src/js/select2/i18n/hi.js | 42 - .../vendor/select2/src/js/select2/i18n/hr.js | 47 - .../vendor/select2/src/js/select2/i18n/hsb.js | 52 - .../vendor/select2/src/js/select2/i18n/hu.js | 33 - .../vendor/select2/src/js/select2/i18n/hy.js | 41 - .../vendor/select2/src/js/select2/i18n/id.js | 33 - .../vendor/select2/src/js/select2/i18n/is.js | 44 - .../vendor/select2/src/js/select2/i18n/it.js | 51 - .../vendor/select2/src/js/select2/i18n/ja.js | 39 - .../vendor/select2/src/js/select2/i18n/ka.js | 40 - .../vendor/select2/src/js/select2/i18n/km.js | 39 - .../vendor/select2/src/js/select2/i18n/ko.js | 39 - .../vendor/select2/src/js/select2/i18n/lt.js | 55 - .../vendor/select2/src/js/select2/i18n/lv.js | 54 - .../vendor/select2/src/js/select2/i18n/mk.js | 50 - .../vendor/select2/src/js/select2/i18n/ms.js | 33 - .../vendor/select2/src/js/select2/i18n/nb.js | 33 - .../vendor/select2/src/js/select2/i18n/ne.js | 47 - .../vendor/select2/src/js/select2/i18n/nl.js | 46 - .../vendor/select2/src/js/select2/i18n/pl.js | 48 - .../vendor/select2/src/js/select2/i18n/ps.js | 48 - .../select2/src/js/select2/i18n/pt-BR.js | 49 - .../vendor/select2/src/js/select2/i18n/pt.js | 43 - .../vendor/select2/src/js/select2/i18n/ro.js | 49 - .../vendor/select2/src/js/select2/i18n/ru.js | 61 - .../vendor/select2/src/js/select2/i18n/sk.js | 62 - .../vendor/select2/src/js/select2/i18n/sl.js | 57 - .../vendor/select2/src/js/select2/i18n/sq.js | 48 - .../select2/src/js/select2/i18n/sr-Cyrl.js | 58 - .../vendor/select2/src/js/select2/i18n/sr.js | 58 - .../vendor/select2/src/js/select2/i18n/sv.js | 40 - .../vendor/select2/src/js/select2/i18n/th.js | 39 - .../vendor/select2/src/js/select2/i18n/tk.js | 40 - .../vendor/select2/src/js/select2/i18n/tr.js | 39 - .../vendor/select2/src/js/select2/i18n/uk.js | 46 - .../vendor/select2/src/js/select2/i18n/vi.js | 37 - .../select2/src/js/select2/i18n/zh-CN.js | 39 - .../select2/src/js/select2/i18n/zh-TW.js | 36 - static/vendor/select2/src/js/select2/keys.js | 25 - .../vendor/select2/src/js/select2/options.js | 146 - .../vendor/select2/src/js/select2/results.js | 530 - .../src/js/select2/selection/allowClear.js | 113 - .../select2/src/js/select2/selection/base.js | 160 - .../src/js/select2/selection/clickMask.js | 29 - .../src/js/select2/selection/eventRelay.js | 48 - .../src/js/select2/selection/multiple.js | 111 - .../src/js/select2/selection/placeholder.js | 49 - .../src/js/select2/selection/search.js | 228 - .../src/js/select2/selection/single.js | 100 - .../js/select2/selection/stopPropagation.js | 38 - .../select2/src/js/select2/translation.js | 36 - static/vendor/select2/src/js/select2/utils.js | 338 - static/vendor/select2/src/js/wrapper.end.js | 12 - static/vendor/select2/src/js/wrapper.start.js | 38 - .../vendor/select2/tests/a11y/search-tests.js | 51 - .../select2/tests/a11y/selection-tests.js | 154 - .../vendor/select2/tests/data/array-tests.js | 332 - .../vendor/select2/tests/data/base-tests.js | 29 - .../select2/tests/data/inputData-tests.js | 158 - .../tests/data/maximumInputLength-tests.js | 138 - .../data/maximumSelectionLength-tests.js | 202 - .../tests/data/minimumInputLength-tests.js | 138 - .../vendor/select2/tests/data/select-tests.js | 557 - .../vendor/select2/tests/data/tags-tests.js | 276 - .../select2/tests/data/tokenizer-tests.js | 219 - .../tests/dropdown/dropdownCss-tests.js | 104 - .../tests/dropdown/positioning-tests.js | 177 - .../tests/dropdown/selectOnClose-tests.js | 137 - .../tests/dropdown/stopPropagation-tests.js | 33 - static/vendor/select2/tests/helpers.js | 50 - .../vendor/select2/tests/integration-jq1.html | 21 - .../vendor/select2/tests/integration-jq2.html | 21 - .../vendor/select2/tests/integration-jq3.html | 21 - .../select2/tests/integration/dom-changes.js | 257 - .../select2/tests/integration/jquery-calls.js | 98 - .../tests/integration/select2-methods.js | 139 - .../select2/tests/options/ajax-tests.js | 50 - .../select2/tests/options/data-tests.js | 44 - .../select2/tests/options/deprecated-tests.js | 250 - .../tests/options/translation-tests.js | 28 - .../select2/tests/options/width-tests.js | 66 - .../select2/tests/results/focusing-tests.js | 241 - .../tests/selection/allowClear-tests.js | 330 - .../tests/selection/containerCss-tests.js | 104 - .../select2/tests/selection/multiple-tests.js | 151 - .../tests/selection/placeholder-tests.js | 74 - .../select2/tests/selection/search-tests.js | 191 - .../select2/tests/selection/single-tests.js | 119 - .../tests/selection/stopPropagation-tests.js | 33 - static/vendor/select2/tests/unit-jq1.html | 97 - static/vendor/select2/tests/unit-jq2.html | 97 - static/vendor/select2/tests/unit-jq3.html | 97 - .../select2/tests/utils/decorator-tests.js | 189 - .../select2/tests/utils/escapeMarkup-tests.js | 36 - .../select2/tests/vendor/jquery-1.7.2.js | 9404 -------------- .../select2/tests/vendor/jquery-2.2.4.js | 9814 -------------- .../select2/tests/vendor/jquery-3.4.1.js | 10598 ---------------- .../select2/tests/vendor/qunit-1.23.1.css | 305 - .../select2/tests/vendor/qunit-1.23.1.js | 4334 ------- 169 files changed, 24 insertions(+), 49039 deletions(-) delete mode 100644 .coveragerc delete mode 100644 static/vendor/select2/Gruntfile.js delete mode 100644 static/vendor/select2/bower.json delete mode 100644 static/vendor/select2/component.json delete mode 100644 static/vendor/select2/composer.json delete mode 100644 static/vendor/select2/docs/announcements-4.0.html delete mode 100644 static/vendor/select2/docs/community.html delete mode 100644 static/vendor/select2/docs/examples.html delete mode 100644 static/vendor/select2/docs/index.html delete mode 100644 static/vendor/select2/docs/options-old.html delete mode 100644 static/vendor/select2/docs/options.html delete mode 100644 static/vendor/select2/package.json delete mode 100644 static/vendor/select2/src/js/banner.end.js delete mode 100644 static/vendor/select2/src/js/banner.start.js delete mode 100644 static/vendor/select2/src/js/jquery.mousewheel.shim.js delete mode 100644 static/vendor/select2/src/js/jquery.select2.js delete mode 100644 static/vendor/select2/src/js/jquery.shim.js delete mode 100644 static/vendor/select2/src/js/select2/compat/containerCss.js delete mode 100644 static/vendor/select2/src/js/select2/compat/dropdownCss.js delete mode 100644 static/vendor/select2/src/js/select2/compat/initSelection.js delete mode 100644 static/vendor/select2/src/js/select2/compat/inputData.js delete mode 100644 static/vendor/select2/src/js/select2/compat/matcher.js delete mode 100644 static/vendor/select2/src/js/select2/compat/query.js delete mode 100644 static/vendor/select2/src/js/select2/compat/utils.js delete mode 100644 static/vendor/select2/src/js/select2/core.js delete mode 100644 static/vendor/select2/src/js/select2/data/ajax.js delete mode 100644 static/vendor/select2/src/js/select2/data/array.js delete mode 100644 static/vendor/select2/src/js/select2/data/base.js delete mode 100644 static/vendor/select2/src/js/select2/data/maximumInputLength.js delete mode 100644 static/vendor/select2/src/js/select2/data/maximumSelectionLength.js delete mode 100644 static/vendor/select2/src/js/select2/data/minimumInputLength.js delete mode 100644 static/vendor/select2/src/js/select2/data/select.js delete mode 100644 static/vendor/select2/src/js/select2/data/tags.js delete mode 100644 static/vendor/select2/src/js/select2/data/tokenizer.js delete mode 100644 static/vendor/select2/src/js/select2/defaults.js delete mode 100644 static/vendor/select2/src/js/select2/diacritics.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/attachBody.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/attachContainer.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/closeOnSelect.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/hidePlaceholder.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/infiniteScroll.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/minimumResultsForSearch.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/search.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/selectOnClose.js delete mode 100644 static/vendor/select2/src/js/select2/dropdown/stopPropagation.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/af.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ar.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/az.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/bg.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/bn.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/bs.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ca.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/cs.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/da.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/de.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/dsb.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/el.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/en.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/es.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/et.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/eu.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/fa.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/fi.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/fr.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/gl.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/he.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/hi.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/hr.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/hsb.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/hu.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/hy.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/id.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/is.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/it.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ja.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ka.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/km.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ko.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/lt.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/lv.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/mk.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ms.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/nb.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ne.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/nl.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/pl.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ps.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/pt-BR.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/pt.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ro.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/ru.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sk.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sl.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sq.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sr-Cyrl.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sr.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/sv.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/th.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/tk.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/tr.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/uk.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/vi.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/zh-CN.js delete mode 100644 static/vendor/select2/src/js/select2/i18n/zh-TW.js delete mode 100644 static/vendor/select2/src/js/select2/keys.js delete mode 100644 static/vendor/select2/src/js/select2/options.js delete mode 100644 static/vendor/select2/src/js/select2/results.js delete mode 100644 static/vendor/select2/src/js/select2/selection/allowClear.js delete mode 100644 static/vendor/select2/src/js/select2/selection/base.js delete mode 100644 static/vendor/select2/src/js/select2/selection/clickMask.js delete mode 100644 static/vendor/select2/src/js/select2/selection/eventRelay.js delete mode 100644 static/vendor/select2/src/js/select2/selection/multiple.js delete mode 100644 static/vendor/select2/src/js/select2/selection/placeholder.js delete mode 100644 static/vendor/select2/src/js/select2/selection/search.js delete mode 100644 static/vendor/select2/src/js/select2/selection/single.js delete mode 100644 static/vendor/select2/src/js/select2/selection/stopPropagation.js delete mode 100644 static/vendor/select2/src/js/select2/translation.js delete mode 100644 static/vendor/select2/src/js/select2/utils.js delete mode 100644 static/vendor/select2/src/js/wrapper.end.js delete mode 100644 static/vendor/select2/src/js/wrapper.start.js delete mode 100644 static/vendor/select2/tests/a11y/search-tests.js delete mode 100644 static/vendor/select2/tests/a11y/selection-tests.js delete mode 100644 static/vendor/select2/tests/data/array-tests.js delete mode 100644 static/vendor/select2/tests/data/base-tests.js delete mode 100644 static/vendor/select2/tests/data/inputData-tests.js delete mode 100644 static/vendor/select2/tests/data/maximumInputLength-tests.js delete mode 100644 static/vendor/select2/tests/data/maximumSelectionLength-tests.js delete mode 100644 static/vendor/select2/tests/data/minimumInputLength-tests.js delete mode 100644 static/vendor/select2/tests/data/select-tests.js delete mode 100644 static/vendor/select2/tests/data/tags-tests.js delete mode 100644 static/vendor/select2/tests/data/tokenizer-tests.js delete mode 100644 static/vendor/select2/tests/dropdown/dropdownCss-tests.js delete mode 100644 static/vendor/select2/tests/dropdown/positioning-tests.js delete mode 100644 static/vendor/select2/tests/dropdown/selectOnClose-tests.js delete mode 100644 static/vendor/select2/tests/dropdown/stopPropagation-tests.js delete mode 100644 static/vendor/select2/tests/helpers.js delete mode 100644 static/vendor/select2/tests/integration-jq1.html delete mode 100644 static/vendor/select2/tests/integration-jq2.html delete mode 100644 static/vendor/select2/tests/integration-jq3.html delete mode 100644 static/vendor/select2/tests/integration/dom-changes.js delete mode 100644 static/vendor/select2/tests/integration/jquery-calls.js delete mode 100644 static/vendor/select2/tests/integration/select2-methods.js delete mode 100644 static/vendor/select2/tests/options/ajax-tests.js delete mode 100644 static/vendor/select2/tests/options/data-tests.js delete mode 100644 static/vendor/select2/tests/options/deprecated-tests.js delete mode 100644 static/vendor/select2/tests/options/translation-tests.js delete mode 100644 static/vendor/select2/tests/options/width-tests.js delete mode 100644 static/vendor/select2/tests/results/focusing-tests.js delete mode 100644 static/vendor/select2/tests/selection/allowClear-tests.js delete mode 100644 static/vendor/select2/tests/selection/containerCss-tests.js delete mode 100644 static/vendor/select2/tests/selection/multiple-tests.js delete mode 100644 static/vendor/select2/tests/selection/placeholder-tests.js delete mode 100644 static/vendor/select2/tests/selection/search-tests.js delete mode 100644 static/vendor/select2/tests/selection/single-tests.js delete mode 100644 static/vendor/select2/tests/selection/stopPropagation-tests.js delete mode 100644 static/vendor/select2/tests/unit-jq1.html delete mode 100644 static/vendor/select2/tests/unit-jq2.html delete mode 100644 static/vendor/select2/tests/unit-jq3.html delete mode 100644 static/vendor/select2/tests/utils/decorator-tests.js delete mode 100644 static/vendor/select2/tests/utils/escapeMarkup-tests.js delete mode 100644 static/vendor/select2/tests/vendor/jquery-1.7.2.js delete mode 100644 static/vendor/select2/tests/vendor/jquery-2.2.4.js delete mode 100644 static/vendor/select2/tests/vendor/jquery-3.4.1.js delete mode 100644 static/vendor/select2/tests/vendor/qunit-1.23.1.css delete mode 100644 static/vendor/select2/tests/vendor/qunit-1.23.1.js diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index ed8ca510..00000000 --- a/.coveragerc +++ /dev/null @@ -1,12 +0,0 @@ -[run] -source = - activity - member - note -omit = - activity/tests/*.py - activity/migrations/*.py - member/tests/*.py - member/migrations/*.py - note/tests/*.py - note/migrations/*.py \ No newline at end of file diff --git a/.env_example b/.env_example index 5aba0d14..d903b724 100644 --- a/.env_example +++ b/.env_example @@ -1,13 +1,13 @@ -DJANGO_APP_STAGE="dev" +DJANGO_APP_STAGE=dev # Only used in dev mode, change to "postgresql" if you want to use PostgreSQL in dev -DJANGO_DEV_STORE_METHOD="sqllite" -DJANGO_DB_HOST="localhost" -DJANGO_DB_NAME="note_db" -DJANGO_DB_USER="note" -DJANGO_DB_PASSWORD="CHANGE_ME" -DJANGO_DB_PORT="" -DJANGO_SECRET_KEY="CHANGE_ME" -DJANGO_SETTINGS_MODULE="note_kfet.settings" -DOMAIN="localhost" -CONTACT_EMAIL="tresorerie.bde@localhost" -NOTE_URL="localhost" +DJANGO_DEV_STORE_METHOD=sqllite +DJANGO_DB_HOST=localhost +DJANGO_DB_NAME=note_db +DJANGO_DB_USER=note +DJANGO_DB_PASSWORD=CHANGE_ME +DJANGO_DB_PORT= +DJANGO_SECRET_KEY=CHANGE_ME +DJANGO_SETTINGS_MODULE=note_kfet.settings +DOMAIN=localhost +CONTACT_EMAIL=tresorerie.bde@localhost +NOTE_URL=localhost diff --git a/Dockerfile b/Dockerfile index dfc49d04..80f2c773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ COPY . /code/ # Comment what is not needed RUN pip install -r requirements/base.txt -RUN pip install -r requirements/api.txt RUN pip install -r requirements/cas.txt RUN pip install -r requirements/production.txt diff --git a/README.md b/README.md index 9b0c927e..0c0cfb2e 100644 --- a/README.md +++ b/README.md @@ -106,18 +106,18 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n On copie le fichier `.env_example` vers le fichier `.env` à la racine du projet et on renseigne des secrets et des paramètres : - DJANGO_APP_STAGE="dev" # ou "prod" - DJANGO_DEV_STORE_METHOD="sqllite" # ou "postgres" - DJANGO_DB_HOST="localhost" - DJANGO_DB_NAME="note_db" - DJANGO_DB_USER="note" - DJANGO_DB_PASSWORD="CHANGE_ME" - DJANGO_DB_PORT="" - DJANGO_SECRET_KEY="CHANGE_ME" - DJANGO_SETTINGS_MODULE="note_kfet.settings" - DOMAIN="localhost" # note.example.com - CONTACT_EMAIL="tresorerie.bde@localhost" - NOTE_URL="localhost" # serveur cas note.example.com si auto-hébergé. + DJANGO_APP_STAGE=dev # ou "prod" + DJANGO_DEV_STORE_METHOD=sqllite # ou "postgres" + DJANGO_DB_HOST=localhost + DJANGO_DB_NAME=note_db + DJANGO_DB_USER=note + DJANGO_DB_PASSWORD=CHANGE_ME + DJANGO_DB_PORT= + DJANGO_SECRET_KEY=CHANGE_ME + DJANGO_SETTINGS_MODULE="note_kfet.settings + DOMAIN=localhost # note.example.com + CONTACT_EMAIL=tresorerie.bde@localhost + NOTE_URL=localhost # serveur cas note.example.com si auto-hébergé. Ensuite on (re)bascule dans l'environement virtuel et on lance les migrations diff --git a/static/vendor/select2/Gruntfile.js b/static/vendor/select2/Gruntfile.js deleted file mode 100644 index b4c4508a..00000000 --- a/static/vendor/select2/Gruntfile.js +++ /dev/null @@ -1,262 +0,0 @@ -const sass = require('node-sass'); - -module.exports = function (grunt) { - // Full list of files that must be included by RequireJS - includes = [ - 'jquery.select2', - 'almond', - - 'jquery-mousewheel' // shimmed for non-full builds - ]; - - fullIncludes = [ - 'jquery', - - 'select2/compat/containerCss', - 'select2/compat/dropdownCss', - - 'select2/compat/initSelection', - 'select2/compat/inputData', - 'select2/compat/matcher', - 'select2/compat/query', - - 'select2/dropdown/attachContainer', - 'select2/dropdown/stopPropagation', - - 'select2/selection/stopPropagation' - ].concat(includes); - - var i18nModules = []; - var i18nPaths = {}; - - var i18nFiles = grunt.file.expand({ - cwd: 'src/js' - }, 'select2/i18n/*.js'); - - var testFiles = grunt.file.expand('tests/**/*.html'); - var testUrls = testFiles.map(function (filePath) { - return 'http://localhost:9999/' + filePath; - }); - - var testBuildNumber = "unknown"; - - if (process.env.TRAVIS_JOB_ID) { - testBuildNumber = "travis-" + process.env.TRAVIS_JOB_ID; - } else { - var currentTime = new Date(); - - testBuildNumber = "manual-" + currentTime.getTime(); - } - - for (var i = 0; i < i18nFiles.length; i++) { - var file = i18nFiles[i]; - var name = file.split('.')[0]; - - i18nModules.push({ - name: name - }); - - i18nPaths[name] = '../../' + name; - } - - var minifiedBanner = '/*! Select2 <%= package.version %> | https://github.com/select2/select2/blob/master/LICENSE.md */'; - - grunt.initConfig({ - package: grunt.file.readJSON('package.json'), - - concat: { - 'dist': { - options: { - banner: grunt.file.read('src/js/wrapper.start.js'), - }, - src: [ - 'dist/js/select2.js', - 'src/js/wrapper.end.js' - ], - dest: 'dist/js/select2.js' - }, - 'dist.full': { - options: { - banner: grunt.file.read('src/js/wrapper.start.js'), - }, - src: [ - 'dist/js/select2.full.js', - 'src/js/wrapper.end.js' - ], - dest: 'dist/js/select2.full.js' - } - }, - - connect: { - tests: { - options: { - base: '.', - hostname: '127.0.0.1', - port: 9999 - } - } - }, - - uglify: { - 'dist': { - src: 'dist/js/select2.js', - dest: 'dist/js/select2.min.js', - options: { - banner: minifiedBanner - } - }, - 'dist.full': { - src: 'dist/js/select2.full.js', - dest: 'dist/js/select2.full.min.js', - options: { - banner: minifiedBanner - } - } - }, - - qunit: { - all: { - options: { - urls: testUrls - } - } - }, - - jshint: { - options: { - jshintrc: true, - reporterOutput: '' - }, - code: { - src: ['src/js/**/*.js'] - }, - tests: { - src: ['tests/**/*.js'] - } - }, - - sass: { - dist: { - options: { - implementation: sass, - outputStyle: 'compressed' - }, - files: { - 'dist/css/select2.min.css': [ - 'src/scss/core.scss', - 'src/scss/theme/default/layout.css' - ] - } - }, - dev: { - options: { - implementation: sass, - outputStyle: 'nested' - }, - files: { - 'dist/css/select2.css': [ - 'src/scss/core.scss', - 'src/scss/theme/default/layout.css' - ] - } - } - }, - - requirejs: { - 'dist': { - options: { - baseUrl: 'src/js', - optimize: 'none', - name: 'select2/core', - out: 'dist/js/select2.js', - include: includes, - namespace: 'S2', - paths: { - 'almond': require.resolve('almond').slice(0, -3), - 'jquery': 'jquery.shim', - 'jquery-mousewheel': 'jquery.mousewheel.shim' - }, - wrap: { - startFile: 'src/js/banner.start.js', - endFile: 'src/js/banner.end.js' - } - } - }, - 'dist.full': { - options: { - baseUrl: 'src/js', - optimize: 'none', - name: 'select2/core', - out: 'dist/js/select2.full.js', - include: fullIncludes, - namespace: 'S2', - paths: { - 'almond': require.resolve('almond').slice(0, -3), - 'jquery': 'jquery.shim', - 'jquery-mousewheel': require.resolve('jquery-mousewheel').slice(0, -3) - }, - wrap: { - startFile: 'src/js/banner.start.js', - endFile: 'src/js/banner.end.js' - } - } - }, - 'i18n': { - options: { - baseUrl: 'src/js/select2/i18n', - dir: 'dist/js/i18n', - paths: i18nPaths, - modules: i18nModules, - namespace: 'S2', - wrap: { - start: minifiedBanner + grunt.file.read('src/js/banner.start.js'), - end: grunt.file.read('src/js/banner.end.js') - } - } - } - }, - - watch: { - js: { - files: [ - 'src/js/select2/**/*.js', - 'tests/**/*.js' - ], - tasks: [ - 'compile', - 'test', - 'minify' - ] - }, - css: { - files: [ - 'src/scss/**/*.scss' - ], - tasks: [ - 'compile', - 'minify' - ] - } - } - }); - - grunt.loadNpmTasks('grunt-contrib-concat'); - grunt.loadNpmTasks('grunt-contrib-connect'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-qunit'); - grunt.loadNpmTasks('grunt-contrib-requirejs'); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-watch'); - - grunt.loadNpmTasks('grunt-sass'); - - grunt.registerTask('default', ['compile', 'test', 'minify']); - - grunt.registerTask('compile', [ - 'requirejs:dist', 'requirejs:dist.full', 'requirejs:i18n', - 'concat:dist', 'concat:dist.full', - 'sass:dev' - ]); - grunt.registerTask('minify', ['uglify', 'sass:dist']); - grunt.registerTask('test', ['connect:tests', 'qunit', 'jshint']); -}; diff --git a/static/vendor/select2/bower.json b/static/vendor/select2/bower.json deleted file mode 100644 index 681600b5..00000000 --- a/static/vendor/select2/bower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "select2", - "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "main": [ - "dist/js/select2.js", - "src/scss/core.scss" - ], - "license": "MIT", - "repository": { - "type": "git", - "url": "git@github.com:select2/select2.git" - } -} diff --git a/static/vendor/select2/component.json b/static/vendor/select2/component.json deleted file mode 100644 index 75e19f1e..00000000 --- a/static/vendor/select2/component.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "select2", - "repo": "select/select2", - "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "version": "4.0.7", - "demo": "https://select2.org/", - "keywords": [ - "jquery" - ], - "main": "dist/js/select2.js", - "styles": [ - "dist/css/select2.css" - ], - "scripts": [ - "dist/js/select2.js", - "dist/js/i18n/*.js" - ], - "license": "MIT" -} diff --git a/static/vendor/select2/composer.json b/static/vendor/select2/composer.json deleted file mode 100644 index 5ef2db2b..00000000 --- a/static/vendor/select2/composer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "select2/select2", - "description": "Select2 is a jQuery based replacement for select boxes.", - "type": "component", - "homepage": "https://select2.org/", - "license": "MIT", - "extra": { - "component": { - "scripts": [ - "dist/js/select2.js" - ], - "styles": [ - "dist/css/select2.css" - ], - "files": [ - "dist/js/select2.js", - "dist/js/i18n/*.js", - "dist/css/select2.css" - ] - } - } -} diff --git a/static/vendor/select2/docs/announcements-4.0.html b/static/vendor/select2/docs/announcements-4.0.html deleted file mode 100644 index bc85b4c1..00000000 --- a/static/vendor/select2/docs/announcements-4.0.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/docs/community.html b/static/vendor/select2/docs/community.html deleted file mode 100644 index ffe8f83f..00000000 --- a/static/vendor/select2/docs/community.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/docs/examples.html b/static/vendor/select2/docs/examples.html deleted file mode 100644 index a463e84a..00000000 --- a/static/vendor/select2/docs/examples.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/docs/index.html b/static/vendor/select2/docs/index.html deleted file mode 100644 index ea8214d6..00000000 --- a/static/vendor/select2/docs/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/docs/options-old.html b/static/vendor/select2/docs/options-old.html deleted file mode 100644 index 4920b76b..00000000 --- a/static/vendor/select2/docs/options-old.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/docs/options.html b/static/vendor/select2/docs/options.html deleted file mode 100644 index 4920b76b..00000000 --- a/static/vendor/select2/docs/options.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - select2 - - - - - \ No newline at end of file diff --git a/static/vendor/select2/package.json b/static/vendor/select2/package.json deleted file mode 100644 index 231473b5..00000000 --- a/static/vendor/select2/package.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "select2", - "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "homepage": "https://select2.org", - "author": { - "name": "Kevin Brown", - "url": "https://github.com/kevin-brown" - }, - "contributors": [ - { - "name": "Igor Vaynberg", - "url": "https://github.com/ivaynberg" - }, - { - "name": "Alex Weissman", - "url": "https://github.com/alexweissman" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/select2/select2.git" - }, - "bugs": { - "url": "https://github.com/select2/select2/issues" - }, - "keywords": [ - "select", - "autocomplete", - "typeahead", - "dropdown", - "multiselect", - "tag", - "tagging" - ], - "license": "MIT", - "main": "dist/js/select2.js", - "style": "dist/css/select2.css", - "files": [ - "src", - "dist" - ], - "version": "4.0.7", - "jspm": { - "main": "js/select2", - "directories": { - "lib": "dist" - } - }, - "devDependencies": { - "almond": "~0.3.1", - "grunt": "^0.4.5", - "grunt-cli": "^1.3.2", - "grunt-contrib-concat": "^1.0.1", - "grunt-contrib-connect": "^2.0.0", - "grunt-contrib-jshint": "^1.1.0", - "grunt-contrib-qunit": "^1.3.0", - "grunt-contrib-requirejs": "^1.0.0", - "grunt-contrib-uglify": "~4.0.1", - "grunt-contrib-watch": "~1.1.0", - "grunt-sass": "^2.1.0", - "jquery-mousewheel": "~3.1.13", - "node-sass": "^4.12.0" - }, - "dependencies": {} -} diff --git a/static/vendor/select2/src/js/banner.end.js b/static/vendor/select2/src/js/banner.end.js deleted file mode 100644 index ea00a036..00000000 --- a/static/vendor/select2/src/js/banner.end.js +++ /dev/null @@ -1,6 +0,0 @@ - // Return the AMD loader configuration so it can be used outside of this file - return { - define: S2.define, - require: S2.require - }; -}()); diff --git a/static/vendor/select2/src/js/banner.start.js b/static/vendor/select2/src/js/banner.start.js deleted file mode 100644 index 78fe8b02..00000000 --- a/static/vendor/select2/src/js/banner.start.js +++ /dev/null @@ -1,6 +0,0 @@ -(function () { - // Restore the Select2 AMD loader so it can be used - // Needed mostly in the language files, where the loader is not inserted - if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) { - var S2 = jQuery.fn.select2.amd; - } diff --git a/static/vendor/select2/src/js/jquery.mousewheel.shim.js b/static/vendor/select2/src/js/jquery.mousewheel.shim.js deleted file mode 100644 index a27fda0e..00000000 --- a/static/vendor/select2/src/js/jquery.mousewheel.shim.js +++ /dev/null @@ -1,6 +0,0 @@ -define([ - 'jquery' -], function ($) { - // Used to shim jQuery.mousewheel for non-full builds. - return $; -}); diff --git a/static/vendor/select2/src/js/jquery.select2.js b/static/vendor/select2/src/js/jquery.select2.js deleted file mode 100644 index 9136ff78..00000000 --- a/static/vendor/select2/src/js/jquery.select2.js +++ /dev/null @@ -1,58 +0,0 @@ -define([ - 'jquery', - 'jquery-mousewheel', - - './select2/core', - './select2/defaults', - './select2/utils' -], function ($, _, Select2, Defaults, Utils) { - if ($.fn.select2 == null) { - // All methods that should return the element - var thisMethods = ['open', 'close', 'destroy']; - - $.fn.select2 = function (options) { - options = options || {}; - - if (typeof options === 'object') { - this.each(function () { - var instanceOptions = $.extend(true, {}, options); - - var instance = new Select2($(this), instanceOptions); - }); - - return this; - } else if (typeof options === 'string') { - var ret; - var args = Array.prototype.slice.call(arguments, 1); - - this.each(function () { - var instance = Utils.GetData(this, 'select2'); - - if (instance == null && window.console && console.error) { - console.error( - 'The select2(\'' + options + '\') method was called on an ' + - 'element that is not using Select2.' - ); - } - - ret = instance[options].apply(instance, args); - }); - - // Check if we should be returning `this` - if ($.inArray(options, thisMethods) > -1) { - return this; - } - - return ret; - } else { - throw new Error('Invalid arguments for Select2: ' + options); - } - }; - } - - if ($.fn.select2.defaults == null) { - $.fn.select2.defaults = Defaults; - } - - return Select2; -}); diff --git a/static/vendor/select2/src/js/jquery.shim.js b/static/vendor/select2/src/js/jquery.shim.js deleted file mode 100644 index 880993af..00000000 --- a/static/vendor/select2/src/js/jquery.shim.js +++ /dev/null @@ -1,14 +0,0 @@ -/* global jQuery:false, $:false */ -define(function () { - var _$ = jQuery || $; - - if (_$ == null && console && console.error) { - console.error( - 'Select2: An instance of jQuery or a jQuery-compatible library was not ' + - 'found. Make sure that you are including jQuery before Select2 on your ' + - 'web page.' - ); - } - - return _$; -}); diff --git a/static/vendor/select2/src/js/select2/compat/containerCss.js b/static/vendor/select2/src/js/select2/compat/containerCss.js deleted file mode 100644 index 45703ac8..00000000 --- a/static/vendor/select2/src/js/select2/compat/containerCss.js +++ /dev/null @@ -1,56 +0,0 @@ -define([ - 'jquery', - './utils' -], function ($, CompatUtils) { - // No-op CSS adapter that discards all classes by default - function _containerAdapter (clazz) { - return null; - } - - function ContainerCSS () { } - - ContainerCSS.prototype.render = function (decorated) { - var $container = decorated.call(this); - - var containerCssClass = this.options.get('containerCssClass') || ''; - - if ($.isFunction(containerCssClass)) { - containerCssClass = containerCssClass(this.$element); - } - - var containerCssAdapter = this.options.get('adaptContainerCssClass'); - containerCssAdapter = containerCssAdapter || _containerAdapter; - - if (containerCssClass.indexOf(':all:') !== -1) { - containerCssClass = containerCssClass.replace(':all:', ''); - - var _cssAdapter = containerCssAdapter; - - containerCssAdapter = function (clazz) { - var adapted = _cssAdapter(clazz); - - if (adapted != null) { - // Append the old one along with the adapted one - return adapted + ' ' + clazz; - } - - return clazz; - }; - } - - var containerCss = this.options.get('containerCss') || {}; - - if ($.isFunction(containerCss)) { - containerCss = containerCss(this.$element); - } - - CompatUtils.syncCssClasses($container, this.$element, containerCssAdapter); - - $container.css(containerCss); - $container.addClass(containerCssClass); - - return $container; - }; - - return ContainerCSS; -}); diff --git a/static/vendor/select2/src/js/select2/compat/dropdownCss.js b/static/vendor/select2/src/js/select2/compat/dropdownCss.js deleted file mode 100644 index 02f55820..00000000 --- a/static/vendor/select2/src/js/select2/compat/dropdownCss.js +++ /dev/null @@ -1,56 +0,0 @@ -define([ - 'jquery', - './utils' -], function ($, CompatUtils) { - // No-op CSS adapter that discards all classes by default - function _dropdownAdapter (clazz) { - return null; - } - - function DropdownCSS () { } - - DropdownCSS.prototype.render = function (decorated) { - var $dropdown = decorated.call(this); - - var dropdownCssClass = this.options.get('dropdownCssClass') || ''; - - if ($.isFunction(dropdownCssClass)) { - dropdownCssClass = dropdownCssClass(this.$element); - } - - var dropdownCssAdapter = this.options.get('adaptDropdownCssClass'); - dropdownCssAdapter = dropdownCssAdapter || _dropdownAdapter; - - if (dropdownCssClass.indexOf(':all:') !== -1) { - dropdownCssClass = dropdownCssClass.replace(':all:', ''); - - var _cssAdapter = dropdownCssAdapter; - - dropdownCssAdapter = function (clazz) { - var adapted = _cssAdapter(clazz); - - if (adapted != null) { - // Append the old one along with the adapted one - return adapted + ' ' + clazz; - } - - return clazz; - }; - } - - var dropdownCss = this.options.get('dropdownCss') || {}; - - if ($.isFunction(dropdownCss)) { - dropdownCss = dropdownCss(this.$element); - } - - CompatUtils.syncCssClasses($dropdown, this.$element, dropdownCssAdapter); - - $dropdown.css(dropdownCss); - $dropdown.addClass(dropdownCssClass); - - return $dropdown; - }; - - return DropdownCSS; -}); diff --git a/static/vendor/select2/src/js/select2/compat/initSelection.js b/static/vendor/select2/src/js/select2/compat/initSelection.js deleted file mode 100644 index 71ee29d1..00000000 --- a/static/vendor/select2/src/js/select2/compat/initSelection.js +++ /dev/null @@ -1,42 +0,0 @@ -define([ - 'jquery' -], function ($) { - function InitSelection (decorated, $element, options) { - if (options.get('debug') && window.console && console.warn) { - console.warn( - 'Select2: The `initSelection` option has been deprecated in favor' + - ' of a custom data adapter that overrides the `current` method. ' + - 'This method is now called multiple times instead of a single ' + - 'time when the instance is initialized. Support will be removed ' + - 'for the `initSelection` option in future versions of Select2' - ); - } - - this.initSelection = options.get('initSelection'); - this._isInitialized = false; - - decorated.call(this, $element, options); - } - - InitSelection.prototype.current = function (decorated, callback) { - var self = this; - - if (this._isInitialized) { - decorated.call(this, callback); - - return; - } - - this.initSelection.call(null, this.$element, function (data) { - self._isInitialized = true; - - if (!$.isArray(data)) { - data = [data]; - } - - callback(data); - }); - }; - - return InitSelection; -}); diff --git a/static/vendor/select2/src/js/select2/compat/inputData.js b/static/vendor/select2/src/js/select2/compat/inputData.js deleted file mode 100644 index 6e1dee26..00000000 --- a/static/vendor/select2/src/js/select2/compat/inputData.js +++ /dev/null @@ -1,128 +0,0 @@ -define([ - 'jquery', - '../utils' -], function ($, Utils) { - function InputData (decorated, $element, options) { - this._currentData = []; - this._valueSeparator = options.get('valueSeparator') || ','; - - if ($element.prop('type') === 'hidden') { - if (options.get('debug') && console && console.warn) { - console.warn( - 'Select2: Using a hidden input with Select2 is no longer ' + - 'supported and may stop working in the future. It is recommended ' + - 'to use a `' + - '' - ); - - this.$searchContainer = $search; - this.$search = $search.find('input'); - - $rendered.prepend($search); - - return $rendered; - }; - - Search.prototype.bind = function (decorated, container, $container) { - var self = this; - - decorated.call(this, container, $container); - - this.$search.on('keydown', function (evt) { - self.trigger('keypress', evt); - - self._keyUpPrevented = evt.isDefaultPrevented(); - }); - - // Workaround for browsers which do not support the `input` event - // This will prevent double-triggering of events for browsers which support - // both the `keyup` and `input` events. - this.$search.on('input', function (evt) { - // Unbind the duplicated `keyup` event - $(this).off('keyup'); - }); - - this.$search.on('keyup input', function (evt) { - self.handleSearch(evt); - }); - - container.on('open', function () { - self.$search.attr('tabindex', 0); - - self.$search.focus(); - - window.setTimeout(function () { - self.$search.focus(); - }, 0); - }); - - container.on('close', function () { - self.$search.attr('tabindex', -1); - - self.$search.val(''); - self.$search.blur(); - }); - - container.on('focus', function () { - if (!container.isOpen()) { - self.$search.focus(); - } - }); - - container.on('results:all', function (params) { - if (params.query.term == null || params.query.term === '') { - var showSearch = self.showSearch(params); - - if (showSearch) { - self.$searchContainer.removeClass('select2-search--hide'); - } else { - self.$searchContainer.addClass('select2-search--hide'); - } - } - }); - }; - - Search.prototype.handleSearch = function (evt) { - if (!this._keyUpPrevented) { - var input = this.$search.val(); - - this.trigger('query', { - term: input - }); - } - - this._keyUpPrevented = false; - }; - - Search.prototype.showSearch = function (_, params) { - return true; - }; - - return Search; -}); diff --git a/static/vendor/select2/src/js/select2/dropdown/selectOnClose.js b/static/vendor/select2/src/js/select2/dropdown/selectOnClose.js deleted file mode 100644 index 8c633356..00000000 --- a/static/vendor/select2/src/js/select2/dropdown/selectOnClose.js +++ /dev/null @@ -1,50 +0,0 @@ -define([ - '../utils' -], function (Utils) { - function SelectOnClose () { } - - SelectOnClose.prototype.bind = function (decorated, container, $container) { - var self = this; - - decorated.call(this, container, $container); - - container.on('close', function (params) { - self._handleSelectOnClose(params); - }); - }; - - SelectOnClose.prototype._handleSelectOnClose = function (_, params) { - if (params && params.originalSelect2Event != null) { - var event = params.originalSelect2Event; - - // Don't select an item if the close event was triggered from a select or - // unselect event - if (event._type === 'select' || event._type === 'unselect') { - return; - } - } - - var $highlightedResults = this.getHighlightedResults(); - - // Only select highlighted results - if ($highlightedResults.length < 1) { - return; - } - - var data = Utils.GetData($highlightedResults[0], 'data'); - - // Don't re-select already selected resulte - if ( - (data.element != null && data.element.selected) || - (data.element == null && data.selected) - ) { - return; - } - - this.trigger('select', { - data: data - }); - }; - - return SelectOnClose; -}); diff --git a/static/vendor/select2/src/js/select2/dropdown/stopPropagation.js b/static/vendor/select2/src/js/select2/dropdown/stopPropagation.js deleted file mode 100644 index 4f641827..00000000 --- a/static/vendor/select2/src/js/select2/dropdown/stopPropagation.js +++ /dev/null @@ -1,38 +0,0 @@ -define([ - -], function () { - function StopPropagation () { } - - StopPropagation.prototype.bind = function (decorated, container, $container) { - decorated.call(this, container, $container); - - var stoppedEvents = [ - 'blur', - 'change', - 'click', - 'dblclick', - 'focus', - 'focusin', - 'focusout', - 'input', - 'keydown', - 'keyup', - 'keypress', - 'mousedown', - 'mouseenter', - 'mouseleave', - 'mousemove', - 'mouseover', - 'mouseup', - 'search', - 'touchend', - 'touchstart' - ]; - - this.$dropdown.on(stoppedEvents.join(' '), function (evt) { - evt.stopPropagation(); - }); - }; - - return StopPropagation; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/af.js b/static/vendor/select2/src/js/select2/i18n/af.js deleted file mode 100644 index b2a70c97..00000000 --- a/static/vendor/select2/src/js/select2/i18n/af.js +++ /dev/null @@ -1,47 +0,0 @@ -define(function () { - // English - return { - errorLoading: function () { - return 'Die resultate kon nie gelaai word nie.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Verwyders asseblief ' + overChars + ' character'; - - if (overChars != 1) { - message += 's'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Voer asseblief ' + remainingChars + ' of meer karakters'; - - return message; - }, - loadingMore: function () { - return 'Meer resultate word gelaai…'; - }, - maximumSelected: function (args) { - var message = 'Kies asseblief net ' + args.maximum + ' item'; - - if (args.maximum != 1) { - message += 's'; - } - - return message; - }, - noResults: function () { - return 'Geen resultate gevind'; - }, - searching: function () { - return 'Besig…'; - }, - removeAllItems: function () { - return 'Verwyder alle items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ar.js b/static/vendor/select2/src/js/select2/i18n/ar.js deleted file mode 100644 index 11f2c9e1..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ar.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Arabic - return { - errorLoading: function () { - return 'لا يمكن تحميل النتائج'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'الرجاء حذف ' + overChars + ' عناصر'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'الرجاء إضافة ' + remainingChars + ' عناصر'; - }, - loadingMore: function () { - return 'جاري تحميل نتائج إضافية...'; - }, - maximumSelected: function (args) { - return 'تستطيع إختيار ' + args.maximum + ' بنود فقط'; - }, - noResults: function () { - return 'لم يتم العثور على أي نتائج'; - }, - searching: function () { - return 'جاري البحث…'; - }, - removeAllItems: function () { - return 'قم بإزالة كل العناصر'; - } - }; -}); \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/az.js b/static/vendor/select2/src/js/select2/i18n/az.js deleted file mode 100644 index 8dae8749..00000000 --- a/static/vendor/select2/src/js/select2/i18n/az.js +++ /dev/null @@ -1,30 +0,0 @@ -define(function () { - // Azerbaijani - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return overChars + ' simvol silin'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return remainingChars + ' simvol daxil edin'; - }, - loadingMore: function () { - return 'Daha çox nəticə yüklənir…'; - }, - maximumSelected: function (args) { - return 'Sadəcə ' + args.maximum + ' element seçə bilərsiniz'; - }, - noResults: function () { - return 'Nəticə tapılmadı'; - }, - searching: function () { - return 'Axtarılır…'; - }, - removeAllItems: function () { - return 'Bütün elementləri sil'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/bg.js b/static/vendor/select2/src/js/select2/i18n/bg.js deleted file mode 100644 index e70af155..00000000 --- a/static/vendor/select2/src/js/select2/i18n/bg.js +++ /dev/null @@ -1,50 +0,0 @@ -define(function () { - // Bulgarian - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Моля въведете с ' + overChars + ' по-малко символ'; - - if (overChars > 1) { - message += 'a'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Моля въведете още ' + remainingChars + ' символ'; - - if (remainingChars > 1) { - message += 'a'; - } - - return message; - }, - loadingMore: function () { - return 'Зареждат се още…'; - }, - maximumSelected: function (args) { - var message = 'Можете да направите до ' + args.maximum + ' '; - - if (args.maximum > 1) { - message += 'избора'; - } else { - message += 'избор'; - } - - return message; - }, - noResults: function () { - return 'Няма намерени съвпадения'; - }, - searching: function () { - return 'Търсене…'; - }, - removeAllItems: function () { - return 'Премахнете всички елементи'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/bn.js b/static/vendor/select2/src/js/select2/i18n/bn.js deleted file mode 100644 index b28fdd79..00000000 --- a/static/vendor/select2/src/js/select2/i18n/bn.js +++ /dev/null @@ -1,45 +0,0 @@ -define(function () { - // Bangla - return { - errorLoading: function () { - return 'ফলাফলগুলি লোড করা যায়নি।'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'অনুগ্রহ করে ' + overChars + ' টি অক্ষর মুছে দিন।'; - - if (overChars != 1) { - message = 'অনুগ্রহ করে ' + overChars + ' টি অক্ষর মুছে দিন।'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = remainingChars + ' টি অক্ষর অথবা অধিক অক্ষর লিখুন।'; - - return message; - }, - loadingMore: function () { - return 'আরো ফলাফল লোড হচ্ছে ...'; - }, - maximumSelected: function (args) { - var message = args.maximum + ' টি আইটেম নির্বাচন করতে পারবেন।'; - - if (args.maximum != 1) { - message = args.maximum + ' টি আইটেম নির্বাচন করতে পারবেন।'; - } - - return message; - }, - noResults: function () { - return 'কোন ফলাফল পাওয়া যায়নি।'; - }, - searching: function () { - return 'অনুসন্ধান করা হচ্ছে ...'; - } - }; - }); - \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/bs.js b/static/vendor/select2/src/js/select2/i18n/bs.js deleted file mode 100644 index f94b12cd..00000000 --- a/static/vendor/select2/src/js/select2/i18n/bs.js +++ /dev/null @@ -1,58 +0,0 @@ -define(function () { - // Bosnian - function ending (count, one, some, many) { - if (count % 10 == 1 && count % 100 != 11) { - return one; - } - - if (count % 10 >= 2 && count % 10 <= 4 && - (count % 100 < 12 || count % 100 > 14)) { - return some; - } - - return many; - } - - return { - errorLoading: function () { - return 'Preuzimanje nije uspijelo.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Obrišite ' + overChars + ' simbol'; - - message += ending(overChars, '', 'a', 'a'); - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Ukucajte bar još ' + remainingChars + ' simbol'; - - message += ending(remainingChars, '', 'a', 'a'); - - return message; - }, - loadingMore: function () { - return 'Preuzimanje još rezultata…'; - }, - maximumSelected: function (args) { - var message = 'Možete izabrati samo ' + args.maximum + ' stavk'; - - message += ending(args.maximum, 'u', 'e', 'i'); - - return message; - }, - noResults: function () { - return 'Ništa nije pronađeno'; - }, - searching: function () { - return 'Pretraga…'; - }, - removeAllItems: function () { - return 'Uklonite sve stavke'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ca.js b/static/vendor/select2/src/js/select2/i18n/ca.js deleted file mode 100644 index d8b98557..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ca.js +++ /dev/null @@ -1,55 +0,0 @@ -define(function () { - // Catalan - return { - errorLoading: function () { - return 'La càrrega ha fallat'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Si us plau, elimina ' + overChars + ' car'; - - if (overChars == 1) { - message += 'àcter'; - } else { - message += 'àcters'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Si us plau, introdueix ' + remainingChars + ' car'; - - if (remainingChars == 1) { - message += 'àcter'; - } else { - message += 'àcters'; - } - - return message; - }, - loadingMore: function () { - return 'Carregant més resultats…'; - }, - maximumSelected: function (args) { - var message = 'Només es pot seleccionar ' + args.maximum + ' element'; - - if (args.maximum != 1) { - message += 's'; - } - - return message; - }, - noResults: function () { - return 'No s\'han trobat resultats'; - }, - searching: function () { - return 'Cercant…'; - }, - removeAllItems: function () { - return 'Treu tots els elements'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/cs.js b/static/vendor/select2/src/js/select2/i18n/cs.js deleted file mode 100644 index 9b3bce59..00000000 --- a/static/vendor/select2/src/js/select2/i18n/cs.js +++ /dev/null @@ -1,64 +0,0 @@ -define(function () { - // Czech - function small (count, masc) { - switch(count) { - case 2: - return masc ? 'dva' : 'dvě'; - case 3: - return 'tři'; - case 4: - return 'čtyři'; - } - return ''; - } - return { - errorLoading: function () { - return 'Výsledky nemohly být načteny.'; - }, - inputTooLong: function (args) { - var n = args.input.length - args.maximum; - - if (n == 1) { - return 'Prosím, zadejte o jeden znak méně.'; - } else if (n <= 4) { - return 'Prosím, zadejte o ' + small(n, true) + ' znaky méně.'; - } else { - return 'Prosím, zadejte o ' + n + ' znaků méně.'; - } - }, - inputTooShort: function (args) { - var n = args.minimum - args.input.length; - - if (n == 1) { - return 'Prosím, zadejte ještě jeden znak.'; - } else if (n <= 4) { - return 'Prosím, zadejte ještě další ' + small(n, true) + ' znaky.'; - } else { - return 'Prosím, zadejte ještě dalších ' + n + ' znaků.'; - } - }, - loadingMore: function () { - return 'Načítají se další výsledky…'; - }, - maximumSelected: function (args) { - var n = args.maximum; - - if (n == 1) { - return 'Můžete zvolit jen jednu položku.'; - } else if (n <= 4) { - return 'Můžete zvolit maximálně ' + small(n, false) + ' položky.'; - } else { - return 'Můžete zvolit maximálně ' + n + ' položek.'; - } - }, - noResults: function () { - return 'Nenalezeny žádné položky.'; - }, - searching: function () { - return 'Vyhledávání…'; - }, - removeAllItems: function () { - return 'Odstraňte všechny položky'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/da.js b/static/vendor/select2/src/js/select2/i18n/da.js deleted file mode 100644 index fdf5ebe8..00000000 --- a/static/vendor/select2/src/js/select2/i18n/da.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Danish - return { - errorLoading: function () { - return 'Resultaterne kunne ikke indlæses.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Angiv venligst ' + overChars + ' tegn mindre'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Angiv venligst ' + remainingChars + ' tegn mere'; - }, - loadingMore: function () { - return 'Indlæser flere resultater…'; - }, - maximumSelected: function (args) { - var message = 'Du kan kun vælge ' + args.maximum + ' emne'; - - if (args.maximum != 1) { - message += 'r'; - } - - return message; - }, - noResults: function () { - return 'Ingen resultater fundet'; - }, - searching: function () { - return 'Søger…'; - }, - removeAllItems: function () { - return 'Fjern alle elementer'; - } - }; -}); \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/de.js b/static/vendor/select2/src/js/select2/i18n/de.js deleted file mode 100644 index f8277c3b..00000000 --- a/static/vendor/select2/src/js/select2/i18n/de.js +++ /dev/null @@ -1,43 +0,0 @@ -define(function () { - // German - return { - errorLoading: function () { - return 'Die Ergebnisse konnten nicht geladen werden.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Bitte ' + overChars + ' Zeichen weniger eingeben'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Bitte ' + remainingChars + ' Zeichen mehr eingeben'; - }, - loadingMore: function () { - return 'Lade mehr Ergebnisse…'; - }, - maximumSelected: function (args) { - var message = 'Sie können nur ' + args.maximum + ' Eintr'; - - if (args.maximum === 1) { - message += 'ag'; - } else { - message += 'äge'; - } - - message += ' auswählen'; - - return message; - }, - noResults: function () { - return 'Keine Übereinstimmungen gefunden'; - }, - searching: function () { - return 'Suche…'; - }, - removeAllItems: function () { - return 'Entferne alle Gegenstände'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/dsb.js b/static/vendor/select2/src/js/select2/i18n/dsb.js deleted file mode 100644 index af3ec46f..00000000 --- a/static/vendor/select2/src/js/select2/i18n/dsb.js +++ /dev/null @@ -1,52 +0,0 @@ -define(function () { - // Lower Sorbian - var charsWords = ['znamuško', 'znamušce', 'znamuška','znamuškow']; - var itemsWords = ['zapisk', 'zapiska', 'zapiski','zapiskow']; - - var pluralWord = function pluralWord(numberOfChars, words) { - if (numberOfChars === 1) { - return words[0]; - } else if (numberOfChars === 2) { - return words[1]; - } else if (numberOfChars > 2 && numberOfChars <= 4) { - return words[2]; - } else if (numberOfChars >= 5) { - return words[3]; - } - }; - - return { - errorLoading: function () { - return 'Wuslědki njejsu se dali zacytaś.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Pšosym lašuj ' + overChars + ' ' + - pluralWord(overChars, charsWords); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Pšosym zapódaj nanejmjenjej ' + remainingChars + ' ' + - pluralWord(remainingChars, charsWords); - }, - loadingMore: function () { - return 'Dalšne wuslědki se zacytaju…'; - }, - maximumSelected: function (args) { - return 'Móžoš jano ' + args.maximum + ' ' + - pluralWord(args.maximum, itemsWords) + 'wubraś.'; - }, - noResults: function () { - return 'Žedne wuslědki namakane'; - }, - searching: function () { - return 'Pyta se…'; - }, - removeAllItems: function () { - // To DO : in Lower Sorbian. - return 'Remove all items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/el.js b/static/vendor/select2/src/js/select2/i18n/el.js deleted file mode 100644 index 49922292..00000000 --- a/static/vendor/select2/src/js/select2/i18n/el.js +++ /dev/null @@ -1,55 +0,0 @@ -define(function () { - // Greek (el) - return { - errorLoading: function () { - return 'Τα αποτελέσματα δεν μπόρεσαν να φορτώσουν.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Παρακαλώ διαγράψτε ' + overChars + ' χαρακτήρ'; - - if (overChars == 1) { - message += 'α'; - } - if (overChars != 1) { - message += 'ες'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Παρακαλώ συμπληρώστε ' + remainingChars + - ' ή περισσότερους χαρακτήρες'; - - return message; - }, - loadingMore: function () { - return 'Φόρτωση περισσότερων αποτελεσμάτων…'; - }, - maximumSelected: function (args) { - var message = 'Μπορείτε να επιλέξετε μόνο ' + args.maximum + ' επιλογ'; - - if (args.maximum == 1) { - message += 'ή'; - } - - if (args.maximum != 1) { - message += 'ές'; - } - - return message; - }, - noResults: function () { - return 'Δεν βρέθηκαν αποτελέσματα'; - }, - searching: function () { - return 'Αναζήτηση…'; - }, - removeAllItems: function () { - return 'Καταργήστε όλα τα στοιχεία'; - } - }; -}); \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/en.js b/static/vendor/select2/src/js/select2/i18n/en.js deleted file mode 100644 index 960a84e8..00000000 --- a/static/vendor/select2/src/js/select2/i18n/en.js +++ /dev/null @@ -1,47 +0,0 @@ -define(function () { - // English - return { - errorLoading: function () { - return 'The results could not be loaded.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Please delete ' + overChars + ' character'; - - if (overChars != 1) { - message += 's'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Please enter ' + remainingChars + ' or more characters'; - - return message; - }, - loadingMore: function () { - return 'Loading more results…'; - }, - maximumSelected: function (args) { - var message = 'You can only select ' + args.maximum + ' item'; - - if (args.maximum != 1) { - message += 's'; - } - - return message; - }, - noResults: function () { - return 'No results found'; - }, - searching: function () { - return 'Searching…'; - }, - removeAllItems: function () { - return 'Remove all items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/es.js b/static/vendor/select2/src/js/select2/i18n/es.js deleted file mode 100644 index d95f303f..00000000 --- a/static/vendor/select2/src/js/select2/i18n/es.js +++ /dev/null @@ -1,55 +0,0 @@ -define(function () { - // Spanish - return { - errorLoading: function () { - return 'No se pudieron cargar los resultados'; - }, - inputTooLong: function (args) { - var remainingChars = args.input.length - args.maximum; - - var message = 'Por favor, elimine ' + remainingChars + ' car'; - - if (remainingChars == 1) { - message += 'ácter'; - } else { - message += 'acteres'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Por favor, introduzca ' + remainingChars + ' car'; - - if (remainingChars == 1) { - message += 'ácter'; - } else { - message += 'acteres'; - } - - return message; - }, - loadingMore: function () { - return 'Cargando más resultados…'; - }, - maximumSelected: function (args) { - var message = 'Sólo puede seleccionar ' + args.maximum + ' elemento'; - - if (args.maximum != 1) { - message += 's'; - } - - return message; - }, - noResults: function () { - return 'No se encontraron resultados'; - }, - searching: function () { - return 'Buscando…'; - }, - removeAllItems: function () { - return 'Eliminar todos los elementos'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/et.js b/static/vendor/select2/src/js/select2/i18n/et.js deleted file mode 100644 index 589e4e7b..00000000 --- a/static/vendor/select2/src/js/select2/i18n/et.js +++ /dev/null @@ -1,56 +0,0 @@ -define(function () { - // Estonian - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Sisesta ' + overChars + ' täht'; - - if (overChars != 1) { - message += 'e'; - } - - message += ' vähem'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Sisesta ' + remainingChars + ' täht'; - - if (remainingChars != 1) { - message += 'e'; - } - - message += ' rohkem'; - - return message; - }, - loadingMore: function () { - return 'Laen tulemusi…'; - }, - maximumSelected: function (args) { - var message = 'Saad vaid ' + args.maximum + ' tulemus'; - - if (args.maximum == 1) { - message += 'e'; - } else { - message += 't'; - } - - message += ' valida'; - - return message; - }, - noResults: function () { - return 'Tulemused puuduvad'; - }, - searching: function () { - return 'Otsin…'; - }, - removeAllItems: function () { - return 'Eemalda kõik esemed'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/eu.js b/static/vendor/select2/src/js/select2/i18n/eu.js deleted file mode 100644 index 362745a2..00000000 --- a/static/vendor/select2/src/js/select2/i18n/eu.js +++ /dev/null @@ -1,54 +0,0 @@ -define(function () { - // Basque - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Idatzi '; - - if (overChars == 1) { - message += 'karaktere bat'; - } else { - message += overChars + ' karaktere'; - } - - message += ' gutxiago'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Idatzi '; - - if (remainingChars == 1) { - message += 'karaktere bat'; - } else { - message += remainingChars + ' karaktere'; - } - - message += ' gehiago'; - - return message; - }, - loadingMore: function () { - return 'Emaitza gehiago kargatzen…'; - }, - maximumSelected: function (args) { - if (args.maximum === 1) { - return 'Elementu bakarra hauta dezakezu'; - } else { - return args.maximum + ' elementu hauta ditzakezu soilik'; - } - }, - noResults: function () { - return 'Ez da bat datorrenik aurkitu'; - }, - searching: function () { - return 'Bilatzen…'; - }, - removeAllItems: function () { - return 'Kendu elementu guztiak'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/fa.js b/static/vendor/select2/src/js/select2/i18n/fa.js deleted file mode 100644 index 4b92d0e4..00000000 --- a/static/vendor/select2/src/js/select2/i18n/fa.js +++ /dev/null @@ -1,41 +0,0 @@ -/* jshint -W100 */ -/* jslint maxlen: 86 */ -define(function () { - // Farsi (Persian) - return { - errorLoading: function () { - return 'امکان بارگذاری نتایج وجود ندارد.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'لطفاً ' + overChars + ' کاراکتر را حذف نمایید'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'لطفاً تعداد ' + remainingChars + ' کاراکتر یا بیشتر وارد نمایید'; - - return message; - }, - loadingMore: function () { - return 'در حال بارگذاری نتایج بیشتر...'; - }, - maximumSelected: function (args) { - var message = 'شما تنها می‌توانید ' + args.maximum + ' آیتم را انتخاب نمایید'; - - return message; - }, - noResults: function () { - return 'هیچ نتیجه‌ای یافت نشد'; - }, - searching: function () { - return 'در حال جستجو...'; - }, - removeAllItems: function () { - return 'همه موارد را حذف کنید'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/fi.js b/static/vendor/select2/src/js/select2/i18n/fi.js deleted file mode 100644 index cc062d61..00000000 --- a/static/vendor/select2/src/js/select2/i18n/fi.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Finnish - return { - errorLoading: function () { - return 'Tuloksia ei saatu ladattua.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Ole hyvä ja anna ' + overChars + ' merkkiä vähemmän'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Ole hyvä ja anna ' + remainingChars + ' merkkiä lisää'; - }, - loadingMore: function () { - return 'Ladataan lisää tuloksia…'; - }, - maximumSelected: function (args) { - return 'Voit valita ainoastaan ' + args.maximum + ' kpl'; - }, - noResults: function () { - return 'Ei tuloksia'; - }, - searching: function () { - return 'Haetaan…'; - }, - removeAllItems: function () { - return 'Poista kaikki kohteet'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/fr.js b/static/vendor/select2/src/js/select2/i18n/fr.js deleted file mode 100644 index 02c4d928..00000000 --- a/static/vendor/select2/src/js/select2/i18n/fr.js +++ /dev/null @@ -1,36 +0,0 @@ -define(function () { - // French - return { - errorLoading: function () { - return 'Les résultats ne peuvent pas être chargés.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Supprimez ' + overChars + ' caractère' + - ((overChars > 1) ? 's' : ''); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Saisissez au moins ' + remainingChars + ' caractère' + - ((remainingChars > 1) ? 's' : ''); - }, - loadingMore: function () { - return 'Chargement de résultats supplémentaires…'; - }, - maximumSelected: function (args) { - return 'Vous pouvez seulement sélectionner ' + args.maximum + - ' élément' + ((args.maximum > 1) ? 's' : ''); - }, - noResults: function () { - return 'Aucun résultat trouvé'; - }, - searching: function () { - return 'Recherche en cours…'; - }, - removeAllItems: function () { - return 'Supprimer tous les éléments'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/gl.js b/static/vendor/select2/src/js/select2/i18n/gl.js deleted file mode 100644 index a92d6a5a..00000000 --- a/static/vendor/select2/src/js/select2/i18n/gl.js +++ /dev/null @@ -1,42 +0,0 @@ -define(function () { - // Galician - return { - errorLoading: function () { - return 'Non foi posíbel cargar os resultados.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - if (overChars === 1) { - return 'Elimine un carácter'; - } - return 'Elimine ' + overChars + ' caracteres'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - if (remainingChars === 1) { - return 'Engada un carácter'; - } - return 'Engada ' + remainingChars + ' caracteres'; - }, - loadingMore: function () { - return 'Cargando máis resultados…'; - }, - maximumSelected: function (args) { - if (args.maximum === 1) { - return 'Só pode seleccionar un elemento'; - } - return 'Só pode seleccionar ' + args.maximum + ' elementos'; - }, - noResults: function () { - return 'Non se atoparon resultados'; - }, - searching: function () { - return 'Buscando…'; - }, - removeAllItems: function () { - return 'Elimina todos os elementos'; - } - }; -}); \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/he.js b/static/vendor/select2/src/js/select2/i18n/he.js deleted file mode 100644 index 5192d866..00000000 --- a/static/vendor/select2/src/js/select2/i18n/he.js +++ /dev/null @@ -1,59 +0,0 @@ -define(function () { - // Hebrew - return { - errorLoading: function () { - return 'שגיאה בטעינת התוצאות'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'נא למחוק '; - - if (overChars === 1) { - message += 'תו אחד'; - } else { - message += overChars + ' תווים'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'נא להכניס '; - - if (remainingChars === 1) { - message += 'תו אחד'; - } else { - message += remainingChars + ' תווים'; - } - - message += ' או יותר'; - - return message; - }, - loadingMore: function () { - return 'טוען תוצאות נוספות…'; - }, - maximumSelected: function (args) { - var message = 'באפשרותך לבחור עד '; - - if (args.maximum === 1) { - message += 'פריט אחד'; - } else { - message += args.maximum + ' פריטים'; - } - - return message; - }, - noResults: function () { - return 'לא נמצאו תוצאות'; - }, - searching: function () { - return 'מחפש…'; - }, - removeAllItems: function () { - return 'הסר את כל הפריטים'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/hi.js b/static/vendor/select2/src/js/select2/i18n/hi.js deleted file mode 100644 index 234a5926..00000000 --- a/static/vendor/select2/src/js/select2/i18n/hi.js +++ /dev/null @@ -1,42 +0,0 @@ -define(function () { - // Hindi - return { - errorLoading: function () { - return 'परिणामों को लोड नहीं किया जा सका।'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = overChars + ' अक्षर को हटा दें'; - - if (overChars > 1) { - message = overChars + ' अक्षरों को हटा दें '; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'कृपया ' + remainingChars + ' या अधिक अक्षर दर्ज करें'; - - return message; - }, - loadingMore: function () { - return 'अधिक परिणाम लोड हो रहे है...'; - }, - maximumSelected: function (args) { - var message = 'आप केवल ' + args.maximum + ' आइटम का चयन कर सकते हैं'; - return message; - }, - noResults: function () { - return 'कोई परिणाम नहीं मिला'; - }, - searching: function () { - return 'खोज रहा है...'; - }, - removeAllItems: function () { - return 'सभी वस्तुओं को हटा दें'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/hr.js b/static/vendor/select2/src/js/select2/i18n/hr.js deleted file mode 100644 index 06223447..00000000 --- a/static/vendor/select2/src/js/select2/i18n/hr.js +++ /dev/null @@ -1,47 +0,0 @@ -define(function () { - // Croatian - function character (n) { - var message = ' ' + n + ' znak'; - - if (n % 10 < 5 && n % 10 > 0 && (n % 100 < 5 || n % 100 > 19)) { - if (n % 10 > 1) { - message += 'a'; - } - } else { - message += 'ova'; - } - - return message; - } - - return { - errorLoading: function () { - return 'Preuzimanje nije uspjelo.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Unesite ' + character(overChars); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Unesite još ' + character(remainingChars); - }, - loadingMore: function () { - return 'Učitavanje rezultata…'; - }, - maximumSelected: function (args) { - return 'Maksimalan broj odabranih stavki je ' + args.maximum; - }, - noResults: function () { - return 'Nema rezultata'; - }, - searching: function () { - return 'Pretraga…'; - }, - removeAllItems: function () { - return 'Ukloni sve stavke'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/hsb.js b/static/vendor/select2/src/js/select2/i18n/hsb.js deleted file mode 100644 index a72417d4..00000000 --- a/static/vendor/select2/src/js/select2/i18n/hsb.js +++ /dev/null @@ -1,52 +0,0 @@ -define(function () { - // Upper Sorbian - var charsWords = ['znamješko', 'znamješce', 'znamješka','znamješkow']; - var itemsWords = ['zapisk', 'zapiskaj', 'zapiski','zapiskow']; - - var pluralWord = function pluralWord(numberOfChars, words) { - if (numberOfChars === 1) { - return words[0]; - } else if (numberOfChars === 2) { - return words[1]; - } else if (numberOfChars > 2 && numberOfChars <= 4) { - return words[2]; - } else if (numberOfChars >= 5) { - return words[3]; - } - }; - - return { - errorLoading: function () { - return 'Wuslědki njedachu so začitać.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Prošu zhašej ' + overChars + ' ' + - pluralWord(overChars, charsWords); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Prošu zapodaj znajmjeńša ' + remainingChars + ' ' + - pluralWord(remainingChars, charsWords); - }, - loadingMore: function () { - return 'Dalše wuslědki so začitaja…'; - }, - maximumSelected: function (args) { - return 'Móžeš jenož ' + args.maximum + ' ' + - pluralWord(args.maximum, itemsWords) + 'wubrać'; - }, - noResults: function () { - return 'Žane wuslědki namakane'; - }, - searching: function () { - return 'Pyta so…'; - }, - removeAllItems: function () { - // To DO : in Upper Sorbian. - return 'Remove all items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/hu.js b/static/vendor/select2/src/js/select2/i18n/hu.js deleted file mode 100644 index 9c62748c..00000000 --- a/static/vendor/select2/src/js/select2/i18n/hu.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Hungarian - return { - errorLoading: function () { - return 'Az eredmények betöltése nem sikerült.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Túl hosszú. ' + overChars + ' karakterrel több, mint kellene.'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Túl rövid. Még ' + remainingChars + ' karakter hiányzik.'; - }, - loadingMore: function () { - return 'Töltés…'; - }, - maximumSelected: function (args) { - return 'Csak ' + args.maximum + ' elemet lehet kiválasztani.'; - }, - noResults: function () { - return 'Nincs találat.'; - }, - searching: function () { - return 'Keresés…'; - }, - removeAllItems: function () { - return 'Távolítson el minden elemet'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/hy.js b/static/vendor/select2/src/js/select2/i18n/hy.js deleted file mode 100644 index 696e89dd..00000000 --- a/static/vendor/select2/src/js/select2/i18n/hy.js +++ /dev/null @@ -1,41 +0,0 @@ -define(function () { - // Armenian - return { - errorLoading: function () { - return 'Արդյունքները հնարավոր չէ բեռնել։'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Խնդրում ենք հեռացնել ' + overChars + ' նշան'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Խնդրում ենք մուտքագրել ' + remainingChars + - ' կամ ավել նշաններ'; - - return message; - }, - loadingMore: function () { - return 'Բեռնվում են նոր արդյունքներ․․․'; - }, - maximumSelected: function (args) { - var message = 'Դուք կարող եք ընտրել առավելագույնը ' + args.maximum + - ' կետ'; - - return message; - }, - noResults: function () { - return 'Արդյունքներ չեն գտնվել'; - }, - searching: function () { - return 'Որոնում․․․'; - }, - removeAllItems: function () { - return 'Հեռացնել բոլոր տարրերը'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/id.js b/static/vendor/select2/src/js/select2/i18n/id.js deleted file mode 100644 index ceb2c1bb..00000000 --- a/static/vendor/select2/src/js/select2/i18n/id.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Indonesian - return { - errorLoading: function () { - return 'Data tidak boleh diambil.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Hapuskan ' + overChars + ' huruf'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Masukkan ' + remainingChars + ' huruf lagi'; - }, - loadingMore: function () { - return 'Mengambil data…'; - }, - maximumSelected: function (args) { - return 'Anda hanya dapat memilih ' + args.maximum + ' pilihan'; - }, - noResults: function () { - return 'Tidak ada data yang sesuai'; - }, - searching: function () { - return 'Mencari…'; - }, - removeAllItems: function () { - return 'Hapus semua item'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/is.js b/static/vendor/select2/src/js/select2/i18n/is.js deleted file mode 100644 index f16283fa..00000000 --- a/static/vendor/select2/src/js/select2/i18n/is.js +++ /dev/null @@ -1,44 +0,0 @@ -define(function () { - // Icelandic - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Vinsamlegast styttið texta um ' + overChars + ' staf'; - - if (overChars <= 1) { - return message; - } - - return message + 'i'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Vinsamlegast skrifið ' + remainingChars + ' staf'; - - if (remainingChars > 1) { - message += 'i'; - } - - message += ' í viðbót'; - - return message; - }, - loadingMore: function () { - return 'Sæki fleiri niðurstöður…'; - }, - maximumSelected: function (args) { - return 'Þú getur aðeins valið ' + args.maximum + ' atriði'; - }, - noResults: function () { - return 'Ekkert fannst'; - }, - searching: function () { - return 'Leita…'; - }, - removeAllItems: function () { - return 'Fjarlægðu öll atriði'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/it.js b/static/vendor/select2/src/js/select2/i18n/it.js deleted file mode 100644 index 2bedeb9b..00000000 --- a/static/vendor/select2/src/js/select2/i18n/it.js +++ /dev/null @@ -1,51 +0,0 @@ -define(function () { - // Italian - return { - errorLoading: function () { - return 'I risultati non possono essere caricati.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Per favore cancella ' + overChars + ' caratter'; - - if (overChars !== 1) { - message += 'i'; - } else { - message += 'e'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Per favore inserisci ' +remainingChars+ ' o più caratteri'; - - return message; - }, - loadingMore: function () { - return 'Caricando più risultati…'; - }, - maximumSelected: function (args) { - var message = 'Puoi selezionare solo ' + args.maximum + ' element'; - - if (args.maximum !== 1) { - message += 'i'; - } else { - message += 'o'; - } - - return message; - }, - noResults: function () { - return 'Nessun risultato trovato'; - }, - searching: function () { - return 'Sto cercando…'; - }, - removeAllItems: function () { - return 'Rimuovi tutti gli oggetti'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ja.js b/static/vendor/select2/src/js/select2/i18n/ja.js deleted file mode 100644 index 68568f32..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ja.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Japanese - return { - errorLoading: function () { - return '結果が読み込まれませんでした'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = overChars + ' 文字を削除してください'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = '少なくとも ' + remainingChars + ' 文字を入力してください'; - - return message; - }, - loadingMore: function () { - return '読み込み中…'; - }, - maximumSelected: function (args) { - var message = args.maximum + ' 件しか選択できません'; - - return message; - }, - noResults: function () { - return '対象が見つかりません'; - }, - searching: function () { - return '検索しています…'; - }, - removeAllItems: function () { - return 'すべてのアイテムを削除'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ka.js b/static/vendor/select2/src/js/select2/i18n/ka.js deleted file mode 100644 index 306ea90c..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ka.js +++ /dev/null @@ -1,40 +0,0 @@ -define(function () { - // Georgian - return { - errorLoading: function () { - return 'მონაცემების ჩატვირთვა შეუძლებელია.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'გთხოვთ აკრიფეთ ' + overChars + ' სიმბოლოთი ნაკლები'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'გთხოვთ აკრიფეთ ' + remainingChars + ' სიმბოლო ან მეტი'; - - return message; - }, - loadingMore: function () { - return 'მონაცემების ჩატვირთვა…'; - }, - maximumSelected: function (args) { - var message = 'თქვენ შეგიძლიათ აირჩიოთ არაუმეტეს ' + args.maximum + - ' ელემენტი'; - - return message; - }, - noResults: function () { - return 'რეზულტატი არ მოიძებნა'; - }, - searching: function () { - return 'ძიება…'; - }, - removeAllItems: function () { - return 'ამოიღე ყველა ელემენტი'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/km.js b/static/vendor/select2/src/js/select2/i18n/km.js deleted file mode 100644 index 066d5230..00000000 --- a/static/vendor/select2/src/js/select2/i18n/km.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Khmer - return { - errorLoading: function () { - return 'មិនអាចទាញយកទិន្នន័យ'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'សូមលុបចេញ ' + overChars + ' អក្សរ'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'សូមបញ្ចូល' + remainingChars + ' អក្សរ រឺ ច្រើនជាងនេះ'; - - return message; - }, - loadingMore: function () { - return 'កំពុងទាញយកទិន្នន័យបន្ថែម...'; - }, - maximumSelected: function (args) { - var message = 'អ្នកអាចជ្រើសរើសបានតែ ' + args.maximum + ' ជម្រើសប៉ុណ្ណោះ'; - - return message; - }, - noResults: function () { - return 'មិនមានលទ្ធផល'; - }, - searching: function () { - return 'កំពុងស្វែងរក...'; - }, - removeAllItems: function () { - return 'លុបធាតុទាំងអស់'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ko.js b/static/vendor/select2/src/js/select2/i18n/ko.js deleted file mode 100644 index 03b5dc09..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ko.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Korean - return { - errorLoading: function () { - return '결과를 불러올 수 없습니다.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = '너무 깁니다. ' + overChars + ' 글자 지워주세요.'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = '너무 짧습니다. ' + remainingChars + ' 글자 더 입력해주세요.'; - - return message; - }, - loadingMore: function () { - return '불러오는 중…'; - }, - maximumSelected: function (args) { - var message = '최대 ' + args.maximum + '개까지만 선택 가능합니다.'; - - return message; - }, - noResults: function () { - return '결과가 없습니다.'; - }, - searching: function () { - return '검색 중…'; - }, - removeAllItems: function () { - return '모든 항목 삭제'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/lt.js b/static/vendor/select2/src/js/select2/i18n/lt.js deleted file mode 100644 index c6f8ad9e..00000000 --- a/static/vendor/select2/src/js/select2/i18n/lt.js +++ /dev/null @@ -1,55 +0,0 @@ -define(function () { - // rules from - // http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#lt - function ending(count, one, few, other) { - if (count % 10 === 1 && (count % 100 < 11 || count % 100 > 19)) { - return one; - } else if ( - (count % 10 >= 2 && count % 10 <= 9) && - (count % 100 < 11 || count % 100 > 19)) { - return few; - } else { - return other; - } - } - - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Pašalinkite ' + overChars + ' simbol'; - - message += ending(overChars, 'į', 'ius', 'ių'); - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Įrašykite dar ' + remainingChars + ' simbol'; - - message += ending(remainingChars, 'į', 'ius', 'ių'); - - return message; - }, - loadingMore: function () { - return 'Kraunama daugiau rezultatų…'; - }, - maximumSelected: function (args) { - var message = 'Jūs galite pasirinkti tik ' + args.maximum + ' element'; - - message += ending(args.maximum, 'ą', 'us', 'ų'); - - return message; - }, - noResults: function () { - return 'Atitikmenų nerasta'; - }, - searching: function () { - return 'Ieškoma…'; - }, - removeAllItems: function () { - return 'Pašalinti visus elementus'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/lv.js b/static/vendor/select2/src/js/select2/i18n/lv.js deleted file mode 100644 index 53324fd6..00000000 --- a/static/vendor/select2/src/js/select2/i18n/lv.js +++ /dev/null @@ -1,54 +0,0 @@ -define(function () { - // Latvian - function ending (count, eleven, singular, other) { - if (count === 11) { - return eleven; - } - - if (count % 10 === 1) { - return singular; - } - - return other; - } - - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Lūdzu ievadiet par ' + overChars; - - message += ' simbol' + ending(overChars, 'iem', 'u', 'iem'); - - return message + ' mazāk'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Lūdzu ievadiet vēl ' + remainingChars; - - message += ' simbol' + ending(remainingChars, 'us', 'u', 'us'); - - return message; - }, - loadingMore: function () { - return 'Datu ielāde…'; - }, - maximumSelected: function (args) { - var message = 'Jūs varat izvēlēties ne vairāk kā ' + args.maximum; - - message += ' element' + ending(args.maximum, 'us', 'u', 'us'); - - return message; - }, - noResults: function () { - return 'Sakritību nav'; - }, - searching: function () { - return 'Meklēšana…'; - }, - removeAllItems: function () { - return 'Noņemt visus vienumus'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/mk.js b/static/vendor/select2/src/js/select2/i18n/mk.js deleted file mode 100644 index 60845112..00000000 --- a/static/vendor/select2/src/js/select2/i18n/mk.js +++ /dev/null @@ -1,50 +0,0 @@ -define(function () { - // Macedonian - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Ве молиме внесете ' + args.maximum + ' помалку карактер'; - - if (args.maximum !== 1) { - message += 'и'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Ве молиме внесете уште ' + args.maximum + ' карактер'; - - if (args.maximum !== 1) { - message += 'и'; - } - - return message; - }, - loadingMore: function () { - return 'Вчитување резултати…'; - }, - maximumSelected: function (args) { - var message = 'Можете да изберете само ' + args.maximum + ' ставк'; - - if (args.maximum === 1) { - message += 'а'; - } else { - message += 'и'; - } - - return message; - }, - noResults: function () { - return 'Нема пронајдено совпаѓања'; - }, - searching: function () { - return 'Пребарување…'; - }, - removeAllItems: function () { - return 'Отстрани ги сите предмети'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ms.js b/static/vendor/select2/src/js/select2/i18n/ms.js deleted file mode 100644 index 3338c87e..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ms.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Malay - return { - errorLoading: function () { - return 'Keputusan tidak berjaya dimuatkan.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Sila hapuskan ' + overChars + ' aksara'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Sila masukkan ' + remainingChars + ' atau lebih aksara'; - }, - loadingMore: function () { - return 'Sedang memuatkan keputusan…'; - }, - maximumSelected: function (args) { - return 'Anda hanya boleh memilih ' + args.maximum + ' pilihan'; - }, - noResults: function () { - return 'Tiada padanan yang ditemui'; - }, - searching: function () { - return 'Mencari…'; - }, - removeAllItems: function () { - return 'Keluarkan semua item'; - } - }; -}); \ No newline at end of file diff --git a/static/vendor/select2/src/js/select2/i18n/nb.js b/static/vendor/select2/src/js/select2/i18n/nb.js deleted file mode 100644 index aee869be..00000000 --- a/static/vendor/select2/src/js/select2/i18n/nb.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function () { - // Norwegian (Bokmål) - return { - errorLoading: function () { - return 'Kunne ikke hente resultater.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Vennligst fjern ' + overChars + ' tegn'; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Vennligst skriv inn ' + remainingChars + ' tegn til'; - }, - loadingMore: function () { - return 'Laster flere resultater…'; - }, - maximumSelected: function (args) { - return 'Du kan velge maks ' + args.maximum + ' elementer'; - }, - noResults: function () { - return 'Ingen treff'; - }, - searching: function () { - return 'Søker…'; - }, - removeAllItems: function () { - return 'Fjern alle elementer'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ne.js b/static/vendor/select2/src/js/select2/i18n/ne.js deleted file mode 100644 index 133af69b..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ne.js +++ /dev/null @@ -1,47 +0,0 @@ -define(function () { - // Nepali - return { - errorLoading: function () { - return 'नतिजाहरु देखाउन सकिएन।'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'कृपया ' + overChars + ' अक्षर मेटाउनुहोस्।'; - - if (overChars != 1) { - message += 'कृपया ' + overChars + ' अक्षरहरु मेटाउनुहोस्।'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'कृपया बाँकी रहेका ' + remainingChars + - ' वा अरु धेरै अक्षरहरु भर्नुहोस्।'; - - return message; - }, - loadingMore: function () { - return 'अरु नतिजाहरु भरिँदैछन् …'; - }, - maximumSelected: function (args) { - var message = 'तँपाई ' + args.maximum + - ' वस्तु मात्र छान्न पाउँनुहुन्छ।'; - - if (args.maximum != 1) { - message = 'तँपाई ' + args.maximum + - ' वस्तुहरु मात्र छान्न पाउँनुहुन्छ।'; - } - - return message; - }, - noResults: function () { - return 'कुनै पनि नतिजा भेटिएन।'; - }, - searching: function () { - return 'खोजि हुँदैछ…'; - } - }; - }); diff --git a/static/vendor/select2/src/js/select2/i18n/nl.js b/static/vendor/select2/src/js/select2/i18n/nl.js deleted file mode 100644 index 7e4a5fea..00000000 --- a/static/vendor/select2/src/js/select2/i18n/nl.js +++ /dev/null @@ -1,46 +0,0 @@ -define(function () { - // Dutch - return { - errorLoading: function () { - return 'De resultaten konden niet worden geladen.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Gelieve ' + overChars + ' karakters te verwijderen'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Gelieve ' + remainingChars + - ' of meer karakters in te voeren'; - - return message; - }, - loadingMore: function () { - return 'Meer resultaten laden…'; - }, - maximumSelected: function (args) { - var verb = args.maximum == 1 ? 'kan' : 'kunnen'; - var message = 'Er ' + verb + ' maar ' + args.maximum + ' item'; - - if (args.maximum != 1) { - message += 's'; - } - message += ' worden geselecteerd'; - - return message; - }, - noResults: function () { - return 'Geen resultaten gevonden…'; - }, - searching: function () { - return 'Zoeken…'; - }, - removeAllItems: function () { - return 'Verwijder alle items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/pl.js b/static/vendor/select2/src/js/select2/i18n/pl.js deleted file mode 100644 index 1a3d890a..00000000 --- a/static/vendor/select2/src/js/select2/i18n/pl.js +++ /dev/null @@ -1,48 +0,0 @@ -define(function () { - // Polish - var charsWords = ['znak', 'znaki', 'znaków']; - var itemsWords = ['element', 'elementy', 'elementów']; - - var pluralWord = function pluralWord(numberOfChars, words) { - if (numberOfChars === 1) { - return words[0]; - } else if (numberOfChars > 1 && numberOfChars <= 4) { - return words[1]; - } else if (numberOfChars >= 5) { - return words[2]; - } - }; - - return { - errorLoading: function () { - return 'Nie można załadować wyników.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - return 'Usuń ' + overChars + ' ' + pluralWord(overChars, charsWords); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - return 'Podaj przynajmniej ' + remainingChars + ' ' + - pluralWord(remainingChars, charsWords); - }, - loadingMore: function () { - return 'Trwa ładowanie…'; - }, - maximumSelected: function (args) { - return 'Możesz zaznaczyć tylko ' + args.maximum + ' ' + - pluralWord(args.maximum, itemsWords); - }, - noResults: function () { - return 'Brak wyników'; - }, - searching: function () { - return 'Trwa wyszukiwanie…'; - }, - removeAllItems: function () { - return 'Usuń wszystkie przedmioty'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ps.js b/static/vendor/select2/src/js/select2/i18n/ps.js deleted file mode 100644 index cb5797a2..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ps.js +++ /dev/null @@ -1,48 +0,0 @@ -/* jslint maxlen: 87 */ -define(function () { - // Pashto (پښتو) - return { - errorLoading: function () { - return 'پايلي نه سي ترلاسه کېدای'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'د مهربانۍ لمخي ' + overChars + ' توری ړنګ کړئ'; - - if (overChars != 1) { - message = message.replace('توری', 'توري'); - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'لږ تر لږه ' + remainingChars + ' يا ډېر توري وليکئ'; - - return message; - }, - loadingMore: function () { - return 'نوري پايلي ترلاسه کيږي...'; - }, - maximumSelected: function (args) { - var message = 'تاسو يوازي ' + args.maximum + ' قلم په نښه کولای سی'; - - if (args.maximum != 1) { - message = message.replace('قلم', 'قلمونه'); - } - - return message; - }, - noResults: function () { - return 'پايلي و نه موندل سوې'; - }, - searching: function () { - return 'لټول کيږي...'; - }, - removeAllItems: function () { - return 'ټول توکي لرې کړئ'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/pt-BR.js b/static/vendor/select2/src/js/select2/i18n/pt-BR.js deleted file mode 100644 index 6e5beb0a..00000000 --- a/static/vendor/select2/src/js/select2/i18n/pt-BR.js +++ /dev/null @@ -1,49 +0,0 @@ -define(function () { - // Brazilian Portuguese - return { - errorLoading: function () { - return 'Os resultados não puderam ser carregados.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Apague ' + overChars + ' caracter'; - - if (overChars != 1) { - message += 'es'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Digite ' + remainingChars + ' ou mais caracteres'; - - return message; - }, - loadingMore: function () { - return 'Carregando mais resultados…'; - }, - maximumSelected: function (args) { - var message = 'Você só pode selecionar ' + args.maximum + ' ite'; - - if (args.maximum == 1) { - message += 'm'; - } else { - message += 'ns'; - } - - return message; - }, - noResults: function () { - return 'Nenhum resultado encontrado'; - }, - searching: function () { - return 'Buscando…'; - }, - removeAllItems: function () { - return 'Remover todos os itens'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/pt.js b/static/vendor/select2/src/js/select2/i18n/pt.js deleted file mode 100644 index 27bb0293..00000000 --- a/static/vendor/select2/src/js/select2/i18n/pt.js +++ /dev/null @@ -1,43 +0,0 @@ -define(function () { - // European Portuguese - return { - errorLoading: function () { - return 'Os resultados não puderam ser carregados.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Por favor apague ' + overChars + ' '; - - message += overChars != 1 ? 'caracteres' : 'caractere'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Introduza ' + remainingChars + ' ou mais caracteres'; - - return message; - }, - loadingMore: function () { - return 'A carregar mais resultados…'; - }, - maximumSelected: function (args) { - var message = 'Apenas pode seleccionar ' + args.maximum + ' '; - - message += args.maximum != 1 ? 'itens' : 'item'; - - return message; - }, - noResults: function () { - return 'Sem resultados'; - }, - searching: function () { - return 'A procurar…'; - }, - removeAllItems: function () { - return 'Remover todos os itens'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ro.js b/static/vendor/select2/src/js/select2/i18n/ro.js deleted file mode 100644 index 75d17815..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ro.js +++ /dev/null @@ -1,49 +0,0 @@ -define(function () { - // Romanian - return { - errorLoading: function () { - return 'Rezultatele nu au putut fi incărcate.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Vă rugăm să ștergeți' + overChars + ' caracter'; - - if (overChars !== 1) { - message += 'e'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Vă rugăm să introduceți ' + remainingChars + - ' sau mai multe caractere'; - - return message; - }, - loadingMore: function () { - return 'Se încarcă mai multe rezultate…'; - }, - maximumSelected: function (args) { - var message = 'Aveți voie să selectați cel mult ' + args.maximum; - message += ' element'; - - if (args.maximum !== 1) { - message += 'e'; - } - - return message; - }, - noResults: function () { - return 'Nu au fost găsite rezultate'; - }, - searching: function () { - return 'Căutare…'; - }, - removeAllItems: function () { - return 'Eliminați toate elementele'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/ru.js b/static/vendor/select2/src/js/select2/i18n/ru.js deleted file mode 100644 index 8bb24305..00000000 --- a/static/vendor/select2/src/js/select2/i18n/ru.js +++ /dev/null @@ -1,61 +0,0 @@ -define(function () { - // Russian - function ending (count, one, couple, more) { - if (count % 10 < 5 && count % 10 > 0 && - count % 100 < 5 || count % 100 > 20) { - if (count % 10 > 1) { - return couple; - } - } else { - return more; - } - - return one; - } - - return { - errorLoading: function () { - return 'Невозможно загрузить результаты'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Пожалуйста, введите на ' + overChars + ' символ'; - - message += ending(overChars, '', 'a', 'ов'); - - message += ' меньше'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Пожалуйста, введите ещё хотя бы ' + remainingChars + - ' символ'; - - message += ending(remainingChars, '', 'a', 'ов'); - - return message; - }, - loadingMore: function () { - return 'Загрузка данных…'; - }, - maximumSelected: function (args) { - var message = 'Вы можете выбрать не более ' + args.maximum + ' элемент'; - - message += ending(args.maximum, '', 'a', 'ов'); - - return message; - }, - noResults: function () { - return 'Совпадений не найдено'; - }, - searching: function () { - return 'Поиск…'; - }, - removeAllItems: function () { - return 'Удалить все элементы'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sk.js b/static/vendor/select2/src/js/select2/i18n/sk.js deleted file mode 100644 index f3e821d5..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sk.js +++ /dev/null @@ -1,62 +0,0 @@ -define(function () { - // Slovak - - // use text for the numbers 2 through 4 - var smallNumbers = { - 2: function (masc) { return (masc ? 'dva' : 'dve'); }, - 3: function () { return 'tri'; }, - 4: function () { return 'štyri'; } - }; - - return { - errorLoading: function () { - return 'Výsledky sa nepodarilo načítať.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - if (overChars == 1) { - return 'Prosím, zadajte o jeden znak menej'; - } else if (overChars >= 2 && overChars <= 4) { - return 'Prosím, zadajte o ' + smallNumbers[overChars](true) + - ' znaky menej'; - } else { - return 'Prosím, zadajte o ' + overChars + ' znakov menej'; - } - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - if (remainingChars == 1) { - return 'Prosím, zadajte ešte jeden znak'; - } else if (remainingChars <= 4) { - return 'Prosím, zadajte ešte ďalšie ' + - smallNumbers[remainingChars](true) + ' znaky'; - } else { - return 'Prosím, zadajte ešte ďalších ' + remainingChars + ' znakov'; - } - }, - loadingMore: function () { - return 'Načítanie ďalších výsledkov…'; - }, - maximumSelected: function (args) { - if (args.maximum == 1) { - return 'Môžete zvoliť len jednu položku'; - } else if (args.maximum >= 2 && args.maximum <= 4) { - return 'Môžete zvoliť najviac ' + smallNumbers[args.maximum](false) + - ' položky'; - } else { - return 'Môžete zvoliť najviac ' + args.maximum + ' položiek'; - } - }, - noResults: function () { - return 'Nenašli sa žiadne položky'; - }, - searching: function () { - return 'Vyhľadávanie…'; - }, - removeAllItems: function () { - return 'Odstráňte všetky položky'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sl.js b/static/vendor/select2/src/js/select2/i18n/sl.js deleted file mode 100644 index df12e402..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sl.js +++ /dev/null @@ -1,57 +0,0 @@ -define(function () { - // Slovene - return { - errorLoading: function () { - return 'Zadetkov iskanja ni bilo mogoče naložiti.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Prosim zbrišite ' + overChars + ' znak'; - - if (overChars == 2) { - message += 'a'; - } else if (overChars != 1) { - message += 'e'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Prosim vpišite še ' + remainingChars + ' znak'; - - if (remainingChars == 2) { - message += 'a'; - } else if (remainingChars != 1) { - message += 'e'; - } - - return message; - }, - loadingMore: function () { - return 'Nalagam več zadetkov…'; - }, - maximumSelected: function (args) { - var message = 'Označite lahko največ ' + args.maximum + ' predmet'; - - if (args.maximum == 2) { - message += 'a'; - } else if (args.maximum != 1) { - message += 'e'; - } - - return message; - }, - noResults: function () { - return 'Ni zadetkov.'; - }, - searching: function () { - return 'Iščem…'; - }, - removeAllItems: function () { - return 'Odstranite vse elemente'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sq.js b/static/vendor/select2/src/js/select2/i18n/sq.js deleted file mode 100644 index d3e1b8a5..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sq.js +++ /dev/null @@ -1,48 +0,0 @@ -define(function () { - // Albanian - return { - errorLoading: function () { - return 'Rezultatet nuk mund të ngarkoheshin.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Të lutem fshi ' + overChars + ' karakter'; - - if (overChars != 1) { - message += 'e'; - } - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Të lutem shkruaj ' + remainingChars + - ' ose më shumë karaktere'; - - return message; - }, - loadingMore: function () { - return 'Duke ngarkuar më shumë rezultate…'; - }, - maximumSelected: function (args) { - var message = 'Mund të zgjedhësh vetëm ' + args.maximum + ' element'; - - if (args.maximum != 1) { - message += 'e'; - } - - return message; - }, - noResults: function () { - return 'Nuk u gjet asnjë rezultat'; - }, - searching: function () { - return 'Duke kërkuar…'; - }, - removeAllItems: function () { - return 'Hiq të gjitha sendet'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sr-Cyrl.js b/static/vendor/select2/src/js/select2/i18n/sr-Cyrl.js deleted file mode 100644 index b8f8d41e..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sr-Cyrl.js +++ /dev/null @@ -1,58 +0,0 @@ -define(function () { - // Serbian Cyrilic - function ending (count, one, some, many) { - if (count % 10 == 1 && count % 100 != 11) { - return one; - } - - if (count % 10 >= 2 && count % 10 <= 4 && - (count % 100 < 12 || count % 100 > 14)) { - return some; - } - - return many; - } - - return { - errorLoading: function () { - return 'Преузимање није успело.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Обришите ' + overChars + ' симбол'; - - message += ending(overChars, '', 'а', 'а'); - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Укуцајте бар још ' + remainingChars + ' симбол'; - - message += ending(remainingChars, '', 'а', 'а'); - - return message; - }, - loadingMore: function () { - return 'Преузимање још резултата…'; - }, - maximumSelected: function (args) { - var message = 'Можете изабрати само ' + args.maximum + ' ставк'; - - message += ending(args.maximum, 'у', 'е', 'и'); - - return message; - }, - noResults: function () { - return 'Ништа није пронађено'; - }, - searching: function () { - return 'Претрага…'; - }, - removeAllItems: function () { - return 'Уклоните све ставке'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sr.js b/static/vendor/select2/src/js/select2/i18n/sr.js deleted file mode 100644 index 96f1b723..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sr.js +++ /dev/null @@ -1,58 +0,0 @@ -define(function () { - // Serbian - function ending (count, one, some, many) { - if (count % 10 == 1 && count % 100 != 11) { - return one; - } - - if (count % 10 >= 2 && count % 10 <= 4 && - (count % 100 < 12 || count % 100 > 14)) { - return some; - } - - return many; - } - - return { - errorLoading: function () { - return 'Preuzimanje nije uspelo.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Obrišite ' + overChars + ' simbol'; - - message += ending(overChars, '', 'a', 'a'); - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Ukucajte bar još ' + remainingChars + ' simbol'; - - message += ending(remainingChars, '', 'a', 'a'); - - return message; - }, - loadingMore: function () { - return 'Preuzimanje još rezultata…'; - }, - maximumSelected: function (args) { - var message = 'Možete izabrati samo ' + args.maximum + ' stavk'; - - message += ending(args.maximum, 'u', 'e', 'i'); - - return message; - }, - noResults: function () { - return 'Ništa nije pronađeno'; - }, - searching: function () { - return 'Pretraga…'; - }, - removeAllItems: function () { - return 'Уклоните све ставке'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/sv.js b/static/vendor/select2/src/js/select2/i18n/sv.js deleted file mode 100644 index e4e204f4..00000000 --- a/static/vendor/select2/src/js/select2/i18n/sv.js +++ /dev/null @@ -1,40 +0,0 @@ -define(function () { - // Swedish - return { - errorLoading: function () { - return 'Resultat kunde inte laddas.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Vänligen sudda ut ' + overChars + ' tecken'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Vänligen skriv in ' + remainingChars + - ' eller fler tecken'; - - return message; - }, - loadingMore: function () { - return 'Laddar fler resultat…'; - }, - maximumSelected: function (args) { - var message = 'Du kan max välja ' + args.maximum + ' element'; - - return message; - }, - noResults: function () { - return 'Inga träffar'; - }, - searching: function () { - return 'Söker…'; - }, - removeAllItems: function () { - return 'Ta bort alla objekt'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/th.js b/static/vendor/select2/src/js/select2/i18n/th.js deleted file mode 100644 index 01fc554f..00000000 --- a/static/vendor/select2/src/js/select2/i18n/th.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Thai - return { - errorLoading: function () { - return 'ไม่สามารถค้นข้อมูลได้'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'โปรดลบออก ' + overChars + ' ตัวอักษร'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'โปรดพิมพ์เพิ่มอีก ' + remainingChars + ' ตัวอักษร'; - - return message; - }, - loadingMore: function () { - return 'กำลังค้นข้อมูลเพิ่ม…'; - }, - maximumSelected: function (args) { - var message = 'คุณสามารถเลือกได้ไม่เกิน ' + args.maximum + ' รายการ'; - - return message; - }, - noResults: function () { - return 'ไม่พบข้อมูล'; - }, - searching: function () { - return 'กำลังค้นข้อมูล…'; - }, - removeAllItems: function () { - return 'ลบรายการทั้งหมด'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/tk.js b/static/vendor/select2/src/js/select2/i18n/tk.js deleted file mode 100644 index fb87b1d7..00000000 --- a/static/vendor/select2/src/js/select2/i18n/tk.js +++ /dev/null @@ -1,40 +0,0 @@ -define(function () { - // Turkmen - return { - errorLoading: function (){ - return 'Netije ýüklenmedi.'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = overChars + ' harp bozuň.'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Ýene-de iň az ' + remainingChars + ' harp ýazyň.'; - - return message; - }, - loadingMore: function () { - return 'Köpräk netije görkezilýär…'; - }, - maximumSelected: function (args) { - var message = 'Diňe ' + args.maximum + ' sanysyny saýlaň.'; - - return message; - }, - noResults: function () { - return 'Netije tapylmady.'; - }, - searching: function () { - return 'Gözlenýär…'; - }, - removeAllItems: function () { - // TO DO : add in turkmen, - return 'Remove all items'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/tr.js b/static/vendor/select2/src/js/select2/i18n/tr.js deleted file mode 100644 index 7fa1661d..00000000 --- a/static/vendor/select2/src/js/select2/i18n/tr.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Turkish - return { - errorLoading: function (){ - return 'Sonuç yüklenemedi'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = overChars + ' karakter daha girmelisiniz'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'En az ' + remainingChars + ' karakter daha girmelisiniz'; - - return message; - }, - loadingMore: function () { - return 'Daha fazla…'; - }, - maximumSelected: function (args) { - var message = 'Sadece ' + args.maximum + ' seçim yapabilirsiniz'; - - return message; - }, - noResults: function () { - return 'Sonuç bulunamadı'; - }, - searching: function () { - return 'Aranıyor…'; - }, - removeAllItems: function () { - return 'Tüm öğeleri kaldır'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/uk.js b/static/vendor/select2/src/js/select2/i18n/uk.js deleted file mode 100644 index 3471265e..00000000 --- a/static/vendor/select2/src/js/select2/i18n/uk.js +++ /dev/null @@ -1,46 +0,0 @@ -define(function () { - // Ukranian - function ending (count, one, couple, more) { - if (count % 100 > 10 && count % 100 < 15) { - return more; - } - if (count % 10 === 1) { - return one; - } - if (count % 10 > 1 && count % 10 < 5) { - return couple; - } - return more; - } - - return { - errorLoading: function () { - return 'Неможливо завантажити результати'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - return 'Будь ласка, видаліть ' + overChars + ' ' + - ending(args.maximum, 'літеру', 'літери', 'літер'); - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - return 'Будь ласка, введіть ' + remainingChars + ' або більше літер'; - }, - loadingMore: function () { - return 'Завантаження інших результатів…'; - }, - maximumSelected: function (args) { - return 'Ви можете вибрати лише ' + args.maximum + ' ' + - ending(args.maximum, 'пункт', 'пункти', 'пунктів'); - }, - noResults: function () { - return 'Нічого не знайдено'; - }, - searching: function () { - return 'Пошук…'; - }, - removeAllItems: function () { - return 'Видалити всі елементи'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/vi.js b/static/vendor/select2/src/js/select2/i18n/vi.js deleted file mode 100644 index 83312c77..00000000 --- a/static/vendor/select2/src/js/select2/i18n/vi.js +++ /dev/null @@ -1,37 +0,0 @@ -define(function () { - // Vietnamese - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = 'Vui lòng xóa bớt ' + overChars + ' ký tự'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = 'Vui lòng nhập thêm từ ' + remainingChars + - ' ký tự trở lên'; - - return message; - }, - loadingMore: function () { - return 'Đang lấy thêm kết quả…'; - }, - maximumSelected: function (args) { - var message = 'Chỉ có thể chọn được ' + args.maximum + ' lựa chọn'; - - return message; - }, - noResults: function () { - return 'Không tìm thấy kết quả'; - }, - searching: function () { - return 'Đang tìm…'; - }, - removeAllItems: function () { - return 'Xóa tất cả các mục'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/zh-CN.js b/static/vendor/select2/src/js/select2/i18n/zh-CN.js deleted file mode 100644 index 18ec5605..00000000 --- a/static/vendor/select2/src/js/select2/i18n/zh-CN.js +++ /dev/null @@ -1,39 +0,0 @@ -define(function () { - // Chinese (Simplified) - return { - errorLoading: function () { - return '无法载入结果。'; - }, - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = '请删除' + overChars + '个字符'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = '请再输入至少' + remainingChars + '个字符'; - - return message; - }, - loadingMore: function () { - return '载入更多结果…'; - }, - maximumSelected: function (args) { - var message = '最多只能选择' + args.maximum + '个项目'; - - return message; - }, - noResults: function () { - return '未找到结果'; - }, - searching: function () { - return '搜索中…'; - }, - removeAllItems: function () { - return '删除所有项目'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/i18n/zh-TW.js b/static/vendor/select2/src/js/select2/i18n/zh-TW.js deleted file mode 100644 index f2bf0c4e..00000000 --- a/static/vendor/select2/src/js/select2/i18n/zh-TW.js +++ /dev/null @@ -1,36 +0,0 @@ -define(function () { - // Chinese (Traditional) - return { - inputTooLong: function (args) { - var overChars = args.input.length - args.maximum; - - var message = '請刪掉' + overChars + '個字元'; - - return message; - }, - inputTooShort: function (args) { - var remainingChars = args.minimum - args.input.length; - - var message = '請再輸入' + remainingChars + '個字元'; - - return message; - }, - loadingMore: function () { - return '載入中…'; - }, - maximumSelected: function (args) { - var message = '你只能選擇最多' + args.maximum + '項'; - - return message; - }, - noResults: function () { - return '沒有找到相符的項目'; - }, - searching: function () { - return '搜尋中…'; - }, - removeAllItems: function () { - return '刪除所有項目'; - } - }; -}); diff --git a/static/vendor/select2/src/js/select2/keys.js b/static/vendor/select2/src/js/select2/keys.js deleted file mode 100644 index f449ba43..00000000 --- a/static/vendor/select2/src/js/select2/keys.js +++ /dev/null @@ -1,25 +0,0 @@ -define([ - -], function () { - var KEYS = { - BACKSPACE: 8, - TAB: 9, - ENTER: 13, - SHIFT: 16, - CTRL: 17, - ALT: 18, - ESC: 27, - SPACE: 32, - PAGE_UP: 33, - PAGE_DOWN: 34, - END: 35, - HOME: 36, - LEFT: 37, - UP: 38, - RIGHT: 39, - DOWN: 40, - DELETE: 46 - }; - - return KEYS; -}); diff --git a/static/vendor/select2/src/js/select2/options.js b/static/vendor/select2/src/js/select2/options.js deleted file mode 100644 index 8e0dc07e..00000000 --- a/static/vendor/select2/src/js/select2/options.js +++ /dev/null @@ -1,146 +0,0 @@ -define([ - 'require', - 'jquery', - './defaults', - './utils' -], function (require, $, Defaults, Utils) { - function Options (options, $element) { - this.options = options; - - if ($element != null) { - this.fromElement($element); - } - - this.options = Defaults.apply(this.options); - - if ($element && $element.is('input')) { - var InputCompat = require(this.get('amdBase') + 'compat/inputData'); - - this.options.dataAdapter = Utils.Decorate( - this.options.dataAdapter, - InputCompat - ); - } - } - - Options.prototype.fromElement = function ($e) { - var excludedData = ['select2']; - - if (this.options.multiple == null) { - this.options.multiple = $e.prop('multiple'); - } - - if (this.options.disabled == null) { - this.options.disabled = $e.prop('disabled'); - } - - if (this.options.language == null) { - if ($e.prop('lang')) { - this.options.language = $e.prop('lang').toLowerCase(); - } else if ($e.closest('[lang]').prop('lang')) { - this.options.language = $e.closest('[lang]').prop('lang'); - } - } - - if (this.options.dir == null) { - if ($e.prop('dir')) { - this.options.dir = $e.prop('dir'); - } else if ($e.closest('[dir]').prop('dir')) { - this.options.dir = $e.closest('[dir]').prop('dir'); - } else { - this.options.dir = 'ltr'; - } - } - - $e.prop('disabled', this.options.disabled); - $e.prop('multiple', this.options.multiple); - - if (Utils.GetData($e[0], 'select2Tags')) { - if (this.options.debug && window.console && console.warn) { - console.warn( - 'Select2: The `data-select2-tags` attribute has been changed to ' + - 'use the `data-data` and `data-tags="true"` attributes and will be ' + - 'removed in future versions of Select2.' - ); - } - - Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags')); - Utils.StoreData($e[0], 'tags', true); - } - - if (Utils.GetData($e[0], 'ajaxUrl')) { - if (this.options.debug && window.console && console.warn) { - console.warn( - 'Select2: The `data-ajax-url` attribute has been changed to ' + - '`data-ajax--url` and support for the old attribute will be removed' + - ' in future versions of Select2.' - ); - } - - $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl')); - Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl')); - } - - var dataset = {}; - - function upperCaseLetter(_, letter) { - return letter.toUpperCase(); - } - - // Pre-load all of the attributes which are prefixed with `data-` - for (var attr = 0; attr < $e[0].attributes.length; attr++) { - var attributeName = $e[0].attributes[attr].name; - var prefix = 'data-'; - - if (attributeName.substr(0, prefix.length) == prefix) { - // Get the contents of the attribute after `data-` - var dataName = attributeName.substring(prefix.length); - - // Get the data contents from the consistent source - // This is more than likely the jQuery data helper - var dataValue = Utils.GetData($e[0], dataName); - - // camelCase the attribute name to match the spec - var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter); - - // Store the data attribute contents into the dataset since - dataset[camelDataName] = dataValue; - } - } - - // Prefer the element's `dataset` attribute if it exists - // jQuery 1.x does not correctly handle data attributes with multiple dashes - if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) { - dataset = $.extend(true, {}, $e[0].dataset, dataset); - } - - // Prefer our internal data cache if it exists - var data = $.extend(true, {}, Utils.GetData($e[0]), dataset); - - data = Utils._convertData(data); - - for (var key in data) { - if ($.inArray(key, excludedData) > -1) { - continue; - } - - if ($.isPlainObject(this.options[key])) { - $.extend(this.options[key], data[key]); - } else { - this.options[key] = data[key]; - } - } - - return this; - }; - - Options.prototype.get = function (key) { - return this.options[key]; - }; - - Options.prototype.set = function (key, val) { - this.options[key] = val; - }; - - return Options; -}); diff --git a/static/vendor/select2/src/js/select2/results.js b/static/vendor/select2/src/js/select2/results.js deleted file mode 100644 index b56f8d3b..00000000 --- a/static/vendor/select2/src/js/select2/results.js +++ /dev/null @@ -1,530 +0,0 @@ -define([ - 'jquery', - './utils' -], function ($, Utils) { - function Results ($element, options, dataAdapter) { - this.$element = $element; - this.data = dataAdapter; - this.options = options; - - Results.__super__.constructor.call(this); - } - - Utils.Extend(Results, Utils.Observable); - - Results.prototype.render = function () { - var $results = $( - '
      ' - ); - - if (this.options.get('multiple')) { - $results.attr('aria-multiselectable', 'true'); - } - - this.$results = $results; - - return $results; - }; - - Results.prototype.clear = function () { - this.$results.empty(); - }; - - Results.prototype.displayMessage = function (params) { - var escapeMarkup = this.options.get('escapeMarkup'); - - this.clear(); - this.hideLoading(); - - var $message = $( - '
    • ' - ); - - var message = this.options.get('translations').get(params.message); - - $message.append( - escapeMarkup( - message(params.args) - ) - ); - - $message[0].className += ' select2-results__message'; - - this.$results.append($message); - }; - - Results.prototype.hideMessages = function () { - this.$results.find('.select2-results__message').remove(); - }; - - Results.prototype.append = function (data) { - this.hideLoading(); - - var $options = []; - - if (data.results == null || data.results.length === 0) { - if (this.$results.children().length === 0) { - this.trigger('results:message', { - message: 'noResults' - }); - } - - return; - } - - data.results = this.sort(data.results); - - for (var d = 0; d < data.results.length; d++) { - var item = data.results[d]; - - var $option = this.option(item); - - $options.push($option); - } - - this.$results.append($options); - }; - - Results.prototype.position = function ($results, $dropdown) { - var $resultsContainer = $dropdown.find('.select2-results'); - $resultsContainer.append($results); - }; - - Results.prototype.sort = function (data) { - var sorter = this.options.get('sorter'); - - return sorter(data); - }; - - Results.prototype.highlightFirstItem = function () { - var $options = this.$results - .find('.select2-results__option[aria-selected]'); - - var $selected = $options.filter('[aria-selected=true]'); - - // Check if there are any selected options - if ($selected.length > 0) { - // If there are selected options, highlight the first - $selected.first().trigger('mouseenter'); - } else { - // If there are no selected options, highlight the first option - // in the dropdown - $options.first().trigger('mouseenter'); - } - - this.ensureHighlightVisible(); - }; - - Results.prototype.setClasses = function () { - var self = this; - - this.data.current(function (selected) { - var selectedIds = $.map(selected, function (s) { - return s.id.toString(); - }); - - var $options = self.$results - .find('.select2-results__option[aria-selected]'); - - $options.each(function () { - var $option = $(this); - - var item = Utils.GetData(this, 'data'); - - // id needs to be converted to a string when comparing - var id = '' + item.id; - - if ((item.element != null && item.element.selected) || - (item.element == null && $.inArray(id, selectedIds) > -1)) { - $option.attr('aria-selected', 'true'); - } else { - $option.attr('aria-selected', 'false'); - } - }); - - }); - }; - - Results.prototype.showLoading = function (params) { - this.hideLoading(); - - var loadingMore = this.options.get('translations').get('searching'); - - var loading = { - disabled: true, - loading: true, - text: loadingMore(params) - }; - var $loading = this.option(loading); - $loading.className += ' loading-results'; - - this.$results.prepend($loading); - }; - - Results.prototype.hideLoading = function () { - this.$results.find('.loading-results').remove(); - }; - - Results.prototype.option = function (data) { - var option = document.createElement('li'); - option.className = 'select2-results__option'; - - var attrs = { - 'role': 'treeitem', - 'aria-selected': 'false' - }; - - if (data.disabled) { - delete attrs['aria-selected']; - attrs['aria-disabled'] = 'true'; - } - - if (data.id == null) { - delete attrs['aria-selected']; - } - - if (data._resultId != null) { - option.id = data._resultId; - } - - if (data.title) { - option.title = data.title; - } - - if (data.children) { - attrs.role = 'group'; - attrs['aria-label'] = data.text; - delete attrs['aria-selected']; - } - - for (var attr in attrs) { - var val = attrs[attr]; - - option.setAttribute(attr, val); - } - - if (data.children) { - var $option = $(option); - - var label = document.createElement('strong'); - label.className = 'select2-results__group'; - - var $label = $(label); - this.template(data, label); - - var $children = []; - - for (var c = 0; c < data.children.length; c++) { - var child = data.children[c]; - - var $child = this.option(child); - - $children.push($child); - } - - var $childrenContainer = $('
        ', { - 'class': 'select2-results__options select2-results__options--nested' - }); - - $childrenContainer.append($children); - - $option.append(label); - $option.append($childrenContainer); - } else { - this.template(data, option); - } - - Utils.StoreData(option, 'data', data); - - return option; - }; - - Results.prototype.bind = function (container, $container) { - var self = this; - - var id = container.id + '-results'; - - this.$results.attr('id', id); - - container.on('results:all', function (params) { - self.clear(); - self.append(params.data); - - if (container.isOpen()) { - self.setClasses(); - self.highlightFirstItem(); - } - }); - - container.on('results:append', function (params) { - self.append(params.data); - - if (container.isOpen()) { - self.setClasses(); - } - }); - - container.on('query', function (params) { - self.hideMessages(); - self.showLoading(params); - }); - - container.on('select', function () { - if (!container.isOpen()) { - return; - } - - self.setClasses(); - - if (self.options.get('scrollAfterSelect')) { - self.highlightFirstItem(); - } - }); - - container.on('unselect', function () { - if (!container.isOpen()) { - return; - } - - self.setClasses(); - - if (self.options.get('scrollAfterSelect')) { - self.highlightFirstItem(); - } - }); - - container.on('open', function () { - // When the dropdown is open, aria-expended="true" - self.$results.attr('aria-expanded', 'true'); - self.$results.attr('aria-hidden', 'false'); - - self.setClasses(); - self.ensureHighlightVisible(); - }); - - container.on('close', function () { - // When the dropdown is closed, aria-expended="false" - self.$results.attr('aria-expanded', 'false'); - self.$results.attr('aria-hidden', 'true'); - self.$results.removeAttr('aria-activedescendant'); - }); - - container.on('results:toggle', function () { - var $highlighted = self.getHighlightedResults(); - - if ($highlighted.length === 0) { - return; - } - - $highlighted.trigger('mouseup'); - }); - - container.on('results:select', function () { - var $highlighted = self.getHighlightedResults(); - - if ($highlighted.length === 0) { - return; - } - - var data = Utils.GetData($highlighted[0], 'data'); - - if ($highlighted.attr('aria-selected') == 'true') { - self.trigger('close', {}); - } else { - self.trigger('select', { - data: data - }); - } - }); - - container.on('results:previous', function () { - var $highlighted = self.getHighlightedResults(); - - var $options = self.$results.find('[aria-selected]'); - - var currentIndex = $options.index($highlighted); - - // If we are already at the top, don't move further - // If no options, currentIndex will be -1 - if (currentIndex <= 0) { - return; - } - - var nextIndex = currentIndex - 1; - - // If none are highlighted, highlight the first - if ($highlighted.length === 0) { - nextIndex = 0; - } - - var $next = $options.eq(nextIndex); - - $next.trigger('mouseenter'); - - var currentOffset = self.$results.offset().top; - var nextTop = $next.offset().top; - var nextOffset = self.$results.scrollTop() + (nextTop - currentOffset); - - if (nextIndex === 0) { - self.$results.scrollTop(0); - } else if (nextTop - currentOffset < 0) { - self.$results.scrollTop(nextOffset); - } - }); - - container.on('results:next', function () { - var $highlighted = self.getHighlightedResults(); - - var $options = self.$results.find('[aria-selected]'); - - var currentIndex = $options.index($highlighted); - - var nextIndex = currentIndex + 1; - - // If we are at the last option, stay there - if (nextIndex >= $options.length) { - return; - } - - var $next = $options.eq(nextIndex); - - $next.trigger('mouseenter'); - - var currentOffset = self.$results.offset().top + - self.$results.outerHeight(false); - var nextBottom = $next.offset().top + $next.outerHeight(false); - var nextOffset = self.$results.scrollTop() + nextBottom - currentOffset; - - if (nextIndex === 0) { - self.$results.scrollTop(0); - } else if (nextBottom > currentOffset) { - self.$results.scrollTop(nextOffset); - } - }); - - container.on('results:focus', function (params) { - params.element.addClass('select2-results__option--highlighted'); - }); - - container.on('results:message', function (params) { - self.displayMessage(params); - }); - - if ($.fn.mousewheel) { - this.$results.on('mousewheel', function (e) { - var top = self.$results.scrollTop(); - - var bottom = self.$results.get(0).scrollHeight - top + e.deltaY; - - var isAtTop = e.deltaY > 0 && top - e.deltaY <= 0; - var isAtBottom = e.deltaY < 0 && bottom <= self.$results.height(); - - if (isAtTop) { - self.$results.scrollTop(0); - - e.preventDefault(); - e.stopPropagation(); - } else if (isAtBottom) { - self.$results.scrollTop( - self.$results.get(0).scrollHeight - self.$results.height() - ); - - e.preventDefault(); - e.stopPropagation(); - } - }); - } - - this.$results.on('mouseup', '.select2-results__option[aria-selected]', - function (evt) { - var $this = $(this); - - var data = Utils.GetData(this, 'data'); - - if ($this.attr('aria-selected') === 'true') { - if (self.options.get('multiple')) { - self.trigger('unselect', { - originalEvent: evt, - data: data - }); - } else { - self.trigger('close', {}); - } - - return; - } - - self.trigger('select', { - originalEvent: evt, - data: data - }); - }); - - this.$results.on('mouseenter', '.select2-results__option[aria-selected]', - function (evt) { - var data = Utils.GetData(this, 'data'); - - self.getHighlightedResults() - .removeClass('select2-results__option--highlighted'); - - self.trigger('results:focus', { - data: data, - element: $(this) - }); - }); - }; - - Results.prototype.getHighlightedResults = function () { - var $highlighted = this.$results - .find('.select2-results__option--highlighted'); - - return $highlighted; - }; - - Results.prototype.destroy = function () { - this.$results.remove(); - }; - - Results.prototype.ensureHighlightVisible = function () { - var $highlighted = this.getHighlightedResults(); - - if ($highlighted.length === 0) { - return; - } - - var $options = this.$results.find('[aria-selected]'); - - var currentIndex = $options.index($highlighted); - - var currentOffset = this.$results.offset().top; - var nextTop = $highlighted.offset().top; - var nextOffset = this.$results.scrollTop() + (nextTop - currentOffset); - - var offsetDelta = nextTop - currentOffset; - nextOffset -= $highlighted.outerHeight(false) * 2; - - if (currentIndex <= 2) { - this.$results.scrollTop(0); - } else if (offsetDelta > this.$results.outerHeight() || offsetDelta < 0) { - this.$results.scrollTop(nextOffset); - } - }; - - Results.prototype.template = function (result, container) { - var template = this.options.get('templateResult'); - var escapeMarkup = this.options.get('escapeMarkup'); - - var content = template(result, container); - - if (content == null) { - container.style.display = 'none'; - } else if (typeof content === 'string') { - container.innerHTML = escapeMarkup(content); - } else { - $(container).append(content); - } - }; - - return Results; -}); diff --git a/static/vendor/select2/src/js/select2/selection/allowClear.js b/static/vendor/select2/src/js/select2/selection/allowClear.js deleted file mode 100644 index 0de5b9bb..00000000 --- a/static/vendor/select2/src/js/select2/selection/allowClear.js +++ /dev/null @@ -1,113 +0,0 @@ -define([ - 'jquery', - '../keys', - '../utils' -], function ($, KEYS, Utils) { - function AllowClear () { } - - AllowClear.prototype.bind = function (decorated, container, $container) { - var self = this; - - decorated.call(this, container, $container); - - if (this.placeholder == null) { - if (this.options.get('debug') && window.console && console.error) { - console.error( - 'Select2: The `allowClear` option should be used in combination ' + - 'with the `placeholder` option.' - ); - } - } - - this.$selection.on('mousedown', '.select2-selection__clear', - function (evt) { - self._handleClear(evt); - }); - - container.on('keypress', function (evt) { - self._handleKeyboardClear(evt, container); - }); - }; - - AllowClear.prototype._handleClear = function (_, evt) { - // Ignore the event if it is disabled - if (this.options.get('disabled')) { - return; - } - - var $clear = this.$selection.find('.select2-selection__clear'); - - // Ignore the event if nothing has been selected - if ($clear.length === 0) { - return; - } - - evt.stopPropagation(); - - var data = Utils.GetData($clear[0], 'data'); - - var previousVal = this.$element.val(); - this.$element.val(this.placeholder.id); - - var unselectData = { - data: data - }; - this.trigger('clear', unselectData); - if (unselectData.prevented) { - this.$element.val(previousVal); - return; - } - - for (var d = 0; d < data.length; d++) { - unselectData = { - data: data[d] - }; - - // Trigger the `unselect` event, so people can prevent it from being - // cleared. - this.trigger('unselect', unselectData); - - // If the event was prevented, don't clear it out. - if (unselectData.prevented) { - this.$element.val(previousVal); - return; - } - } - - this.$element.trigger('change'); - - this.trigger('toggle', {}); - }; - - AllowClear.prototype._handleKeyboardClear = function (_, evt, container) { - if (container.isOpen()) { - return; - } - - if (evt.which == KEYS.DELETE || evt.which == KEYS.BACKSPACE) { - this._handleClear(evt); - } - }; - - AllowClear.prototype.update = function (decorated, data) { - decorated.call(this, data); - - if (this.$selection.find('.select2-selection__placeholder').length > 0 || - data.length === 0) { - return; - } - - var removeAll = this.options.get('translations').get('removeAllItems'); - - var $remove = $( - '' + - '×' + - '' - ); - Utils.StoreData($remove[0], 'data', data); - - this.$selection.find('.select2-selection__rendered').prepend($remove); - }; - - return AllowClear; -}); diff --git a/static/vendor/select2/src/js/select2/selection/base.js b/static/vendor/select2/src/js/select2/selection/base.js deleted file mode 100644 index 6d373bd7..00000000 --- a/static/vendor/select2/src/js/select2/selection/base.js +++ /dev/null @@ -1,160 +0,0 @@ -define([ - 'jquery', - '../utils', - '../keys' -], function ($, Utils, KEYS) { - function BaseSelection ($element, options) { - this.$element = $element; - this.options = options; - - BaseSelection.__super__.constructor.call(this); - } - - Utils.Extend(BaseSelection, Utils.Observable); - - BaseSelection.prototype.render = function () { - var $selection = $( - '' - ); - - this._tabindex = 0; - - if (Utils.GetData(this.$element[0], 'old-tabindex') != null) { - this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex'); - } else if (this.$element.attr('tabindex') != null) { - this._tabindex = this.$element.attr('tabindex'); - } - - $selection.attr('title', this.$element.attr('title')); - $selection.attr('tabindex', this._tabindex); - - this.$selection = $selection; - - return $selection; - }; - - BaseSelection.prototype.bind = function (container, $container) { - var self = this; - - var id = container.id + '-container'; - var resultsId = container.id + '-results'; - - this.container = container; - - this.$selection.on('focus', function (evt) { - self.trigger('focus', evt); - }); - - this.$selection.on('blur', function (evt) { - self._handleBlur(evt); - }); - - this.$selection.on('keydown', function (evt) { - self.trigger('keypress', evt); - - if (evt.which === KEYS.SPACE) { - evt.preventDefault(); - } - }); - - container.on('results:focus', function (params) { - self.$selection.attr('aria-activedescendant', params.data._resultId); - }); - - container.on('selection:update', function (params) { - self.update(params.data); - }); - - container.on('open', function () { - // When the dropdown is open, aria-expanded="true" - self.$selection.attr('aria-expanded', 'true'); - self.$selection.attr('aria-owns', resultsId); - - self._attachCloseHandler(container); - }); - - container.on('close', function () { - // When the dropdown is closed, aria-expanded="false" - self.$selection.attr('aria-expanded', 'false'); - self.$selection.removeAttr('aria-activedescendant'); - self.$selection.removeAttr('aria-owns'); - - window.setTimeout(function () { - self.$selection.focus(); - }, 0); - - self._detachCloseHandler(container); - }); - - container.on('enable', function () { - self.$selection.attr('tabindex', self._tabindex); - }); - - container.on('disable', function () { - self.$selection.attr('tabindex', '-1'); - }); - }; - - BaseSelection.prototype._handleBlur = function (evt) { - var self = this; - - // This needs to be delayed as the active element is the body when the tab - // key is pressed, possibly along with others. - window.setTimeout(function () { - // Don't trigger `blur` if the focus is still in the selection - if ( - (document.activeElement == self.$selection[0]) || - ($.contains(self.$selection[0], document.activeElement)) - ) { - return; - } - - self.trigger('blur', evt); - }, 1); - }; - - BaseSelection.prototype._attachCloseHandler = function (container) { - var self = this; - - $(document.body).on('mousedown.select2.' + container.id, function (e) { - var $target = $(e.target); - - var $select = $target.closest('.select2'); - - var $all = $('.select2.select2-container--open'); - - $all.each(function () { - var $this = $(this); - - if (this == $select[0]) { - return; - } - - var $element = Utils.GetData(this, 'element'); - - $element.select2('close'); - }); - }); - }; - - BaseSelection.prototype._detachCloseHandler = function (container) { - $(document.body).off('mousedown.select2.' + container.id); - }; - - BaseSelection.prototype.position = function ($selection, $container) { - var $selectionContainer = $container.find('.selection'); - $selectionContainer.append($selection); - }; - - BaseSelection.prototype.destroy = function () { - this._detachCloseHandler(this.container); - }; - - BaseSelection.prototype.update = function (data) { - throw new Error('The `update` method must be defined in child classes.'); - }; - - return BaseSelection; -}); diff --git a/static/vendor/select2/src/js/select2/selection/clickMask.js b/static/vendor/select2/src/js/select2/selection/clickMask.js deleted file mode 100644 index 2b4ac307..00000000 --- a/static/vendor/select2/src/js/select2/selection/clickMask.js +++ /dev/null @@ -1,29 +0,0 @@ -define([ - 'jquery' -], function ($) { - function ClickMask () { } - - ClickMask.prototype.bind = function (decorate, $container, container) { - var self = this; - - decorate.call(this, $container, container); - - this.$mask = $( - '
        ' - ); - - this.$mask.on('mousedown touchstart click', function () { - self.trigger('close', {}); - }); - }; - - ClickMask.prototype._attachCloseHandler = function (decorate, container) { - $(document.body).append(this.$mask); - }; - - ClickMask.prototype._detachCloseHandler = function (deocrate, container) { - this.$mask.detach(); - }; - - return ClickMask; -}); diff --git a/static/vendor/select2/src/js/select2/selection/eventRelay.js b/static/vendor/select2/src/js/select2/selection/eventRelay.js deleted file mode 100644 index 0f59822b..00000000 --- a/static/vendor/select2/src/js/select2/selection/eventRelay.js +++ /dev/null @@ -1,48 +0,0 @@ -define([ - 'jquery' -], function ($) { - function EventRelay () { } - - EventRelay.prototype.bind = function (decorated, container, $container) { - var self = this; - var relayEvents = [ - 'open', 'opening', - 'close', 'closing', - 'select', 'selecting', - 'unselect', 'unselecting', - 'clear', 'clearing' - ]; - - var preventableEvents = [ - 'opening', 'closing', 'selecting', 'unselecting', 'clearing' - ]; - - decorated.call(this, container, $container); - - container.on('*', function (name, params) { - // Ignore events that should not be relayed - if ($.inArray(name, relayEvents) === -1) { - return; - } - - // The parameters should always be an object - params = params || {}; - - // Generate the jQuery event for the Select2 event - var evt = $.Event('select2:' + name, { - params: params - }); - - self.$element.trigger(evt); - - // Only handle preventable events if it was one - if ($.inArray(name, preventableEvents) === -1) { - return; - } - - params.prevented = evt.isDefaultPrevented(); - }); - }; - - return EventRelay; -}); diff --git a/static/vendor/select2/src/js/select2/selection/multiple.js b/static/vendor/select2/src/js/select2/selection/multiple.js deleted file mode 100644 index 6f106788..00000000 --- a/static/vendor/select2/src/js/select2/selection/multiple.js +++ /dev/null @@ -1,111 +0,0 @@ -define([ - 'jquery', - './base', - '../utils' -], function ($, BaseSelection, Utils) { - function MultipleSelection ($element, options) { - MultipleSelection.__super__.constructor.apply(this, arguments); - } - - Utils.Extend(MultipleSelection, BaseSelection); - - MultipleSelection.prototype.render = function () { - var $selection = MultipleSelection.__super__.render.call(this); - - $selection.addClass('select2-selection--multiple'); - - $selection.html( - '
          ' - ); - - return $selection; - }; - - MultipleSelection.prototype.bind = function (container, $container) { - var self = this; - - MultipleSelection.__super__.bind.apply(this, arguments); - - this.$selection.on('click', function (evt) { - self.trigger('toggle', { - originalEvent: evt - }); - }); - - this.$selection.on( - 'click', - '.select2-selection__choice__remove', - function (evt) { - // Ignore the event if it is disabled - if (self.options.get('disabled')) { - return; - } - - var $remove = $(this); - var $selection = $remove.parent(); - - var data = Utils.GetData($selection[0], 'data'); - - self.trigger('unselect', { - originalEvent: evt, - data: data - }); - } - ); - }; - - MultipleSelection.prototype.clear = function () { - var $rendered = this.$selection.find('.select2-selection__rendered'); - $rendered.empty(); - $rendered.removeAttr('title'); - }; - - MultipleSelection.prototype.display = function (data, container) { - var template = this.options.get('templateSelection'); - var escapeMarkup = this.options.get('escapeMarkup'); - - return escapeMarkup(template(data, container)); - }; - - MultipleSelection.prototype.selectionContainer = function () { - var $container = $( - '
        • ' + - '' + - '×' + - '' + - '
          • ' - ); - - return $container; - }; - - MultipleSelection.prototype.update = function (data) { - this.clear(); - - if (data.length === 0) { - return; - } - - var $selections = []; - - for (var d = 0; d < data.length; d++) { - var selection = data[d]; - - var $selection = this.selectionContainer(); - var formatted = this.display(selection, $selection); - - $selection.append(formatted); - $selection.attr('title', selection.title || selection.text); - - Utils.StoreData($selection[0], 'data', selection); - - $selections.push($selection); - } - - var $rendered = this.$selection.find('.select2-selection__rendered'); - - Utils.appendMany($rendered, $selections); - }; - - return MultipleSelection; -}); diff --git a/static/vendor/select2/src/js/select2/selection/placeholder.js b/static/vendor/select2/src/js/select2/selection/placeholder.js deleted file mode 100644 index 87fbedac..00000000 --- a/static/vendor/select2/src/js/select2/selection/placeholder.js +++ /dev/null @@ -1,49 +0,0 @@ -define([ - '../utils' -], function (Utils) { - function Placeholder (decorated, $element, options) { - this.placeholder = this.normalizePlaceholder(options.get('placeholder')); - - decorated.call(this, $element, options); - } - - Placeholder.prototype.normalizePlaceholder = function (_, placeholder) { - if (typeof placeholder === 'string') { - placeholder = { - id: '', - text: placeholder - }; - } - - return placeholder; - }; - - Placeholder.prototype.createPlaceholder = function (decorated, placeholder) { - var $placeholder = this.selectionContainer(); - - $placeholder.html(this.display(placeholder)); - $placeholder.addClass('select2-selection__placeholder') - .removeClass('select2-selection__choice'); - - return $placeholder; - }; - - Placeholder.prototype.update = function (decorated, data) { - var singlePlaceholder = ( - data.length == 1 && data[0].id != this.placeholder.id - ); - var multipleSelections = data.length > 1; - - if (multipleSelections || singlePlaceholder) { - return decorated.call(this, data); - } - - this.clear(); - - var $placeholder = this.createPlaceholder(this.placeholder); - - this.$selection.find('.select2-selection__rendered').append($placeholder); - }; - - return Placeholder; -}); diff --git a/static/vendor/select2/src/js/select2/selection/search.js b/static/vendor/select2/src/js/select2/selection/search.js deleted file mode 100644 index 3ff96f94..00000000 --- a/static/vendor/select2/src/js/select2/selection/search.js +++ /dev/null @@ -1,228 +0,0 @@ -define([ - 'jquery', - '../utils', - '../keys' -], function ($, Utils, KEYS) { - function Search (decorated, $element, options) { - decorated.call(this, $element, options); - } - - Search.prototype.render = function (decorated) { - var $search = $( - '
        • ' + - '' + - '
          • ' - ); - - this.$searchContainer = $search; - this.$search = $search.find('input'); - - var $rendered = decorated.call(this); - - this._transferTabIndex(); - - return $rendered; - }; - - Search.prototype.bind = function (decorated, container, $container) { - var self = this; - - decorated.call(this, container, $container); - - container.on('open', function () { - self.$search.trigger('focus'); - }); - - container.on('close', function () { - self.$search.val(''); - self.$search.removeAttr('aria-activedescendant'); - self.$search.trigger('focus'); - }); - - container.on('enable', function () { - self.$search.prop('disabled', false); - - self._transferTabIndex(); - }); - - container.on('disable', function () { - self.$search.prop('disabled', true); - }); - - container.on('focus', function (evt) { - self.$search.trigger('focus'); - }); - - container.on('results:focus', function (params) { - self.$search.attr('aria-activedescendant', params.id); - }); - - this.$selection.on('focusin', '.select2-search--inline', function (evt) { - self.trigger('focus', evt); - }); - - this.$selection.on('focusout', '.select2-search--inline', function (evt) { - self._handleBlur(evt); - }); - - this.$selection.on('keydown', '.select2-search--inline', function (evt) { - evt.stopPropagation(); - - self.trigger('keypress', evt); - - self._keyUpPrevented = evt.isDefaultPrevented(); - - var key = evt.which; - - if (key === KEYS.BACKSPACE && self.$search.val() === '') { - var $previousChoice = self.$searchContainer - .prev('.select2-selection__choice'); - - if ($previousChoice.length > 0) { - var item = Utils.GetData($previousChoice[0], 'data'); - - self.searchRemoveChoice(item); - - evt.preventDefault(); - } - } - }); - - // Try to detect the IE version should the `documentMode` property that - // is stored on the document. This is only implemented in IE and is - // slightly cleaner than doing a user agent check. - // This property is not available in Edge, but Edge also doesn't have - // this bug. - var msie = document.documentMode; - var disableInputEvents = msie && msie <= 11; - - // Workaround for browsers which do not support the `input` event - // This will prevent double-triggering of events for browsers which support - // both the `keyup` and `input` events. - this.$selection.on( - 'input.searchcheck', - '.select2-search--inline', - function (evt) { - // IE will trigger the `input` event when a placeholder is used on a - // search box. To get around this issue, we are forced to ignore all - // `input` events in IE and keep using `keyup`. - if (disableInputEvents) { - self.$selection.off('input.search input.searchcheck'); - return; - } - - // Unbind the duplicated `keyup` event - self.$selection.off('keyup.search'); - } - ); - - this.$selection.on( - 'keyup.search input.search', - '.select2-search--inline', - function (evt) { - // IE will trigger the `input` event when a placeholder is used on a - // search box. To get around this issue, we are forced to ignore all - // `input` events in IE and keep using `keyup`. - if (disableInputEvents && evt.type === 'input') { - self.$selection.off('input.search input.searchcheck'); - return; - } - - var key = evt.which; - - // We can freely ignore events from modifier keys - if (key == KEYS.SHIFT || key == KEYS.CTRL || key == KEYS.ALT) { - return; - } - - // Tabbing will be handled during the `keydown` phase - if (key == KEYS.TAB) { - return; - } - - self.handleSearch(evt); - } - ); - }; - - /** - * This method will transfer the tabindex attribute from the rendered - * selection to the search box. This allows for the search box to be used as - * the primary focus instead of the selection container. - * - * @private - */ - Search.prototype._transferTabIndex = function (decorated) { - this.$search.attr('tabindex', this.$selection.attr('tabindex')); - this.$selection.attr('tabindex', '-1'); - }; - - Search.prototype.createPlaceholder = function (decorated, placeholder) { - this.$search.attr('placeholder', placeholder.text); - }; - - Search.prototype.update = function (decorated, data) { - var searchHadFocus = this.$search[0] == document.activeElement; - - this.$search.attr('placeholder', ''); - - decorated.call(this, data); - - this.$selection.find('.select2-selection__rendered') - .append(this.$searchContainer); - - this.resizeSearch(); - if (searchHadFocus) { - var isTagInput = this.$element.find('[data-select2-tag]').length; - if (isTagInput) { - // fix IE11 bug where tag input lost focus - this.$element.focus(); - } else { - this.$search.focus(); - } - } - }; - - Search.prototype.handleSearch = function () { - this.resizeSearch(); - - if (!this._keyUpPrevented) { - var input = this.$search.val(); - - this.trigger('query', { - term: input - }); - } - - this._keyUpPrevented = false; - }; - - Search.prototype.searchRemoveChoice = function (decorated, item) { - this.trigger('unselect', { - data: item - }); - - this.$search.val(item.text); - this.handleSearch(); - }; - - Search.prototype.resizeSearch = function () { - this.$search.css('width', '25px'); - - var width = ''; - - if (this.$search.attr('placeholder') !== '') { - width = this.$selection.find('.select2-selection__rendered').innerWidth(); - } else { - var minimumWidth = this.$search.val().length + 1; - - width = (minimumWidth * 0.75) + 'em'; - } - - this.$search.css('width', width); - }; - - return Search; -}); diff --git a/static/vendor/select2/src/js/select2/selection/single.js b/static/vendor/select2/src/js/select2/selection/single.js deleted file mode 100644 index e9e99aa4..00000000 --- a/static/vendor/select2/src/js/select2/selection/single.js +++ /dev/null @@ -1,100 +0,0 @@ -define([ - 'jquery', - './base', - '../utils', - '../keys' -], function ($, BaseSelection, Utils, KEYS) { - function SingleSelection () { - SingleSelection.__super__.constructor.apply(this, arguments); - } - - Utils.Extend(SingleSelection, BaseSelection); - - SingleSelection.prototype.render = function () { - var $selection = SingleSelection.__super__.render.call(this); - - $selection.addClass('select2-selection--single'); - - $selection.html( - '' + - '' + - '' + - '' - ); - - return $selection; - }; - - SingleSelection.prototype.bind = function (container, $container) { - var self = this; - - SingleSelection.__super__.bind.apply(this, arguments); - - var id = container.id + '-container'; - - this.$selection.find('.select2-selection__rendered') - .attr('id', id) - .attr('role', 'textbox') - .attr('aria-readonly', 'true'); - this.$selection.attr('aria-labelledby', id); - - this.$selection.on('mousedown', function (evt) { - // Only respond to left clicks - if (evt.which !== 1) { - return; - } - - self.trigger('toggle', { - originalEvent: evt - }); - }); - - this.$selection.on('focus', function (evt) { - // User focuses on the container - }); - - this.$selection.on('blur', function (evt) { - // User exits the container - }); - - container.on('focus', function (evt) { - if (!container.isOpen()) { - self.$selection.focus(); - } - }); - }; - - SingleSelection.prototype.clear = function () { - var $rendered = this.$selection.find('.select2-selection__rendered'); - $rendered.empty(); - $rendered.removeAttr('title'); // clear tooltip on empty - }; - - SingleSelection.prototype.display = function (data, container) { - var template = this.options.get('templateSelection'); - var escapeMarkup = this.options.get('escapeMarkup'); - - return escapeMarkup(template(data, container)); - }; - - SingleSelection.prototype.selectionContainer = function () { - return $(''); - }; - - SingleSelection.prototype.update = function (data) { - if (data.length === 0) { - this.clear(); - return; - } - - var selection = data[0]; - - var $rendered = this.$selection.find('.select2-selection__rendered'); - var formatted = this.display(selection, $rendered); - - $rendered.empty().append(formatted); - $rendered.attr('title', selection.title || selection.text); - }; - - return SingleSelection; -}); diff --git a/static/vendor/select2/src/js/select2/selection/stopPropagation.js b/static/vendor/select2/src/js/select2/selection/stopPropagation.js deleted file mode 100644 index 382f1e72..00000000 --- a/static/vendor/select2/src/js/select2/selection/stopPropagation.js +++ /dev/null @@ -1,38 +0,0 @@ -define([ - -], function () { - function StopPropagation () { } - - StopPropagation.prototype.bind = function (decorated, container, $container) { - decorated.call(this, container, $container); - - var stoppedEvents = [ - 'blur', - 'change', - 'click', - 'dblclick', - 'focus', - 'focusin', - 'focusout', - 'input', - 'keydown', - 'keyup', - 'keypress', - 'mousedown', - 'mouseenter', - 'mouseleave', - 'mousemove', - 'mouseover', - 'mouseup', - 'search', - 'touchend', - 'touchstart' - ]; - - this.$selection.on(stoppedEvents.join(' '), function (evt) { - evt.stopPropagation(); - }); - }; - - return StopPropagation; -}); diff --git a/static/vendor/select2/src/js/select2/translation.js b/static/vendor/select2/src/js/select2/translation.js deleted file mode 100644 index 5394c18b..00000000 --- a/static/vendor/select2/src/js/select2/translation.js +++ /dev/null @@ -1,36 +0,0 @@ -define([ - 'jquery', - 'require' -], function ($, require) { - function Translation (dict) { - this.dict = dict || {}; - } - - Translation.prototype.all = function () { - return this.dict; - }; - - Translation.prototype.get = function (key) { - return this.dict[key]; - }; - - Translation.prototype.extend = function (translation) { - this.dict = $.extend({}, translation.all(), this.dict); - }; - - // Static functions - - Translation._cache = {}; - - Translation.loadPath = function (path) { - if (!(path in Translation._cache)) { - var translations = require(path); - - Translation._cache[path] = translations; - } - - return new Translation(Translation._cache[path]); - }; - - return Translation; -}); diff --git a/static/vendor/select2/src/js/select2/utils.js b/static/vendor/select2/src/js/select2/utils.js deleted file mode 100644 index 53d82f3d..00000000 --- a/static/vendor/select2/src/js/select2/utils.js +++ /dev/null @@ -1,338 +0,0 @@ -define([ - 'jquery' -], function ($) { - var Utils = {}; - - Utils.Extend = function (ChildClass, SuperClass) { - var __hasProp = {}.hasOwnProperty; - - function BaseConstructor () { - this.constructor = ChildClass; - } - - for (var key in SuperClass) { - if (__hasProp.call(SuperClass, key)) { - ChildClass[key] = SuperClass[key]; - } - } - - BaseConstructor.prototype = SuperClass.prototype; - ChildClass.prototype = new BaseConstructor(); - ChildClass.__super__ = SuperClass.prototype; - - return ChildClass; - }; - - function getMethods (theClass) { - var proto = theClass.prototype; - - var methods = []; - - for (var methodName in proto) { - var m = proto[methodName]; - - if (typeof m !== 'function') { - continue; - } - - if (methodName === 'constructor') { - continue; - } - - methods.push(methodName); - } - - return methods; - } - - Utils.Decorate = function (SuperClass, DecoratorClass) { - var decoratedMethods = getMethods(DecoratorClass); - var superMethods = getMethods(SuperClass); - - function DecoratedClass () { - var unshift = Array.prototype.unshift; - - var argCount = DecoratorClass.prototype.constructor.length; - - var calledConstructor = SuperClass.prototype.constructor; - - if (argCount > 0) { - unshift.call(arguments, SuperClass.prototype.constructor); - - calledConstructor = DecoratorClass.prototype.constructor; - } - - calledConstructor.apply(this, arguments); - } - - DecoratorClass.displayName = SuperClass.displayName; - - function ctr () { - this.constructor = DecoratedClass; - } - - DecoratedClass.prototype = new ctr(); - - for (var m = 0; m < superMethods.length; m++) { - var superMethod = superMethods[m]; - - DecoratedClass.prototype[superMethod] = - SuperClass.prototype[superMethod]; - } - - var calledMethod = function (methodName) { - // Stub out the original method if it's not decorating an actual method - var originalMethod = function () {}; - - if (methodName in DecoratedClass.prototype) { - originalMethod = DecoratedClass.prototype[methodName]; - } - - var decoratedMethod = DecoratorClass.prototype[methodName]; - - return function () { - var unshift = Array.prototype.unshift; - - unshift.call(arguments, originalMethod); - - return decoratedMethod.apply(this, arguments); - }; - }; - - for (var d = 0; d < decoratedMethods.length; d++) { - var decoratedMethod = decoratedMethods[d]; - - DecoratedClass.prototype[decoratedMethod] = calledMethod(decoratedMethod); - } - - return DecoratedClass; - }; - - var Observable = function () { - this.listeners = {}; - }; - - Observable.prototype.on = function (event, callback) { - this.listeners = this.listeners || {}; - - if (event in this.listeners) { - this.listeners[event].push(callback); - } else { - this.listeners[event] = [callback]; - } - }; - - Observable.prototype.trigger = function (event) { - var slice = Array.prototype.slice; - var params = slice.call(arguments, 1); - - this.listeners = this.listeners || {}; - - // Params should always come in as an array - if (params == null) { - params = []; - } - - // If there are no arguments to the event, use a temporary object - if (params.length === 0) { - params.push({}); - } - - // Set the `_type` of the first object to the event - params[0]._type = event; - - if (event in this.listeners) { - this.invoke(this.listeners[event], slice.call(arguments, 1)); - } - - if ('*' in this.listeners) { - this.invoke(this.listeners['*'], arguments); - } - }; - - Observable.prototype.invoke = function (listeners, params) { - for (var i = 0, len = listeners.length; i < len; i++) { - listeners[i].apply(this, params); - } - }; - - Utils.Observable = Observable; - - Utils.generateChars = function (length) { - var chars = ''; - - for (var i = 0; i < length; i++) { - var randomChar = Math.floor(Math.random() * 36); - chars += randomChar.toString(36); - } - - return chars; - }; - - Utils.bind = function (func, context) { - return function () { - func.apply(context, arguments); - }; - }; - - Utils._convertData = function (data) { - for (var originalKey in data) { - var keys = originalKey.split('-'); - - var dataLevel = data; - - if (keys.length === 1) { - continue; - } - - for (var k = 0; k < keys.length; k++) { - var key = keys[k]; - - // Lowercase the first letter - // By default, dash-separated becomes camelCase - key = key.substring(0, 1).toLowerCase() + key.substring(1); - - if (!(key in dataLevel)) { - dataLevel[key] = {}; - } - - if (k == keys.length - 1) { - dataLevel[key] = data[originalKey]; - } - - dataLevel = dataLevel[key]; - } - - delete data[originalKey]; - } - - return data; - }; - - Utils.hasScroll = function (index, el) { - // Adapted from the function created by @ShadowScripter - // and adapted by @BillBarry on the Stack Exchange Code Review website. - // The original code can be found at - // http://codereview.stackexchange.com/q/13338 - // and was designed to be used with the Sizzle selector engine. - - var $el = $(el); - var overflowX = el.style.overflowX; - var overflowY = el.style.overflowY; - - //Check both x and y declarations - if (overflowX === overflowY && - (overflowY === 'hidden' || overflowY === 'visible')) { - return false; - } - - if (overflowX === 'scroll' || overflowY === 'scroll') { - return true; - } - - return ($el.innerHeight() < el.scrollHeight || - $el.innerWidth() < el.scrollWidth); - }; - - Utils.escapeMarkup = function (markup) { - var replaceMap = { - '\\': '\', - '&': '&', - '<': '<', - '>': '>', - '"': '"', - '\'': ''', - '/': '/' - }; - - // Do not try to escape the markup if it's not a string - if (typeof markup !== 'string') { - return markup; - } - - return String(markup).replace(/[&<>"'\/\\]/g, function (match) { - return replaceMap[match]; - }); - }; - - // Append an array of jQuery nodes to a given element. - Utils.appendMany = function ($element, $nodes) { - // jQuery 1.7.x does not support $.fn.append() with an array - // Fall back to a jQuery object collection using $.fn.add() - if ($.fn.jquery.substr(0, 3) === '1.7') { - var $jqNodes = $(); - - $.map($nodes, function (node) { - $jqNodes = $jqNodes.add(node); - }); - - $nodes = $jqNodes; - } - - $element.append($nodes); - }; - - // Cache objects in Utils.__cache instead of $.data (see #4346) - Utils.__cache = {}; - - var id = 0; - Utils.GetUniqueElementId = function (element) { - // Get a unique element Id. If element has no id, - // creates a new unique number, stores it in the id - // attribute and returns the new id. - // If an id already exists, it simply returns it. - - var select2Id = element.getAttribute('data-select2-id'); - if (select2Id == null) { - // If element has id, use it. - if (element.id) { - select2Id = element.id; - element.setAttribute('data-select2-id', select2Id); - } else { - element.setAttribute('data-select2-id', ++id); - select2Id = id.toString(); - } - } - return select2Id; - }; - - Utils.StoreData = function (element, name, value) { - // Stores an item in the cache for a specified element. - // name is the cache key. - var id = Utils.GetUniqueElementId(element); - if (!Utils.__cache[id]) { - Utils.__cache[id] = {}; - } - - Utils.__cache[id][name] = value; - }; - - Utils.GetData = function (element, name) { - // Retrieves a value from the cache by its key (name) - // name is optional. If no name specified, return - // all cache items for the specified element. - // and for a specified element. - var id = Utils.GetUniqueElementId(element); - if (name) { - if (Utils.__cache[id]) { - if (Utils.__cache[id][name] != null) { - return Utils.__cache[id][name]; - } - return $(element).data(name); // Fallback to HTML5 data attribs. - } - return $(element).data(name); // Fallback to HTML5 data attribs. - } else { - return Utils.__cache[id]; - } - }; - - Utils.RemoveData = function (element) { - // Removes all cached items for a specified element. - var id = Utils.GetUniqueElementId(element); - if (Utils.__cache[id] != null) { - delete Utils.__cache[id]; - } - }; - - return Utils; -}); diff --git a/static/vendor/select2/src/js/wrapper.end.js b/static/vendor/select2/src/js/wrapper.end.js deleted file mode 100644 index 43678296..00000000 --- a/static/vendor/select2/src/js/wrapper.end.js +++ /dev/null @@ -1,12 +0,0 @@ - // Autoload the jQuery bindings - // We know that all of the modules exist above this, so we're safe - var select2 = S2.require('jquery.select2'); - - // Hold the AMD module references on the jQuery function that was just loaded - // This allows Select2 to use the internal loader outside of this file, such - // as in the language files. - jQuery.fn.select2.amd = S2; - - // Return the Select2 instance for anyone who is importing it. - return select2; -})); diff --git a/static/vendor/select2/src/js/wrapper.start.js b/static/vendor/select2/src/js/wrapper.start.js deleted file mode 100644 index 1dfa51ea..00000000 --- a/static/vendor/select2/src/js/wrapper.start.js +++ /dev/null @@ -1,38 +0,0 @@ -/*! - * Select2 <%= package.version %> - * https://select2.github.io - * - * Released under the MIT license - * https://github.com/select2/select2/blob/master/LICENSE.md - */ -;(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['jquery'], factory); - } else if (typeof module === 'object' && module.exports) { - // Node/CommonJS - module.exports = function (root, jQuery) { - if (jQuery === undefined) { - // require('jQuery') returns a factory that requires window to - // build a jQuery instance, we normalize how we use modules - // that require this pattern but the window provided is a noop - // if it's defined (how jquery works) - if (typeof window !== 'undefined') { - jQuery = require('jquery'); - } - else { - jQuery = require('jquery')(root); - } - } - factory(jQuery); - return jQuery; - }; - } else { - // Browser globals - factory(jQuery); - } -} (function (jQuery) { - // This is needed so we can catch the AMD loader configuration and use it - // The inner file should be wrapped (by `banner.start.js`) in a function that - // returns the AMD loader references. - var S2 = \ No newline at end of file diff --git a/static/vendor/select2/tests/a11y/search-tests.js b/static/vendor/select2/tests/a11y/search-tests.js deleted file mode 100644 index 58e56492..00000000 --- a/static/vendor/select2/tests/a11y/search-tests.js +++ /dev/null @@ -1,51 +0,0 @@ -module('Accessibility - Search'); - -var MultipleSelection = require('select2/selection/multiple'); -var InlineSearch = require('select2/selection/search'); - -var $ = require('jquery'); - -var Utils = require('select2/utils'); -var Options = require('select2/options'); -var options = new Options({}); - -test('aria-autocomplete attribute is present', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - var selection = new CustomSelection($select, options); - var $selection = selection.render(); - - // Update the selection so the search is rendered - selection.update([]); - - assert.equal( - $selection.find('input').attr('aria-autocomplete'), - 'list', - 'The search box is marked as autocomplete' - ); -}); - -test('aria-activedescendant should be removed when closed', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - var selection = new CustomSelection($select, options); - var $selection = selection.render(); - - var container = new MockContainer(); - selection.bind(container, $('')); - - // Update the selection so the search is rendered - selection.update([]); - - var $search = $selection.find('input'); - $search.attr('aria-activedescendant', 'something'); - - container.trigger('close'); - - assert.ok( - !$search.attr('aria-activedescendant'), - 'There is no active descendant when the dropdown is closed' - ); -}); diff --git a/static/vendor/select2/tests/a11y/selection-tests.js b/static/vendor/select2/tests/a11y/selection-tests.js deleted file mode 100644 index e2c14602..00000000 --- a/static/vendor/select2/tests/a11y/selection-tests.js +++ /dev/null @@ -1,154 +0,0 @@ -module('Accessibility - All'); - -var BaseSelection = require('select2/selection/base'); -var SingleSelection = require('select2/selection/single'); -var MultipleSelection = require('select2/selection/multiple'); - -var $ = require('jquery'); - -var Options = require('select2/options'); -var options = new Options({}); - -test('title is carried over from original element', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selection = new BaseSelection($select, options); - var $selection = selection.render(); - - assert.equal( - $selection.attr('title'), - $select.attr('title'), - 'The title should have been copied over from the original element' - ); -}); - -test('aria-expanded reflects the state of the container', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selection = new BaseSelection($select, options); - var $selection = selection.render(); - - var container = new MockContainer(); - - selection.bind(container, $('')); - - assert.equal( - $selection.attr('aria-expanded'), - 'false', - 'The container should not be expanded when it is closed' - ); - - container.trigger('open'); - - assert.equal( - $selection.attr('aria-expanded'), - 'true', - 'The container should be expanded when it is opened' - ); -}); - -test('static aria attributes are present', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selection = new BaseSelection($select, options); - var $selection = selection.render(); - - assert.equal( - $selection.attr('role'), - 'combobox', - 'The container should identify as a combobox' - ); - - assert.equal( - $selection.attr('aria-haspopup'), - 'true', - 'The dropdown is considered a popup of the container' - ); -}); - -test('the container should be in the tab order', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selection = new BaseSelection($select, options); - var $selection = selection.render(); - - var container = new MockContainer(); - selection.bind(container, $('')); - - assert.equal( - $selection.attr('tabindex'), - '0', - 'The tab index should allow it to fit in the natural tab order' - ); - - container.trigger('disable'); - - assert.equal( - $selection.attr('tabindex'), - '-1', - 'The selection should be dropped out of the tab order when disabled' - ); - - container.trigger('enable'); - - assert.equal( - $selection.attr('tabindex'), - '0', - 'The tab index should be restored when re-enabled' - ); -}); - -test('a custom tabindex is copied', function (assert) { - var $select = $('#qunit-fixture .single'); - $select.attr('tabindex', '999'); - - var selection = new BaseSelection($select, options); - var $selection = selection.render(); - - var container = new MockContainer(); - selection.bind(container, $('')); - - assert.equal( - $selection.attr('tabindex'), - '999', - 'The tab index should match the original tab index' - ); - - container.trigger('disable'); - - assert.equal( - $selection.attr('tabindex'), - '-1', - 'The selection should be dropped out of the tab order when disabled' - ); - - container.trigger('enable'); - - assert.equal( - $selection.attr('tabindex'), - '999', - 'The tab index should be restored when re-enabled' - ); -}); - -module('Accessibility - Single'); - -test('aria-labelledby should match the rendered container', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selection = new SingleSelection($select, options); - var $selection = selection.render(); - - var container = new MockContainer(); - selection.bind(container, $('')); - - var $rendered = $selection.find('.select2-selection__rendered'); - - assert.equal( - $selection.attr('aria-labelledby'), - $rendered.attr('id'), - 'The rendered selection should label the container' - ); -}); - -module('Accessibility - Multiple'); diff --git a/static/vendor/select2/tests/data/array-tests.js b/static/vendor/select2/tests/data/array-tests.js deleted file mode 100644 index d0dead68..00000000 --- a/static/vendor/select2/tests/data/array-tests.js +++ /dev/null @@ -1,332 +0,0 @@ -module('Data adapters - Array'); - -var ArrayData = require('select2/data/array'); -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var UserDefinedType = function (id, text) { - var self = this; - - self.id = id; - self.text = text; - - return self; -}; - -var arrayOptions = new Options({ - data: [ - { - id: 'default', - text: 'Default' - }, - { - id: '1', - text: 'One' - }, - { - id: '2', - text: '2' - }, - new UserDefinedType(1, 'aaaaaa') - ] -}); - -var extraOptions = new Options ({ - data: [ - { - id: 'default', - text: 'Default', - extra: true - }, - { - id: 'One', - text: 'One', - extra: true - } - ] -}); - -var nestedOptions = new Options({ - data: [ - { - text: 'Default', - children: [ - { - text: 'Next', - children: [ - { - id: 'a', - text: 'Option' - } - ] - } - ] - } - ] -}); - -test('current gets default for single', function (assert) { - var $select = $('#qunit-fixture .single-empty'); - - var data = new ArrayData($select, arrayOptions); - - data.current(function (val) { - assert.equal( - val.length, - 1, - 'There should always be a selected item for array data.' - ); - - var item = val[0]; - - assert.equal( - item.id, - 'default', - 'The first item should be selected' - ); - }); -}); - -test('current gets default for multiple', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new ArrayData($select, arrayOptions); - - data.current(function (val) { - assert.equal( - val.length, - 0, - 'There should be no default selection.' - ); - }); -}); - -test('current works with existing selections', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new ArrayData($select, arrayOptions); - - $select.val(['One']); - - data.current(function (val) { - assert.equal( - val.length, - 1, - 'There should only be one existing selection.' - ); - - var option = val[0]; - - assert.equal( - option.id, - 'One', - 'The id should be equal to the value of the option tag.' - ); - - assert.equal( - option.text, - 'One', - 'The text should be equal to the text of the option tag.' - ); - }); -}); - -test('current works with selected data', function (assert) { - var $select = $('#qunit-fixture .single-empty'); - - var data = new ArrayData($select, arrayOptions); - - data.select({ - id: '2', - text: '2' - }); - - data.current(function (val) { - assert.equal( - val.length, - 1, - 'There should only be one option selected.' - ); - - var option = val[0]; - - assert.equal( - option.id, - '2', - 'The id should match the original id from the array.' - ); - - assert.equal( - option.text, - '2', - 'The text should match the original text from the array.' - ); - }); -}); - -test('select works for single', function (assert) { - var $select = $('#qunit-fixture .single-empty'); - - var data = new ArrayData($select, arrayOptions); - - assert.equal( - $select.val(), - 'default', - 'There should already be a selection' - ); - - data.select({ - id: '1', - text: 'One' - }); - - assert.equal( - $select.val(), - '1', - 'The selected value should be the same as the selected id' - ); -}); - -test('multiple sets the value', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new ArrayData($select, arrayOptions); - - assert.ok( - $select.val() == null || $select.val().length == 0, - 'nothing should be selected' - ); - - data.select({ - id: 'default', - text: 'Default' - }); - - assert.deepEqual($select.val(), ['default']); -}); - -test('multiple adds to the old value', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new ArrayData($select, arrayOptions); - - $select.val(['One']); - - assert.deepEqual($select.val(), ['One']); - - data.select({ - id: 'default', - text: 'Default' - }); - - assert.deepEqual($select.val(), ['One', 'default']); -}); - -test('option tags are automatically generated', function (assert) { - var $select = $('#qunit-fixture .single-empty'); - - var data = new ArrayData($select, arrayOptions); - - assert.equal( - $select.find('option').length, - 4, - 'An element should be created for the two with children' - ); -}); - -test('optgroup tags have the right properties', function (assert) { - var $select = $('#qunit-fixture .single-empty'); - - var data = new ArrayData($select, nestedOptions); - - var $group = $select.children('optgroup'); - - assert.equal( - $group.prop('label'), - 'Default', - 'An `` label should match the text property' - ); - - assert.equal( - $group.children().length, - 1, - 'The should have one child under it' - ); -}); - -test('existing selections are respected on initialization', function (assert) { - var $select = $( - '' - ); - - var options = new Options({ - data: [ - { - id: 'Second', - text: 'Second' - }, - { - id: 'Third', - text: 'Third' - } - ] - }); - - assert.equal($select.val(), 'Second'); - - var data = new ArrayData($select, options); - - assert.equal($select.val(), 'Second'); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/data/base-tests.js b/static/vendor/select2/tests/data/base-tests.js deleted file mode 100644 index b90158f3..00000000 --- a/static/vendor/select2/tests/data/base-tests.js +++ /dev/null @@ -1,29 +0,0 @@ -module('Data adapters - Base'); - -var BaseData = require('select2/data/base'); -var $ = require('jquery'); -var Options = require('select2/options'); - -var options = new Options({}); - -test('current is required', function (assert) { - var data = new BaseData($('#qunit-fixture select'), options); - - assert.throws( - function () { - data.current(function () {}); - }, - 'current has no default implementation' - ); -}); - -test('query is required', function (assert) { - var data = new BaseData($('#qunit-fixture select'), options); - - assert.throws( - function () { - data.query({}, function () {}); - }, - 'query has no default implementation' - ); -}); diff --git a/static/vendor/select2/tests/data/inputData-tests.js b/static/vendor/select2/tests/data/inputData-tests.js deleted file mode 100644 index f2124efb..00000000 --- a/static/vendor/select2/tests/data/inputData-tests.js +++ /dev/null @@ -1,158 +0,0 @@ -module('Data adapters - compatibility'); - -var $ = require('jquery'); - -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var ArrayData = require('select2/data/array'); -var InputData = require('select2/compat/inputData'); - -var InputAdapter = Utils.Decorate(ArrayData, InputData); - -test('test that options can be selected', function (assert) { - var options = new Options({ - data: [ - { - id: 'test', - text: 'Test' - } - ] - }); - var $element = $(''); - - var adapter = new InputAdapter($element, options); - - adapter.select({ - id: 'test' - }); - - assert.equal( - $element.val(), - 'test', - 'The id of the item should be the value' - ); -}); - -test('unselect the single selected option clears the value', function (assert) { - var options = new Options({ - data: [ - { - id: 'test', - text: 'Test', - selected: true - } - ] - }); - var $element = $(''); - - var adapter = new InputAdapter($element, options); - - adapter.unselect({ - id: 'test' - }); - - assert.equal( - $element.val(), - '', - 'The id should no longer be in the value' - ); -}); - -test('options can be unselected individually', function (assert) { - var options = new Options({ - data: [ - { - id: 'test', - text: 'Test' - }, - { - id: 'test2', - text: 'Test2' - }, - { - id: 'test3', - text: 'Test3' - } - ] - }); - var $element = $(''); - $element.val('test,test2,test3'); - - var adapter = new InputAdapter($element, options); - - adapter.unselect({ - id: 'test2' - }); - - assert.equal( - $element.val(), - 'test,test3', - 'The value should contain all the still selected options' - ); -}); - -test('default values can be set', function (assert) { - assert.expect(4); - - var options = new Options({ - data: [ - { - id: 'test', - text: 'Test' - } - ] - }); - var $element = $(''); - - var adapter = new InputAdapter($element, options); - - adapter.current(function (data) { - assert.equal( - data.length, - 1, - 'There should only be a single selected option' - ); - - var item = data[0]; - - assert.equal(item.id, 'test'); - assert.equal(item.text, 'Test'); - }); - - assert.equal( - $element.val(), - 'test', - 'The value should not have been altered' - ); -}); - -test('no default value', function (assert) { - assert.expect(2); - - var options = new Options({ - data: [ - { - id: 'test', - text: 'Test' - } - ] - }); - var $element = $(''); - - var adapter = new InputAdapter($element, options); - - adapter.current(function (data) { - assert.equal( - data.length, - 0, - 'There should be no selected options' - ); - }); - - assert.equal( - $element.val(), - '', - 'The value should not have been altered' - ); -}); diff --git a/static/vendor/select2/tests/data/maximumInputLength-tests.js b/static/vendor/select2/tests/data/maximumInputLength-tests.js deleted file mode 100644 index e8557139..00000000 --- a/static/vendor/select2/tests/data/maximumInputLength-tests.js +++ /dev/null @@ -1,138 +0,0 @@ -module('Data adapters - Maximum input length'); - -var MaximumInputLength = require('select2/data/maximumInputLength'); -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -function MaximumInputStub () { - this.called = false; -} - -MaximumInputStub.prototype.query = function (params, callback) { - this.called = true; -}; - -var MaximumInputData = Utils.Decorate(MaximumInputStub, MaximumInputLength); - -test('0 never displays the notice', function (assert) { - var zeroOptions = new Options({ - maximumInputLength: 0 - }); - - var data = new MaximumInputData(null, zeroOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumInputData(null, zeroOptions); - - data.query({ - term: 'test' - }); - - assert.ok(data.called); -}); - -test('< 0 never displays the notice', function (assert) { - var negativeOptions = new Options({ - maximumInputLength: -1 - }); - - var data = new MaximumInputData(null, negativeOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumInputData(null, negativeOptions); - - data.query({ - term: 'test' - }); - - assert.ok(data.called); -}); - -test('triggers when input is too long', function (assert) { - var options = new Options({ - maximumInputLength: 1 - }); - - var data = new MaximumInputData(null, options); - - data.trigger = function () { - assert.ok(true, 'The event should be triggered.'); - }; - - data.query({ - term: 'no' - }); - - assert.ok(!data.called, 'The adapter should not be called'); -}); - -test('does not trigger when equal', function (assert) { - var options = new Options({ - maximumInputLength: 10 - }); - - var data = new MaximumInputData(null, options); - - data.trigger = function () { - assert.ok(false, 'The event should not be triggered.'); - }; - - data.query({ - term: '1234567890' - }); - - assert.ok(data.called); -}); - -test('does not trigger when less', function (assert) { - var options = new Options({ - maximumInputLength: 10 - }); - - var data = new MaximumInputData(null, options); - - data.trigger = function () { - assert.ok(false, 'The event should not be triggered.'); - }; - - data.query({ - term: '123' - }); - - assert.ok(data.called); -}); - -test('works with null term', function (assert) { - var options = new Options({ - maximumInputLength: 1 - }); - - var data = new MaximumInputData(null, options); - - data.trigger = function () { - assert.ok(false, 'The event should not be triggered'); - }; - - data.query({}); - - assert.ok(data.called); -}); diff --git a/static/vendor/select2/tests/data/maximumSelectionLength-tests.js b/static/vendor/select2/tests/data/maximumSelectionLength-tests.js deleted file mode 100644 index 89943b38..00000000 --- a/static/vendor/select2/tests/data/maximumSelectionLength-tests.js +++ /dev/null @@ -1,202 +0,0 @@ -module('Data adapters - Maximum selection length'); - -var MaximumSelectionLength = require('select2/data/maximumSelectionLength'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -function MaximumSelectionStub () { - this.called = false; - this.currentData = []; -} - -MaximumSelectionStub.prototype.current = function (callback) { - callback(this.currentData); -}; - -MaximumSelectionStub.prototype.val = function (val) { - this.currentData.push(val); -}; - -MaximumSelectionStub.prototype.query = function (params, callback) { - this.called = true; -}; - -var MaximumSelectionData = Utils.Decorate( - MaximumSelectionStub, - MaximumSelectionLength -); - -test('0 never displays the notice', function (assert) { - var zeroOptions = new Options({ - maximumSelectionLength: 0 - }); - - var data = new MaximumSelectionData(null, zeroOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, zeroOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.val('1'); - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, zeroOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.val('1'); - data.val('2'); - - data.query({ - term: '' - }); - - assert.ok(data.called); -}); - -test('< 0 never displays the notice', function (assert) { - var negativeOptions = new Options({ - maximumSelectionLength: -1 - }); - - var data = new MaximumSelectionData(null, negativeOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, negativeOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.val('1'); - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, negativeOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.val('1'); - data.val('2'); - - data.query({ - term: '' - }); - - assert.ok(data.called); -}); - -test('triggers when >= 1 selection' , function (assert) { - var maxOfOneOptions = new Options({ - maximumSelectionLength: 1 - }); - var data = new MaximumSelectionData(null, maxOfOneOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, maxOfOneOptions); - - data.trigger = function () { - assert.ok(true, 'The event should be triggered.'); - }; - - data.val('1'); - - data.query({ - term: '' - }); - - assert.ok(!data.called); - -}); - -test('triggers when >= 2 selections' , function (assert) { - var maxOfTwoOptions = new Options({ - maximumSelectionLength: 2 - }); - var data = new MaximumSelectionData(null, maxOfTwoOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, maxOfTwoOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.val('1'); - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MaximumSelectionData(null, maxOfTwoOptions); - - data.trigger = function () { - assert.ok(true, 'The event should be triggered.'); - }; - - data.val('1'); - data.val('2'); - - data.query({ - term: '' - }); - - assert.ok(!data.called); - -}); diff --git a/static/vendor/select2/tests/data/minimumInputLength-tests.js b/static/vendor/select2/tests/data/minimumInputLength-tests.js deleted file mode 100644 index a67db08d..00000000 --- a/static/vendor/select2/tests/data/minimumInputLength-tests.js +++ /dev/null @@ -1,138 +0,0 @@ -module('Data adapters - Minimum input length'); - -var MinimumInputLength = require('select2/data/minimumInputLength'); -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -function StubData () { - this.called = false; -} - -StubData.prototype.query = function (params, callback) { - this.called = true; -}; - -var MinimumData = Utils.Decorate(StubData, MinimumInputLength); - -test('0 never displays the notice', function (assert) { - var zeroOptions = new Options({ - minimumInputLength: 0 - }); - - var data = new MinimumData(null, zeroOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MinimumData(null, zeroOptions); - - data.query({ - term: 'test' - }); - - assert.ok(data.called); -}); - -test('< 0 never displays the notice', function (assert) { - var negativeOptions = new Options({ - minimumInputLength: -1 - }); - - var data = new MinimumData(null, negativeOptions); - - data.trigger = function () { - assert.ok(false, 'No events should be triggered'); - }; - - data.query({ - term: '' - }); - - assert.ok(data.called); - - data = new MinimumData(null, negativeOptions); - - data.query({ - term: 'test' - }); - - assert.ok(data.called); -}); - -test('triggers when input is not long enough', function (assert) { - var options = new Options({ - minimumInputLength: 10 - }); - - var data = new MinimumData(null, options); - - data.trigger = function () { - assert.ok(true, 'The event should be triggered.'); - }; - - data.query({ - term: 'no' - }); - - assert.ok(!data.called); -}); - -test('does not trigger when equal', function (assert) { - var options = new Options({ - minimumInputLength: 10 - }); - - var data = new MinimumData(null, options); - - data.trigger = function () { - assert.ok(false, 'The event should not be triggered.'); - }; - - data.query({ - term: '1234567890' - }); - - assert.ok(data.called); -}); - -test('does not trigger when greater', function (assert) { - var options = new Options({ - minimumInputLength: 10 - }); - - var data = new MinimumData(null, options); - - data.trigger = function () { - assert.ok(false, 'The event should not be triggered.'); - }; - - data.query({ - term: '12345678901' - }); - - assert.ok(data.called); -}); - -test('works with null term', function (assert) { - var options = new Options({ - minimumInputLength: 1 - }); - - var data = new MinimumData(null, options); - - data.trigger = function () { - assert.ok(true, 'The event should be triggered'); - }; - - data.query({}); - - assert.ok(!data.called); -}); diff --git a/static/vendor/select2/tests/data/select-tests.js b/static/vendor/select2/tests/data/select-tests.js deleted file mode 100644 index b59c6d4b..00000000 --- a/static/vendor/select2/tests/data/select-tests.js +++ /dev/null @@ -1,557 +0,0 @@ -module('Data adapters - Select - current'); - -var SelectData = require('select2/data/select'); -var $ = require('jquery'); -var Options = require('select2/options'); -var selectOptions = new Options({}); - -test('current gets default for single', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - data.current(function (data) { - assert.equal( - data.length, - 1, - 'There should only be one selected option' - ); - - var option = data[0]; - - assert.equal( - option.id, - 'One', - 'The value of the option tag should be the id' - ); - - assert.equal( - option.text, - 'One', - 'The text within the option tag should be the text' - ); - }); -}); - -test('current gets default for multiple', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new SelectData($select, selectOptions); - - data.current(function (data) { - assert.equal( - data.length, - 0, - 'Multiple selects have no default selection.' - ); - }); -}); - -test('current gets options with explicit value', function (assert) { - var $select = $('#qunit-fixture .single'); - - var $option = $(''); - $select.append($option); - - var data = new SelectData($select, selectOptions); - - $select.val('1'); - - data.current(function (data) { - assert.equal( - data.length, - 1, - 'There should be one selected option' - ); - - var option = data[0]; - - assert.equal( - option.id, - '1', - 'The option value should be the selected id' - ); - - assert.equal( - option.text, - 'One', - 'The text should match the text for the option tag' - ); - }); -}); - -test('current gets options with implicit value', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - $select.val('One'); - - data.current(function (val) { - assert.equal( - val.length, - 1, - 'There should only be one selected value' - ); - - var option = val[0]; - - assert.equal( - option.id, - 'One', - 'The id should be the same as the option text' - ); - - assert.equal( - option.text, - 'One', - 'The text should be the same as the option text' - ); - }); -}); - -test('select works for single', function (assert) { - var $select = $('#qunit-fixture .single-with-placeholder'); - - var data = new SelectData($select, selectOptions); - - assert.equal($select.val(), 'placeholder'); - - data.select({ - id: 'One', - text: 'One' - }); - - assert.equal($select.val(), 'One'); -}); - -test('multiple sets the value', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new SelectData($select, selectOptions); - - assert.ok( - $select.val() == null || $select.val().length == 0, - 'nothing should be selected' - ); - - data.select({ - id: 'Two', - text: 'Two' - }); - - assert.deepEqual($select.val(), ['Two']); -}); - -test('multiple adds to the old value', function (assert) { - var $select = $('#qunit-fixture .multiple'); - - var data = new SelectData($select, selectOptions); - - $select.val(['Two']); - - assert.deepEqual($select.val(), ['Two']); - - data.select({ - id: 'One', - text: 'One' - }); - - assert.deepEqual($select.val(), ['One', 'Two']); -}); - -test('duplicates - single - same id on select triggers change', - function (assert) { - var $select = $('#qunit-fixture .duplicates'); - - var data = new SelectData($select, data); - var second = $('#qunit-fixture .duplicates option')[2]; - - var changeTriggered = false; - - assert.equal($select.val(), 'one'); - - $select.on('change', function () { - changeTriggered = true; - }); - - data.select({ - id: 'one', - text: 'Uno', - element: second - }); - - assert.equal( - $select.val(), - 'one', - 'The value never changed' - ); - - assert.ok( - changeTriggered, - 'The change event should be triggered' - ); - - assert.ok( - second.selected, - 'The second duplicate is selected, not the first' - ); -}); - -test('duplicates - single - different id on select triggers change', - function (assert) { - var $select = $('#qunit-fixture .duplicates'); - - var data = new SelectData($select, data); - var second = $('#qunit-fixture .duplicates option')[2]; - - var changeTriggered = false; - - $select.val('two'); - - $select.on('change', function () { - changeTriggered = true; - }); - - data.select({ - id: 'one', - text: 'Uno', - element: second - }); - - assert.equal( - $select.val(), - 'one', - 'The value changed to the duplicate id' - ); - - assert.ok( - changeTriggered, - 'The change event should be triggered' - ); - - assert.ok( - second.selected, - 'The second duplicate is selected, not the first' - ); -}); - -test('duplicates - multiple - same id on select triggers change', -function (assert) { - var $select = $('#qunit-fixture .duplicates-multi'); - - var data = new SelectData($select, data); - var second = $('#qunit-fixture .duplicates-multi option')[2]; - - var changeTriggered = false; - - $select.val(['one']); - - $select.on('change', function () { - changeTriggered = true; - }); - - data.select({ - id: 'one', - text: 'Uno', - element: second - }); - - assert.deepEqual( - $select.val(), - ['one', 'one'], - 'The value now has duplicates' - ); - - assert.ok( - changeTriggered, - 'The change event should be triggered' - ); - - assert.ok( - second.selected, - 'The second duplicate is selected, not the first' - ); -}); - -test('duplicates - multiple - different id on select triggers change', -function (assert) { - var $select = $('#qunit-fixture .duplicates-multi'); - - var data = new SelectData($select, data); - var second = $('#qunit-fixture .duplicates-multi option')[2]; - - var changeTriggered = false; - - $select.val(['two']); - - $select.on('change', function () { - changeTriggered = true; - }); - - data.select({ - id: 'one', - text: 'Uno', - element: second - }); - - assert.deepEqual( - $select.val(), - ['two', 'one'], - 'The value has the new id' - ); - - assert.ok( - changeTriggered, - 'The change event should be triggered' - ); - - assert.ok( - second.selected, - 'The second duplicate is selected, not the first' - ); -}); - -module('Data adapter - Select - query'); - -test('all options are returned with no term', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - data.query({}, function (data) { - assert.equal( - data.results.length, - 1, - 'The number of items returned should be equal to the number of options' - ); - }); -}); - -test('the matcher checks the text', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - data.query({ - term: 'One' - }, function (data) { - assert.equal( - data.results.length, - 1, - 'Only the "One" option should be found' - ); - }); -}); - -test('the matcher ignores case', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - data.query({ - term: 'one' - }, function (data) { - assert.equal( - data.results.length, - 1, - 'The "One" option should still be found' - ); - }); -}); - -test('no options may be returned with no matches', function (assert) { - var $select = $('#qunit-fixture .single'); - - var data = new SelectData($select, selectOptions); - - data.query({ - term: 'qwerty' - }, function (data) { - assert.equal( - data.results.length, - 0, - 'Only matching items should be returned' - ); - }); -}); - -test('optgroup tags are marked with children', function (assert) { - var $select = $('#qunit-fixture .groups'); - - var data = new SelectData($select, selectOptions); - - data.query({}, function (data) { - assert.ok( - 'children' in data.results[0], - 'The optgroup element should have children when queried' - ); - }); -}); - -test('empty optgroups are still shown when queried', function (assert) { - var $select = $('#qunit-fixture .groups'); - - var data = new SelectData($select, selectOptions); - - data.query({}, function (data) { - assert.equal( - data.results.length, - 2, - 'The empty optgroup element should still be returned when queried' - ); - - var item = data.results[1]; - - assert.equal( - item.text, - 'Empty', - 'The text of the empty optgroup should match the label' - ); - - assert.equal( - item.children.length, - 0, - 'There should be no children in the empty opgroup' - ); - }); -}); - -test('multiple options with the same value are returned', function (assert) { - var $select = $('#qunit-fixture .duplicates'); - - var data = new SelectData($select, selectOptions); - - data.query({}, function (data) { - assert.equal( - data.results.length, - 3, - 'The duplicate option should still be returned when queried' - ); - - var first = data.results[0]; - var duplicate = data.results[2]; - - assert.equal( - first.id, - duplicate.id, - 'The duplicates should have the same id' - ); - - assert.notEqual( - first.text, - duplicate.text, - 'The duplicates do not have the same text' - ); - }); -}); - -test('data objects use the text of the option', function (assert) { - var $select = $('#qunit-fixture .duplicates'); - - var data = new SelectData($select, selectOptions); - - var $option = $(''); - - var item = data.item($option); - - assert.equal(item.id, '&'); - assert.equal(item.text, '&'); -}); - -test('select option construction accepts id=0 (zero) value', function (assert) { - var $select = $('#qunit-fixture .single'); - - var selectOptions = [{ id: 0, text: 'Zero Value'}]; - var data = new SelectData($select, selectOptions); - - var optionElem = data.option(selectOptions[0]); - - // If was "Zero Value"", then it ignored id property - assert.equal( - optionElem[0].value, - '0', - 'Built option value should be "0" (zero as a string).' - ); -}); - -test('select option construction accepts id="" (empty string) value', - function (assert) { - var $select = $('#qunit-fixture .single'); - - var selectOptions = [{ id: '', text: 'Empty String'}]; - var data = new SelectData($select, selectOptions); - - var optionElem = data.option(selectOptions[0]); - - assert.equal( - optionElem[0].value, - '', - 'Built option value should be an empty string.' - ); -}); - -test('user-defined types are normalized properly', function (assert) { - var $select = $('#qunit-fixture .user-defined'), - - UserDefinedType = function (id, text) { - var self = this; - - self.id = id; - self.text = text; - - return self; - }; - - var testData = [ - 'Test', - { - id: 4, - text: 'item' - }, - new UserDefinedType(1, 'aaaaaa') - ]; - - var data = new SelectData($select, selectOptions); - - var normalizedItem = data._normalizeItem(testData[0]); - var normalizedItem2 = data._normalizeItem(testData[1]); - var normalizedItem3 = data._normalizeItem(testData[2]); - - assert.equal( - testData[0], - normalizedItem.id, - 'id property should be equal to text after normalize' - ); - - assert.equal( - testData[0], - normalizedItem.text, - 'text property should be equal after normalize' - ); - - assert.equal( - testData[1].id, - normalizedItem2.id, - 'id property should be equal after normalize' - ); - - assert.equal( - testData[1].text, - normalizedItem2.text, - 'text property should be equal after normalize' - ); - - assert.equal( - testData[2].id, - normalizedItem3.id, - 'id property should be equal after normalize' - ); - - assert.equal( - testData[2].text, - normalizedItem3.text, - 'text property should be equal after normalize' - ); - -}); diff --git a/static/vendor/select2/tests/data/tags-tests.js b/static/vendor/select2/tests/data/tags-tests.js deleted file mode 100644 index 6af8d8a7..00000000 --- a/static/vendor/select2/tests/data/tags-tests.js +++ /dev/null @@ -1,276 +0,0 @@ -module('Data adapters - Tags'); - -var SelectData = require('select2/data/select'); -var Tags = require('select2/data/tags'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var SelectTags = Utils.Decorate(SelectData, Tags); -var options = new Options({ - tags: true -}); - -test('does not trigger on blank or null terms', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: '' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); - - data.query({ - term: null - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); -}); - -test('white space is trimmed by default', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: ' ' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); - - data.query({ - term: ' One ' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); -}); - -test('does not create option if text is same but lowercase', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'one' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); -}); - -test('does not trigger for additional pages', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - page: 2 - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'One'); - assert.equal(item.text, 'One'); - }); -}); - -test('creates tag at beginning', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'o' - }, function (data) { - assert.equal(data.results.length, 2); - - var first = data.results[0]; - - assert.equal(first.id, 'o'); - assert.equal(first.text, 'o'); - }); -}); - -test('tags can be the only result', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'test' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'test'); - assert.equal(item.text, 'test'); - }); -}); - -test('tags are injected as options', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'test' - }, function (data) { - assert.equal(data.results.length, 1); - - var $children = $('#qunit-fixture .single option'); - - assert.equal($children.length, 2); - - var $tag = $children.last(); - - assert.equal($tag.val(), 'test'); - assert.equal($tag.text(), 'test'); - }); -}); - -test('old tags are removed automatically', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'first' - }, function (data) { - assert.equal(data.results.length, 1); - - var $children = $('#qunit-fixture .single option'); - - assert.equal($children.length, 2); - }); - - data.query({ - term: 'second' - }, function (data) { - assert.equal(data.results.length, 1); - - var $children = $('#qunit-fixture .single option'); - - assert.equal($children.length, 2); - - var $tag = $children.last(); - - assert.equal($tag.val(), 'second'); - assert.equal($tag.text(), 'second'); - }); -}); - -test('insertTag controls the tag location', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.insertTag = function (data, tag) { - data.push(tag); - }; - - data.query({ - term: 'o' - }, function (data) { - assert.equal(data.results.length, 2); - - var item = data.results[1]; - - assert.equal(item.id, 'o'); - assert.equal(item.text, 'o'); - }); -}); - -test('insertTag can be controlled through the options', function (assert) { - var options = new Options({ - insertTag: function (data, tag) { - data.push(tag); - } - }); - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.query({ - term: 'o' - }, function (data) { - assert.equal(data.results.length, 2); - - var item = data.results[1]; - - assert.equal(item.id, 'o'); - assert.equal(item.text, 'o'); - }); -}); - -test('createTag controls the tag object', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.createTag = function (params) { - return { - id: 0, - text: params.term - }; - }; - - data.query({ - term: 'test' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 0); - assert.equal(item.text, 'test'); - }); -}); - -test('createTag returns null for no tag', function (assert) { - var data = new SelectTags($('#qunit-fixture .single'), options); - - data.createTag = function (params) { - return null; - }; - - data.query({ - term: 'o' - }, function (data) { - assert.equal(data.results.length, 1); - }); -}); - -test('the createTag options customizes the function', function (assert) { - var data = new SelectTags( - $('#qunit-fixture .single'), - new Options({ - tags: true, - createTag: function (params) { - return { - id: params.term, - text: params.term, - tag: true - }; - } - }) - ); - - data.query({ - term: 'test' - }, function (data) { - assert.equal(data.results.length, 1); - - var item = data.results[0]; - - assert.equal(item.id, 'test'); - assert.equal(item.text, 'test'); - assert.equal(item.tag, true); - }); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/data/tokenizer-tests.js b/static/vendor/select2/tests/data/tokenizer-tests.js deleted file mode 100644 index 2fa01211..00000000 --- a/static/vendor/select2/tests/data/tokenizer-tests.js +++ /dev/null @@ -1,219 +0,0 @@ -module('Data adaptor - Tokenizer'); - -test('triggers the select event', function (assert) { - assert.expect(2); - - var SelectData = require('select2/data/select'); - var Tokenizer = require('select2/data/tokenizer'); - var Tags = require('select2/data/tags'); - - var Options = require('select2/options'); - var Utils = require('select2/utils'); - - var $ = require('jquery'); - - var TokenizedSelect = Utils.Decorate( - Utils.Decorate(SelectData, Tags), - Tokenizer - ); - var $select = $('#qunit-fixture .single'); - - var options = new Options({ - tags: true, - tokenSeparators: [','] - }); - - var container = new MockContainer(); - container.dropdown = container.selection = {}; - - var $container = $('
          '); - - var data = new TokenizedSelect($select, options); - data.bind(container, $container); - - data.on('select', function () { - assert.ok(true, 'The select event should be triggered'); - }); - - data.query({ - term: 'first,second' - }, function () { - assert.ok(true, 'The callback should have succeeded'); - }); -}); - -test('createTag can return null', function (assert) { - assert.expect(3); - - var SelectData = require('select2/data/select'); - var Tokenizer = require('select2/data/tokenizer'); - var Tags = require('select2/data/tags'); - - var Options = require('select2/options'); - var Utils = require('select2/utils'); - - var $ = require('jquery'); - - var TokenizedSelect = Utils.Decorate( - Utils.Decorate(SelectData, Tags), - Tokenizer - ); - var $select = $('#qunit-fixture .single'); - - var options = new Options({ - tags: true, - tokenSeparators: [','], - createTag: function () { - assert.ok(true, 'createTag should have been called'); - - return null; - } - }); - - var container = new MockContainer(); - container.dropdown = container.selection = {}; - - var $container = $('
          '); - - var data = new TokenizedSelect($select, options); - data.bind(container, $container); - - data.on('select', function (params) { - if (params.data == null) { - assert.ok(false, 'Null data should never be selected'); - } - }); - - data.query({ - term: 'first,second' - }, function () { - assert.ok(true, 'The callback should have succeeded'); - }); -}); - -test('createTag returning null does not cut the term', function (assert) { - assert.expect(4); - - var SelectData = require('select2/data/select'); - var Tokenizer = require('select2/data/tokenizer'); - var Tags = require('select2/data/tags'); - - var Options = require('select2/options'); - var Utils = require('select2/utils'); - - var $ = require('jquery'); - - var TokenizedSelect = Utils.Decorate( - Utils.Decorate(SelectData, Tags), - Tokenizer - ); - var $select = $('#qunit-fixture .single'); - - var options = new Options({ - tags: true, - tokenSeparators: [',', '"'], - createTag: function (params) { - var term = params.term; - - // Ignore blanks - if (term.length === 0) { - return null; - } - - // Ignore the leading quote - if (term === '"') { - return null; - } - - // If there is a leading quote, check for a second one - if (term[0] === '"' && term[term.length - 1] !== '"') { - return null; - } - - var text = term.substr(1, term.length - 2); - - return { - id: term, - text: text - }; - } - }); - - var container = new MockContainer(); - container.dropdown = container.selection = {}; - - var $container = $('
          '); - - var data = new TokenizedSelect($select, options); - data.bind(container, $container); - - data.on('select', function (params) { - assert.ok(params.data, 'Data should not be null'); - - assert.equal( - params.data.id, - '"first, second"', - 'The id should have the quotes' - ); - - assert.equal( - params.data.text, - 'first, second', - 'The text should not have the quotes' - ); - }); - - data.query({ - term: '"first, second",abc' - }, function () { - assert.ok(true, 'The callback should have succeeded'); - }); -}); - -test('works with multiple tokens given', function (assert) { - assert.expect(4); - - var SelectData = require('select2/data/select'); - var Tokenizer = require('select2/data/tokenizer'); - var Tags = require('select2/data/tags'); - - var Options = require('select2/options'); - var Utils = require('select2/utils'); - - var $ = require('jquery'); - - var TokenizedSelect = Utils.Decorate( - Utils.Decorate(SelectData, Tags), - Tokenizer - ); - var $select = $('#qunit-fixture .multiple'); - - var options = new Options({ - tags: true, - tokenSeparators: [','] - }); - - var container = new MockContainer(); - container.dropdown = container.selection = {}; - - var $container = $('
          '); - - var data = new TokenizedSelect($select, options); - data.bind(container, $container); - - data.on('select', function () { - assert.ok(true, 'The select event should be triggered'); - }); - - data.query({ - term: 'first,second,third' - }, function () { - assert.ok(true, 'The callback should have succeeded'); - }); - - assert.equal( - $select.children('option').length, - 3, - 'The two new tags should have been created' - ); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/dropdown/dropdownCss-tests.js b/static/vendor/select2/tests/dropdown/dropdownCss-tests.js deleted file mode 100644 index 9969335e..00000000 --- a/static/vendor/select2/tests/dropdown/dropdownCss-tests.js +++ /dev/null @@ -1,104 +0,0 @@ -module('Dropdown - dropdownCssClass compatibility'); - -var $ = require('jquery'); -var Utils = require('select2/utils'); -var Options = require('select2/options'); - -var Dropdown = require('select2/dropdown'); -var DropdownCSS = Utils.Decorate( - Dropdown, - require('select2/compat/dropdownCss') -); - -test('all classes will be copied if :all: is used', function (assert) { - var $element = $(''); - var options = new Options({ - dropdownCssClass: ':all:' - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok($dropdown.hasClass('test')); - assert.ok($dropdown.hasClass('copy')); - assert.ok($dropdown.hasClass('works')); - assert.ok(!$dropdown.hasClass(':all:')); -}); - -test(':all: can be used with other classes', function (assert) { - var $element = $(''); - var options = new Options({ - dropdownCssClass: ':all: other' - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok($dropdown.hasClass('test')); - assert.ok($dropdown.hasClass('copy')); - assert.ok($dropdown.hasClass('works')); - assert.ok($dropdown.hasClass('other')); - assert.ok(!$dropdown.hasClass(':all:')); -}); - -test('classes can be passed in as a string', function (assert) { - var $element = $(''); - var options = new Options({ - dropdownCssClass: 'other' - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok($dropdown.hasClass('other')); -}); - -test('a function can be used based on the element', function (assert){ - var $element = $(''); - var options = new Options({ - dropdownCssClass: function ($element) { - return 'function'; - } - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok($dropdown.hasClass('function')); - assert.ok(!$dropdown.hasClass('test')); -}); - -test(':all: works around custom adapters', function (assert) { - var $element = $(''); - var options = new Options({ - dropdownCssClass: ':all: something', - adaptDropdownCssClass: function (clazz) { - return clazz + '-modified'; - } - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok($dropdown.hasClass('something')); - - assert.ok($dropdown.hasClass('test')); - assert.ok($dropdown.hasClass('test-modified')); -}); - -module('Dropdown - adaptDropdownCss compatibility'); - -test('only return when adapted', function (assert) { - var $element = $(''); - var options = new Options({ - adaptDropdownCssClass: function (clazz) { - return 'modified'; - } - }); - - var select = new DropdownCSS($element, options); - var $dropdown = select.render(); - - assert.ok(!$dropdown.hasClass('original')); - assert.ok($dropdown.hasClass('modified')); -}); diff --git a/static/vendor/select2/tests/dropdown/positioning-tests.js b/static/vendor/select2/tests/dropdown/positioning-tests.js deleted file mode 100644 index 2da68982..00000000 --- a/static/vendor/select2/tests/dropdown/positioning-tests.js +++ /dev/null @@ -1,177 +0,0 @@ -module('Dropdown - attachBody - positioning'); - -test('appends to the dropdown parent', function (assert) { - assert.expect(4); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Dropdown = require('select2/dropdown'); - var AttachBody = require('select2/dropdown/attachBody'); - - var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody); - - var dropdown = new DropdownAdapter($select, new Options({ - dropdownParent: $parent - })); - - assert.equal( - $parent.children().length, - 1, - 'Only the select should be in the container' - ); - - var $dropdown = dropdown.render(); - - dropdown.bind(container, $container); - - dropdown.position($dropdown, $container); - - assert.equal( - $parent.children().length, - 1, - 'The dropdown should not be placed until after it is opened' - ); - - dropdown._showDropdown(); - - assert.equal( - $parent.children().length, - 2, - 'The dropdown should now be in the container as well' - ); - - assert.ok( - $.contains($parent[0], $dropdown[0]), - 'The dropdown should be contained within the parent container' - ); -}); - -test('dropdown is positioned down with static margins', function (assert) { - var $ = require('jquery'); - var $select = $(''); - var $parent = $('
          '); - $parent.css({ - position: 'static', - marginTop: '5px', - marginLeft: '10px' - }); - - var $container = $('test'); - var container = new MockContainer(); - - $('#qunit-fixture').empty(); - - $parent.appendTo($('#qunit-fixture')); - $container.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Dropdown = require('select2/dropdown'); - var AttachBody = require('select2/dropdown/attachBody'); - - var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody); - - var dropdown = new DropdownAdapter($select, new Options({ - dropdownParent: $parent - })); - - var $dropdown = dropdown.render(); - - assert.equal( - $dropdown[0].style.top, - 0, - 'The drodpown should not have any offset before it is displayed' - ); - - dropdown.bind(container, $container); - dropdown.position($dropdown, $container); - dropdown._showDropdown(); - - assert.ok( - dropdown.$dropdown.hasClass('select2-dropdown--below'), - 'The dropdown should be forced down' - ); - - assert.equal( - $dropdown.css('top').replace(/\D+/, ''), - $container.outerHeight() + 5, - 'The offset should be 5px at the top' - ); - - assert.equal( - $dropdown.css('left'), - '10px', - 'The offset should be 10px on the left' - ); -}); - -test('dropdown is positioned down with absolute offsets', function (assert) { - var $ = require('jquery'); - var $select = $(''); - var $parent = $('
          '); - $parent.css({ - position: 'absolute', - top: '10px', - left: '5px' - }); - - var $container = $('test'); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $container.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Dropdown = require('select2/dropdown'); - var AttachBody = require('select2/dropdown/attachBody'); - - var DropdownAdapter = Utils.Decorate(Dropdown, AttachBody); - - var dropdown = new DropdownAdapter($select, new Options({ - dropdownParent: $parent - })); - - var $dropdown = dropdown.render(); - - assert.equal( - $dropdown[0].style.top, - 0, - 'The drodpown should not have any offset before it is displayed' - ); - - dropdown.bind(container, $container); - dropdown.position($dropdown, $container); - dropdown._showDropdown(); - - assert.ok( - dropdown.$dropdown.hasClass('select2-dropdown--below'), - 'The dropdown should be forced down' - ); - - assert.equal( - $dropdown.css('top').replace(/\D+/, ''), - $container.outerHeight(), - 'There should not be an extra top offset' - ); - - assert.equal( - $dropdown.css('left'), - '0px', - 'There should not be an extra left offset' - ); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/dropdown/selectOnClose-tests.js b/static/vendor/select2/tests/dropdown/selectOnClose-tests.js deleted file mode 100644 index 3f1d1d41..00000000 --- a/static/vendor/select2/tests/dropdown/selectOnClose-tests.js +++ /dev/null @@ -1,137 +0,0 @@ -module('Dropdown - selectOnClose'); - -var $ = require('jquery'); - -var Utils = require('select2/utils'); -var Options = require('select2/options'); - -var SelectData = require('select2/data/select'); - -var Results = require('select2/results'); -var SelectOnClose = require('select2/dropdown/selectOnClose'); - -var ModifiedResults = Utils.Decorate(Results, SelectOnClose); - -var options = new Options({ - selectOnClose: true -}); - -test('will not trigger if no results were given', function (assert) { - assert.expect(0); - - var $element = $(''); - var select = new ModifiedResults($element, options, new SelectData($element)); - - var $dropdown = select.render(); - - var container = new MockContainer(); - select.bind(container, $('
          ')); - - select.on('select', function () { - assert.ok(false, 'The select event should not have been triggered'); - }); - - container.trigger('close'); -}); - -test('will not trigger if the results list is empty', function (assert) { - assert.expect(1); - - var $element = $(''); - var select = new ModifiedResults($element, options, new SelectData($element)); - - var $dropdown = select.render(); - - var container = new MockContainer(); - select.bind(container, $('
          ')); - - select.on('select', function () { - assert.ok(false, 'The select event should not have been triggered'); - }); - - select.append({ - results: [] - }); - - assert.equal( - $dropdown.find('li').length, - 0, - 'There should not be any results in the dropdown' - ); - - container.trigger('close'); -}); - -test('will not trigger if no results here highlighted', function (assert) { - assert.expect(2); - - var $element = $(''); - var select = new ModifiedResults($element, options, new SelectData($element)); - - var $dropdown = select.render(); - - var container = new MockContainer(); - select.bind(container, $('
          ')); - - select.on('select', function () { - assert.ok(false, 'The select event should not have been triggered'); - }); - - select.append({ - results: [ - { - id: '1', - text: 'Test' - } - ] - }); - - assert.equal( - $dropdown.find('li').length, - 1, - 'There should be one result in the dropdown' - ); - - assert.equal( - $.trim($dropdown.find('li').text()), - 'Test', - 'The result should be the same as the one we appended' - ); - - container.trigger('close'); -}); - -test('will trigger if there is a highlighted result', function (assert) { - assert.expect(2); - - var $element = $(''); - var select = new ModifiedResults($element, options, new SelectData($element)); - - var $dropdown = select.render(); - - var container = new MockContainer(); - select.bind(container, $('
          ')); - - select.on('select', function () { - assert.ok(true, 'The select event should have been triggered'); - }); - - select.append({ - results: [ - { - id: '1', - text: 'Test' - } - ] - }); - - assert.equal( - $dropdown.find('li').length, - 1, - 'There should be one result in the dropdown' - ); - - $dropdown.find('li').addClass('select2-results__option--highlighted'); - - container.trigger('close'); -}); diff --git a/static/vendor/select2/tests/dropdown/stopPropagation-tests.js b/static/vendor/select2/tests/dropdown/stopPropagation-tests.js deleted file mode 100644 index 240a3e66..00000000 --- a/static/vendor/select2/tests/dropdown/stopPropagation-tests.js +++ /dev/null @@ -1,33 +0,0 @@ -module('Dropdown - Stoping event propagation'); - -var Dropdown = require('select2/dropdown'); -var StopPropagation = require('select2/dropdown/stopPropagation'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var CustomDropdown = Utils.Decorate(Dropdown, StopPropagation); - -var options = new Options(); - -test('click event does not propagate', function (assert) { - assert.expect(1); - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var dropdown = new CustomDropdown($('#qunit-fixture select'), options); - - var $dropdown = dropdown.render(); - dropdown.bind(container, $container); - - $container.append($dropdown); - $container.on('click', function () { - assert.ok(false, 'The click event should have been stopped'); - }); - - $dropdown.trigger('click'); - - assert.ok(true, 'Something went wrong if this failed'); -}); diff --git a/static/vendor/select2/tests/helpers.js b/static/vendor/select2/tests/helpers.js deleted file mode 100644 index 9409c8b6..00000000 --- a/static/vendor/select2/tests/helpers.js +++ /dev/null @@ -1,50 +0,0 @@ -// Restore the require/define -var require = $.fn.select2.amd.require; -var define = $.fn.select2.amd.define; - -// Disable jQuery's binding to $ -jQuery.noConflict(); - -var Utils = require('select2/utils'); - -function MockContainer () { - MockContainer.__super__.constructor.call(this); -} - -Utils.Extend(MockContainer, Utils.Observable); - -MockContainer.prototype.isOpen = function () { - return this.isOpen; -}; - -var log = []; -var testName; - -QUnit.done(function (test_results) { - var tests = []; - for(var i = 0, len = log.length; i < len; i++) { - var details = log[i]; - tests.push({ - name: details.name, - result: details.result, - expected: details.expected, - actual: details.actual, - source: details.source - }); - } - test_results.tests = tests; - - window.global_test_results = test_results; -}); -QUnit.testStart(function(testDetails){ - QUnit.log(function(details){ - if (!details.result) { - details.name = testDetails.name; - log.push(details); - } - }); -}); - -define('qunit', function () { - return QUnit; -}) \ No newline at end of file diff --git a/static/vendor/select2/tests/integration-jq1.html b/static/vendor/select2/tests/integration-jq1.html deleted file mode 100644 index d8d0ef55..00000000 --- a/static/vendor/select2/tests/integration-jq1.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -
          -
          - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/integration-jq2.html b/static/vendor/select2/tests/integration-jq2.html deleted file mode 100644 index 97f73828..00000000 --- a/static/vendor/select2/tests/integration-jq2.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -
          -
          - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/integration-jq3.html b/static/vendor/select2/tests/integration-jq3.html deleted file mode 100644 index 2f99fb5b..00000000 --- a/static/vendor/select2/tests/integration-jq3.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -
          -
          - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/integration/dom-changes.js b/static/vendor/select2/tests/integration/dom-changes.js deleted file mode 100644 index 2d89ae2a..00000000 --- a/static/vendor/select2/tests/integration/dom-changes.js +++ /dev/null @@ -1,257 +0,0 @@ -module('DOM integration'); - -test('adding a new unselected option changes nothing', function (assert) { - // Any browsers which support mutation observers will not trigger the event - var expected = 4; - if (window.MutationObserver) { - expected = 2; - } else if (!window.addEventListener) { - expected = 2; - } - - assert.expect(expected); - - var asyncDone = null; - var syncDone = assert.async(); - - if (expected != 2) { - asyncDone = assert.async(); - } - - var $ = require('jquery'); - var Options = require('select2/options'); - var Select2 = require('select2/core'); - - var $select = $( - '' - ); - - $('#qunit-fixture').append($select); - - var select = new Select2($select); - - select.on('selection:update', function (args) { - assert.equal( - args.data.length, - 1, - 'There was more than one selection' - ); - - assert.equal( - args.data[0].id, - 'One', - 'The selection changed to something other than One' - ); - - if (expected != 2) { - asyncDone(); - } - }); - - assert.equal( - $select.val(), - 'One' - ); - - var $option = $(''); - - $select.append($option); - - assert.equal( - $select.val(), - 'One' - ); - - syncDone(); -}); - -test('adding a new selected option changes the value', function (assert) { - // handle IE 8 not being supported - var expected = 4; - if (!window.MutationObserver && !window.addEventListener) { - expected = 2; - } - - assert.expect(expected); - - var asyncDone = null; - var syncDone = assert.async(); - - if (expected != 2) { - asyncDone = assert.async(); - } - - var $ = require('jquery'); - var Options = require('select2/options'); - var Select2 = require('select2/core'); - - var $select = $( - '' - ); - - $('#qunit-fixture').append($select); - - var select = new Select2($select); - - select.on('selection:update', function (args) { - assert.equal( - args.data.length, - 1, - 'There was more than one selection' - ); - - assert.equal( - args.data[0].id, - 'Three', - 'The selection did not change to Three' - ); - - if (expected != 2) { - asyncDone(); - } - }); - - assert.equal( - $select.val(), - 'One' - ); - - var $option = $(''); - - $select.append($option); - - assert.equal( - $select.val(), - 'Three' - ); - - syncDone(); -}); - -test('removing an unselected option changes nothing', function (assert) { - // Any browsers which support mutation observers will not trigger the event - var expected = 4; - if (!window.MutationObserver && !window.addEventListener) { - expected = 2; - } - - assert.expect(expected); - - var asyncDone = null; - var syncDone = assert.async(); - - if (expected != 2) { - asyncDone = assert.async(); - } - - var $ = require('jquery'); - var Options = require('select2/options'); - var Select2 = require('select2/core'); - - var $select = $( - '' - ); - - $('#qunit-fixture').append($select); - - var select = new Select2($select); - - select.on('selection:update', function (args) { - assert.equal( - args.data.length, - 1, - 'There was more than one selection' - ); - - assert.equal( - args.data[0].id, - 'One', - 'The selection changed to something other than One' - ); - - if (expected != 2) { - asyncDone(); - } - }); - - assert.equal( - $select.val(), - 'One' - ); - - $select.children().eq(1).remove(); - - assert.equal( - $select.val(), - 'One' - ); - - syncDone(); -}); - -test('removing a selected option changes the value', function (assert) { - // handle IE 8 not being supported - var expected = 3; - if (!window.MutationObserver && !window.addEventListener) { - expected = 2; - } - - assert.expect(expected); - - var asyncDone = null; - var syncDone = assert.async(); - - if (expected != 2) { - asyncDone = assert.async(); - } - - var $ = require('jquery'); - var Options = require('select2/options'); - var Select2 = require('select2/core'); - - var $select = $( - '' - ); - - $('#qunit-fixture').append($select); - - var select = new Select2($select); - - select.on('selection:update', function (args) { - assert.equal( - args.data.length, - 1, - 'There was more than one selection' - ); - - if (expected != 2) { - asyncDone(); - } - }); - - assert.equal( - $select.val(), - 'One' - ); - - $select.children().eq(0).remove(); - - assert.equal( - $select.val(), - 'Two' - ); - - syncDone(); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/integration/jquery-calls.js b/static/vendor/select2/tests/integration/jquery-calls.js deleted file mode 100644 index d7c3926f..00000000 --- a/static/vendor/select2/tests/integration/jquery-calls.js +++ /dev/null @@ -1,98 +0,0 @@ -module('select2(val)'); - -var Utils = require('select2/utils'); - -test('multiple elements with arguments works', function (assert) { - var $ = require('jquery'); - require('jquery.select2'); - - var $first = $( - '' - ); - var $second = $first.clone(); - - var $both = $first.add($second); - $both.select2(); - - $both.select2('val', '2'); - - assert.equal( - $first.val(), - '2', - 'The call should change the value on the first element' - ); - assert.equal( - $second.val(), - '2', - 'The call should also change the value on the second element' - ); -}); - -test('initializes when jQuery $.data contains' + - ' cyclic reference', function (assert) { - var $ = require('jquery'); - require('jquery.select2'); - - var $select = $( - '' - ); - - // Add a circular reference object using jQuery. - var recursiveObject = {}; - - recursiveObject.same = recursiveObject; - - $select.data('same', recursiveObject); - - $select.select2(); - - assert.equal( - $select.val(), - '3', - 'The option value should be pulled correctly' - ); -}); - -test('$element.data returns instance and options correctly', - function (assert) { - var $ = require('jquery'); - require('jquery.select2'); - - var $select = $( - '' - ); - - // Initialize. - $select.select2({maximumSelectionLength: 2, multiple: true}); - - assert.equal( - $select.val(), - '3', - 'Only 1 option should be pulled.' - ); - - // Try to resolve instance via .data('select2'). - var $instance = $select.data('select2'); - assert.ok($instance); - assert.ok($instance.options); - - // Ensure $select.data('select2') is the same instance - // created by .select2() - assert.equal($instance, Utils.GetData($instance.$element[0], - 'select2')); - - // Ensure initialized property matches. - assert.equal($instance.options.options.maximumSelectionLength, - 2); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/integration/select2-methods.js b/static/vendor/select2/tests/integration/select2-methods.js deleted file mode 100644 index b1e344a5..00000000 --- a/static/vendor/select2/tests/integration/select2-methods.js +++ /dev/null @@ -1,139 +0,0 @@ -module('select2(data)'); - -var $ = require('jquery'); -var Select2 = require('select2/core'); -var Options = require('select2/options'); - -test('single default selection returned', function (assert) { - var $select = $( - '' - ); - var options = new Options({}); - - var select = new Select2($select, options); - - var items = select.data(); - - assert.equal( - items.length, - 1, - 'The one selected item should be returned' - ); - - var first = items[0]; - - assert.equal( - first.id, - '3', - 'The first option was correct' - ); - - assert.equal( - first.text, - 'Three', - 'The first option was correct' - ); -}); - -test('multiple default selections returned', function (assert) { - var $select = $( - '' - ); - var options = new Options({}); - - var select = new Select2($select, options); - - var items = select.data(); - - assert.equal( - items.length, - 2, - 'The two selected items should be returned' - ); - - var first = items[0]; - - assert.equal( - first.id, - 'One', - 'The first option was correct' - ); - - var second = items[1]; - - assert.equal( - second.id, - '3', - 'The option value should be pulled correctly' - ); -}); - -module('select2(val)'); - -test('single value matches jquery value', function (assert) { - var $select = $( - '' - ); - var options = new Options({}); - - var select = new Select2($select, options); - - var value = select.val(); - - assert.equal( - value, - '3', - 'The value should match the option tag attribute' - ); - - assert.equal( - value, - $select.val(), - 'The value should match the jquery value' - ); -}); - -test('multiple value matches the jquery value', function (assert) { - var $select = $( - '' - ); - var options = new Options({}); - - var select = new Select2($select, options); - - var value = select.val(); - - assert.equal( - value.length, - 2, - 'Two options should be selected' - ); - - assert.deepEqual( - value, - ['One', '3'], - 'The values should match the option tag attribute' - ); - - assert.deepEqual( - value, - $select.val(), - 'The values should match the jquery values' - ); -}); diff --git a/static/vendor/select2/tests/options/ajax-tests.js b/static/vendor/select2/tests/options/ajax-tests.js deleted file mode 100644 index eb65e9ef..00000000 --- a/static/vendor/select2/tests/options/ajax-tests.js +++ /dev/null @@ -1,50 +0,0 @@ -module('Defaults - Ajax'); - -test('options are merged recursively with default options', function (assert) { - var defaults = require('select2/defaults'); - - var ajaxDelay = 250; - var ajaxUrl = 'http://www.test.com'; - - var mergedOptions; - - defaults.set('ajax--delay', ajaxDelay); - - mergedOptions = defaults.apply({ - ajax: { - url: ajaxUrl - } - }); - - assert.equal( - mergedOptions.ajax.delay, - ajaxDelay, - 'Ajax default options are present on the merged options' - ); - - assert.equal( - mergedOptions.ajax.url, - ajaxUrl, - 'Ajax provided options are present on the merged options' - ); - - defaults.reset(); -}); - -test('more than one default option can be changed via set()', function(assert) { - var defaults = require('select2/defaults'); - var ajaxDelay = 123; - var dataDataType = 'xml'; - defaults.set('ajax--delay', ajaxDelay); - defaults.set('ajax--data-type', dataDataType); - - assert.equal( - defaults.defaults.ajax.delay, - ajaxDelay, - 'Both ajax.delay and ajax.dataType present in defaults'); - assert.equal( - defaults.defaults.ajax.dataType, - dataDataType, - 'Both ajax.delay and ajax.dataType present in defaults'); - defaults.reset(); -}); diff --git a/static/vendor/select2/tests/options/data-tests.js b/static/vendor/select2/tests/options/data-tests.js deleted file mode 100644 index 107a2f0c..00000000 --- a/static/vendor/select2/tests/options/data-tests.js +++ /dev/null @@ -1,44 +0,0 @@ -module('Options - Attributes'); - -var $ = require('jquery'); - -var Options = require('select2/options'); - -test('no nesting', function (assert) { - var $test = $(''); - - var options = new Options({}, $test); - - assert.equal(options.get('test'), 'test'); -}); - -test('with nesting', function (assert) { - var $test = $(''); - - if ($test[0].dataset == null) { - assert.ok( - true, - 'We can not run this test with jQuery 1.x if dataset is not implemented' - ); - - return; - } - - var options = new Options({}, $test); - - assert.ok(!(options.get('first-Second'))); - assert.equal(options.get('first').second, 'test'); -}); - -test('overrides initialized data', function (assert) { - var $test = $(''); - - var options = new Options({ - options: 'yes', - override: 'no' - }, $test); - - assert.equal(options.get('options'), 'yes'); - assert.equal(options.get('override'), 'yes'); - assert.equal(options.get('data'), 'yes'); -}); diff --git a/static/vendor/select2/tests/options/deprecated-tests.js b/static/vendor/select2/tests/options/deprecated-tests.js deleted file mode 100644 index a51bba31..00000000 --- a/static/vendor/select2/tests/options/deprecated-tests.js +++ /dev/null @@ -1,250 +0,0 @@ -module('Options - Deprecated - initSelection'); - -var $ = require('jquery'); -var Options = require('select2/options'); - -test('converted into dataAdapter.current', function (assert) { - assert.expect(5); - - var $test = $(''); - var called = false; - - var options = new Options({ - initSelection: function ($element, callback) { - called = true; - - callback([{ - id: '1', - text: '2' - }]); - } - }, $test); - - assert.ok(!called, 'initSelection should not have been called'); - - var DataAdapter = options.get('dataAdapter'); - var data = new DataAdapter($test, options); - - data.current(function (data) { - assert.equal( - data.length, - 1, - 'There should have only been one object selected' - ); - - var item = data[0]; - - assert.equal( - item.id, - '1', - 'The id should have been set by initSelection' - ); - - assert.equal( - item.text, - '2', - 'The text should have been set by initSelection' - ); - }); - - assert.ok(called, 'initSelection should have been called'); -}); - -test('single option converted to array automatically', function (assert) { - assert.expect(2); - - var $test = $(''); - var called = false; - - var options = new Options({ - initSelection: function ($element, callback) { - called = true; - - callback({ - id: '1', - text: '2' - }); - } - }, $test); - - var DataAdapter = options.get('dataAdapter'); - var data = new DataAdapter($test, options); - - data.current(function (data) { - assert.ok( - $.isArray(data), - 'The data should have been converted to an array' - ); - }); - - assert.ok(called, 'initSelection should have been called'); -}); - -test('only called once', function (assert) { - assert.expect(8); - - var $test = $(''); - var called = 0; - - var options = new Options({ - initSelection: function ($element, callback) { - called++; - - callback([{ - id: '1', - text: '2' - }]); - } - }, $test); - - var DataAdapter = options.get('dataAdapter'); - var data = new DataAdapter($test, options); - - data.current(function (data) { - assert.equal( - data.length, - 1, - 'There should have only been a single option' - ); - - var item = data[0]; - - assert.equal( - item.id, - '1', - 'The id should match the one given by initSelection' - ); - - assert.equal( - item.text, - '2', - 'The text should match the one given by initSelection' - ); - }); - - assert.equal( - called, - 1, - 'initSelection should have been called' - ); - - data.current(function (data) { - assert.equal( - data.length, - 1, - 'There should have only been a single option' - ); - - var item = data[0]; - - assert.equal( - item.id, - '3', - 'The id should match the value given in the DOM' - ); - - assert.equal( - item.text, - '4', - 'The text should match the text given in the DOM' - ); - }); - - assert.equal( - called, - 1, - 'initSelection should have only been called once' - ); -}); - -module('Options - Deprecated - query'); - -test('converted into dataAdapter.query automatically', function (assert) { - assert.expect(6); - - var $test = $(''); - var called = false; - - var options = new Options({ - query: function (params) { - called = true; - - params.callback({ - results: [ - { - id: 'test', - text: params.term - } - ] - }); - } - }, $test); - - assert.ok(!called, 'The query option should not have been called'); - - var DataAdapter = options.get('dataAdapter'); - var data = new DataAdapter($test, options); - - data.query({ - term: 'term' - }, function (data) { - assert.ok( - 'results' in data, - 'It should have included the results key' - ); - - assert.equal( - data.results.length, - 1, - 'There should have only been a single result returned' - ); - - var item = data.results[0]; - - assert.equal( - item.id, - 'test', - 'The id should have been returned from the query function' - ); - - assert.equal( - item.text, - 'term', - 'The text should have matched the term that was passed in' - ); - }); - - assert.ok(called, 'The query function should have been called'); -}); - -module('Options - deprecated - data-ajax-url'); - -test('converted ajax-url to ajax--url automatically', function (assert) { - var $test = $(''); - var options = new Options({}, $test); - - assert.ok( - options.get('ajax'), - 'The `ajax` key was automatically created' - ); - assert.equal( - options.get('ajax').url, - 'test://url', - 'The `url` property for the `ajax` option was filled in correctly' - ); -}); - -test('converted select2-tags to data/tags automatically', function (assert) { - var $test = $(''); - var options = new Options({}, $test); - - assert.ok( - options.get('tags'), - 'The `tags` key is automatically set to true' - ); - assert.equal( - options.get('data'), - 'original data', - 'The `data` key is created with the original data' - ); -}); diff --git a/static/vendor/select2/tests/options/translation-tests.js b/static/vendor/select2/tests/options/translation-tests.js deleted file mode 100644 index ab433b61..00000000 --- a/static/vendor/select2/tests/options/translation-tests.js +++ /dev/null @@ -1,28 +0,0 @@ -module('Options - Translations'); - -var $ = require('jquery'); -var Options = require('select2/options'); - -test('partial dictionaries can be passed', function (assert) { - var options = new Options({ - language: { - searching: function () { - return 'Something'; - } - } - }); - - var translations = options.get('translations'); - - assert.equal( - translations.get('searching')(), - 'Something', - 'The partial dictionary still overrides translations' - ); - - assert.equal( - translations.get('noResults')(), - 'No results found', - 'You can still get English translations for keys not passed in' - ); -}); diff --git a/static/vendor/select2/tests/options/width-tests.js b/static/vendor/select2/tests/options/width-tests.js deleted file mode 100644 index e7240349..00000000 --- a/static/vendor/select2/tests/options/width-tests.js +++ /dev/null @@ -1,66 +0,0 @@ -module('Options - Width'); - -var $ = require('jquery'); - -var Select2 = require('select2/core'); -var select = new Select2($('')); - -test('string passed as width', function (assert) { - var $test = $(''); - - var width = select._resolveWidth($test, '80%'); - - assert.equal(width, '80%'); -}); - -test('width from style attribute', function (assert) { - var $test = $(''); - - var width = select._resolveWidth($test, 'style'); - - assert.equal(width, null); -}); - -test('width from computed element width', function (assert) { - var $style = $( - '' - ); - var $test = $(''); - - $('#qunit-fixture').append($style); - $('#qunit-fixture').append($test); - - var width = select._resolveWidth($test, 'element'); - - assert.equal(width, '500px'); -}); - -test('resolve gets the style if it is there', function (assert) { - var $test = $(''); - - $('#qunit-fixture').append($style); - $('#qunit-fixture').append($test); - - var width = select._resolveWidth($test, 'resolve'); - - assert.equal(width, '500px'); -}); diff --git a/static/vendor/select2/tests/results/focusing-tests.js b/static/vendor/select2/tests/results/focusing-tests.js deleted file mode 100644 index 08a2ef3c..00000000 --- a/static/vendor/select2/tests/results/focusing-tests.js +++ /dev/null @@ -1,241 +0,0 @@ -module('Results - highlighting results'); - -test('results:all with no data skips results:focus', function (assert) { - assert.expect(0); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Results = require('select2/results'); - - var results = new Results($select, new Options({})); - - // Fake the data adapter for the `setClasses` method - results.data = {}; - results.data.current = function (callback) { - callback([{ id: 'test' }]); - }; - - results.render(); - - results.bind(container, $container); - - results.on('results:focus', function (params) { - assert.ok(false, 'The results:focus event was triggered'); - }); - - container.trigger('results:all', { - data: { - results: [] - } - }); -}); - -test('results:all triggers results:focus on the first item', function (assert) { - assert.expect(2); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Results = require('select2/results'); - - var results = new Results($select, new Options({})); - - // Fake the data adapter for the `setClasses` method - results.data = {}; - results.data.current = function (callback) { - callback([{ id: 'test' }]); - }; - - results.render(); - - results.bind(container, $container); - - results.on('results:focus', function (params) { - assert.equal(params.data.id, 'test'); - assert.equal(params.data.text, 'Test'); - }); - - container.trigger('results:all', { - data: { - results: [ - { - id: 'test', - text: 'Test' - } - ] - } - }); -}); - -test('results:append does not trigger results:focus', function (assert) { - assert.expect(0); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Results = require('select2/results'); - - var results = new Results($select, new Options({})); - - // Fake the data adapter for the `setClasses` method - results.data = {}; - results.data.current = function (callback) { - callback([{ id: 'test' }]); - }; - - results.render(); - - results.bind(container, $container); - - results.on('results:focus', function () { - assert.ok(false, 'The results:focus event was triggered'); - }); - - container.trigger('results:append', { - data: { - results: [ - { - id: 'test', - text: 'Test' - } - ] - } - }); -}); - -test('scrollAfterSelect triggers results:focus', function (assert) { - assert.expect(3); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Results = require('select2/results'); - - var options = new Options({ scrollAfterSelect: true }); - var results = new Results($select, options); - - // Fake the data adapter for the `setClasses` method - results.data = {}; - results.data.current = function (callback) { - callback([{ id: 'test' }]); - }; - - results.render(); - - results.bind(container, $container); - - // check that default for scrollAfterSelect is true - assert.equal(options.get('scrollAfterSelect'), true); - - results.append({ - results: [ - { - id: 'test', - text: 'Test' - } - ] - }); - - results.on('results:focus', function (params) { - assert.equal(params.data.id, 'test'); - assert.equal(params.data.text, 'Test'); - }); - - container.trigger('select', {}); -}); - -test('!scrollAfterSelect does not trigger results:focus', function (assert) { - assert.expect(1); - - var $ = require('jquery'); - - var $select = $(''); - var $parent = $('
          '); - - var $container = $(''); - var container = new MockContainer(); - - $parent.appendTo($('#qunit-fixture')); - $select.appendTo($parent); - - var Utils = require('select2/utils'); - var Options = require('select2/options'); - - var Results = require('select2/results'); - - var options = new Options({ scrollAfterSelect: false }); - var results = new Results($select, options); - - // Fake the data adapter for the `setClasses` method - results.data = {}; - results.data.current = function (callback) { - callback([{ id: 'test' }]); - }; - - results.render(); - - results.bind(container, $container); - - // check that default for scrollAfterSelect is false - assert.equal(options.get('scrollAfterSelect'), false); - - results.append({ - results: [ - { - id: 'test', - text: 'Test' - } - ] - }); - - results.on('results:focus', function () { - assert.ok(false, 'The results:focus event was triggered'); - }); - - container.trigger('select', {}); -}); diff --git a/static/vendor/select2/tests/selection/allowClear-tests.js b/static/vendor/select2/tests/selection/allowClear-tests.js deleted file mode 100644 index a7ca726d..00000000 --- a/static/vendor/select2/tests/selection/allowClear-tests.js +++ /dev/null @@ -1,330 +0,0 @@ -module('Selection containers - Placeholders - Allow clear'); - -var Placeholder = require('select2/selection/placeholder'); -var AllowClear = require('select2/selection/allowClear'); - -var SingleSelection = require('select2/selection/single'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var AllowClearPlaceholder = Utils.Decorate( - Utils.Decorate(SingleSelection, Placeholder), - AllowClear -); - -var allowClearOptions = new Options({ - placeholder: { - id: 'placeholder', - text: 'This is the placeholder' - }, - allowClear: true -}); - -test('clear is not displayed for single placeholder', function (assert) { - var selection = new AllowClearPlaceholder( - $('#qunit-fixture .single-with-placeholder'), - allowClearOptions - ); - - var $selection = selection.render(); - - selection.update([{ - id: 'placeholder' - }]); - - assert.equal( - $selection.find('.select2-selection__clear').length, - 0, - 'The clear icon should not be displayed' - ); -}); - -test('clear is not displayed for multiple placeholder', function (assert) { - var selection = new AllowClearPlaceholder( - $('#qunit-fixture .multiple'), - allowClearOptions - ); - - var $selection = selection.render(); - - selection.update([]); - - assert.equal( - $selection.find('.select2-selection__clear').length, - 0, - 'The clear icon should not be displayed' - ); -}); - - -test('clear is displayed for placeholder', function (assert) { - var selection = new AllowClearPlaceholder( - $('#qunit-fixture .single-with-placeholder'), - allowClearOptions - ); - - var $selection = selection.render(); - - selection.update([{ - id: 'one', - test: 'one' - }]); - - assert.equal( - $selection.find('.select2-selection__clear').length, - 1, - 'The clear icon should be displayed' - ); -}); - -test('clear icon should have title displayed', function (assert) { - var selection = new AllowClearPlaceholder( - $('#qunit-fixture .single-with-placeholder'), - allowClearOptions - ); - - var $selection = selection.render(); - - selection.update([{ - id: 'one', - test: 'one' - }]); - - assert.equal( - $selection.find('.select2-selection__clear').attr('title'), - 'Remove all items', - 'The clear icon should have title displayed' - ); -}); - -test('clicking clear will set the placeholder value', function (assert) { - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - $element.val('One'); - selection.update([{ - id: 'One', - text: 'One' - }]); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); - - assert.equal( - $element.val(), - 'placeholder', - 'The value should have been reset to the placeholder' - ); -}); - -test('clicking clear will trigger the unselect event', function (assert) { - assert.expect(4); - - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - $element.val('One'); - selection.update([{ - id: 'One', - text: 'One' - }]); - - selection.on('unselect', function (ev) { - assert.ok( - 'data' in ev && ev.data, - 'The event should have been triggered with the data property' - ); - - assert.ok( - $.isPlainObject(ev.data), - 'The data should be an object' - ); - - assert.equal( - ev.data.id, - 'One', - 'The data should be the unselected object' - ); - - assert.equal( - $element.val(), - 'placeholder', - 'The previous value should be unselected' - ); - }); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); -}); - -test('preventing the unselect event cancels the clearing', function (assert) { - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - $element.val('One'); - selection.update([{ - id: 'One', - text: 'One' - }]); - - selection.on('unselect', function (ev) { - ev.prevented = true; - }); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); - - assert.equal( - $element.val(), - 'One', - 'The placeholder should not have been set' - ); -}); - -test('clicking clear will trigger the clear event', function (assert) { - assert.expect(5); - - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - $element.val('One'); - selection.update([{ - id: 'One', - text: 'One' - }]); - - selection.on('clear', function (ev) { - assert.ok( - 'data' in ev && ev.data, - 'The event should have been triggered with the data property' - ); - - assert.ok( - $.isArray(ev.data), - 'The data should be an array' - ); - - assert.equal( - ev.data.length, - 1, - 'The data should contain one item for each value' - ); - - assert.equal( - ev.data[0].id, - 'One', - 'The data should contain unselected objects' - ); - - assert.equal( - $element.val(), - 'placeholder', - 'The previous value should be unselected' - ); - }); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); -}); - -test('preventing the clear event cancels the clearing', function (assert) { - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - $element.val('One'); - selection.update([{ - id: 'One', - text: 'One' - }]); - - selection.on('clear', function (ev) { - ev.prevented = true; - }); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); - - assert.equal( - $element.val(), - 'One', - 'The placeholder should not have been set' - ); -}); - -test('clear does not work when disabled', function (assert) { - var $element = $('#qunit-fixture .single-with-placeholder'); - - var selection = new AllowClearPlaceholder( - $element, - allowClearOptions - ); - var container = new MockContainer(); - - var $selection = selection.render(); - - selection.bind(container, $('
          ')); - - selection.update([{ - id: 'One', - text: 'One' - }]); - - $element.val('One'); - selection.options.set('disabled', true); - - var $remove = $selection.find('.select2-selection__clear'); - $remove.trigger('mousedown'); - - assert.equal( - $element.val(), - 'One', - 'The placeholder should not have been set' - ); -}); diff --git a/static/vendor/select2/tests/selection/containerCss-tests.js b/static/vendor/select2/tests/selection/containerCss-tests.js deleted file mode 100644 index 522703a2..00000000 --- a/static/vendor/select2/tests/selection/containerCss-tests.js +++ /dev/null @@ -1,104 +0,0 @@ -module('Dropdown - containerCssClass compatibility'); - -var $ = require('jquery'); -var Utils = require('select2/utils'); -var Options = require('select2/options'); - -var SingleSelection = require('select2/selection/single'); -var ContainerCSS = Utils.Decorate( - SingleSelection, - require('select2/compat/containerCss') -); - -test('all classes will be copied if :all: is used', function (assert) { - var $element = $(''); - var options = new Options({ - containerCssClass: ':all:' - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok($container.hasClass('test')); - assert.ok($container.hasClass('copy')); - assert.ok($container.hasClass('works')); - assert.ok(!$container.hasClass(':all:')); -}); - -test(':all: can be used with other classes', function (assert) { - var $element = $(''); - var options = new Options({ - containerCssClass: ':all: other' - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok($container.hasClass('test')); - assert.ok($container.hasClass('copy')); - assert.ok($container.hasClass('works')); - assert.ok($container.hasClass('other')); - assert.ok(!$container.hasClass(':all:')); -}); - -test('classes can be passed in as a string', function (assert) { - var $element = $(''); - var options = new Options({ - containerCssClass: 'other' - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok($container.hasClass('other')); -}); - -test('a function can be used based on the element', function (assert){ - var $element = $(''); - var options = new Options({ - containerCssClass: function ($element) { - return 'function'; - } - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok($container.hasClass('function')); - assert.ok(!$container.hasClass('test')); -}); - -test(':all: works around custom adapters', function (assert) { - var $element = $(''); - var options = new Options({ - containerCssClass: ':all: something', - adaptContainerCssClass: function (clazz) { - return clazz + '-modified'; - } - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok($container.hasClass('something')); - - assert.ok($container.hasClass('test')); - assert.ok($container.hasClass('test-modified')); -}); - -module('Selection - adaptContainerCss compatibility'); - -test('only return when adapted', function (assert) { - var $element = $(''); - var options = new Options({ - adaptContainerCssClass: function (clazz) { - return 'modified'; - } - }); - - var select = new ContainerCSS($element, options); - var $container = select.render(); - - assert.ok(!$container.hasClass('original')); - assert.ok($container.hasClass('modified')); -}); diff --git a/static/vendor/select2/tests/selection/multiple-tests.js b/static/vendor/select2/tests/selection/multiple-tests.js deleted file mode 100644 index 5e996ea6..00000000 --- a/static/vendor/select2/tests/selection/multiple-tests.js +++ /dev/null @@ -1,151 +0,0 @@ -module('Selection containers - Multiple'); - -var MultipleSelection = require('select2/selection/multiple'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var options = new Options({}); - -test('display uses templateSelection', function (assert) { - var called = false; - - var templateOptions = new Options({ - templateSelection: function (data) { - called = true; - - return data.text; - } - }); - - var selection = new MultipleSelection( - $('#qunit-fixture .multiple'), - templateOptions - ); - - var out = selection.display({ - text: 'test' - }); - - assert.ok(called); - - assert.equal(out, 'test'); -}); - -test('templateSelection can addClass', function (assert) { - var called = false; - - var templateOptions = new Options({ - templateSelection: function (data, container) { - called = true; - container.addClass('testclass'); - return data.text; - } - }); - - var selection = new MultipleSelection( - $('#qunit-fixture .multiple'), - templateOptions - ); - - var $container = selection.selectionContainer(); - - var out = selection.display({ - text: 'test' - }, $container); - - assert.ok(called); - - assert.equal(out, 'test'); - - assert.ok($container.hasClass('testclass')); -}); - -test('empty update clears the selection', function (assert) { - var selection = new MultipleSelection( - $('#qunit-fixture .multiple'), - options - ); - - var $selection = selection.render(); - var $rendered = $selection.find('.select2-selection__rendered'); - - $rendered.text('testing'); - $rendered.attr('title', 'testing'); - - selection.update([]); - - assert.equal($rendered.text(), ''); - assert.equal($rendered.attr('title'), undefined); -}); - -test('escapeMarkup is being used', function (assert) { - var selection = new MultipleSelection( - $('#qunit-fixture .multiple'), - options - ); - - var $selection = selection.render(); - var $rendered = $selection.find('.select2-selection__rendered'); - - var unescapedText = ''; - - selection.update([{ - text: unescapedText - }]); - - assert.equal( - $rendered.text().substr(1), - unescapedText, - 'The text should be escaped by default to prevent injection' - ); -}); - -test('clear button respects the disabled state', function (assert) { - var options = new Options({ - disabled: true - }); - - var $select = $('#qunit-fixture .multiple'); - - var container = new MockContainer(); - var $container = $('
          '); - - var selection = new MultipleSelection( - $select, - options - ); - - var $selection = selection.render(); - $container.append($selection); - - selection.bind(container, $container); - - // Select an option - selection.update([{ - text: 'Test' - }]); - - var $rendered = $selection.find('.select2-selection__rendered'); - - var $pill = $rendered.find('.select2-selection__choice'); - - assert.equal($pill.length, 1, 'There should only be one selection'); - - var $remove = $pill.find('.select2-selection__choice__remove'); - - assert.equal( - $remove.length, - 1, - 'The remove icon is displayed for the selection' - ); - - // Set up the unselect handler - selection.on('unselect', function (params) { - assert.ok(false, 'The unselect handler should not be triggered'); - }); - - // Trigger the handler for the remove icon - $remove.trigger('click'); -}); diff --git a/static/vendor/select2/tests/selection/placeholder-tests.js b/static/vendor/select2/tests/selection/placeholder-tests.js deleted file mode 100644 index 8a436ff3..00000000 --- a/static/vendor/select2/tests/selection/placeholder-tests.js +++ /dev/null @@ -1,74 +0,0 @@ -module('Selection containers - Placeholders'); - -var Placeholder = require('select2/selection/placeholder'); -var SingleSelection = require('select2/selection/single'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var SinglePlaceholder = Utils.Decorate(SingleSelection, Placeholder); - -var placeholderOptions = new Options({ - placeholder: { - id: 'placeholder', - text: 'This is the placeholder' - } -}); - -test('normalizing placeholder ignores objects', function (assert) { - var selection = new SinglePlaceholder( - $('#qunit-fixture .single'), - placeholderOptions - ); - - var original = { - id: 'test', - text: 'testing' - }; - - var normalized = selection.normalizePlaceholder(original); - - assert.equal(original, normalized); -}); - -test('normalizing placeholder gives object for string', function (assert) { - var selection = new SinglePlaceholder( - $('#qunit-fixture .single'), - placeholderOptions - ); - - var normalized = selection.normalizePlaceholder('placeholder'); - - assert.equal(normalized.id, ''); - assert.equal(normalized.text, 'placeholder'); -}); - - -test('text is shown for placeholder option on single', function (assert) { - var selection = new SinglePlaceholder( - $('#qunit-fixture .single'), - placeholderOptions - ); - - var $selection = selection.render(); - - selection.update([{ - id: 'placeholder' - }]); - - assert.equal($selection.text(), 'This is the placeholder'); -}); - -test('placeholder is shown when no options are selected', function (assert) { - var selection = new SinglePlaceholder( - $('#qunit-fixture .multiple'), - placeholderOptions - ); - - var $selection = selection.render(); - - selection.update([]); - - assert.equal($selection.text(), 'This is the placeholder'); -}); diff --git a/static/vendor/select2/tests/selection/search-tests.js b/static/vendor/select2/tests/selection/search-tests.js deleted file mode 100644 index 43345d72..00000000 --- a/static/vendor/select2/tests/selection/search-tests.js +++ /dev/null @@ -1,191 +0,0 @@ -module('Selection containers - Inline search'); - -var MultipleSelection = require('select2/selection/multiple'); -var InlineSearch = require('select2/selection/search'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var options = new Options({}); - -test('backspace will remove a choice', function (assert) { - assert.expect(3); - - var KEYS = require('select2/keys'); - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - - var $element = $('#qunit-fixture .multiple'); - var selection = new CustomSelection($element, options); - - var $selection = selection.render(); - selection.bind(container, $container); - - // The unselect event should be triggered at some point - selection.on('unselect', function () { - assert.ok(true, 'A choice was unselected'); - }); - - // Add some selections and render the search - selection.update([ - { - id: '1', - text: 'One' - } - ]); - - var $search = $selection.find('input'); - var $choices = $selection.find('.select2-selection__choice'); - - assert.equal($search.length, 1, 'The search was visible'); - assert.equal($choices.length, 1, 'The choice was rendered'); - - // Trigger the backspace on the search - var backspace = $.Event('keydown', { - which: KEYS.BACKSPACE - }); - $search.trigger(backspace); -}); - -test('backspace will set the search text', function (assert) { - assert.expect(3); - - var KEYS = require('select2/keys'); - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - - var $element = $('#qunit-fixture .multiple'); - var selection = new CustomSelection($element, options); - - var $selection = selection.render(); - selection.bind(container, $container); - - // Add some selections and render the search - selection.update([ - { - id: '1', - text: 'One' - } - ]); - - var $search = $selection.find('input'); - var $choices = $selection.find('.select2-selection__choice'); - - assert.equal($search.length, 1, 'The search was visible'); - assert.equal($choices.length, 1, 'The choice was rendered'); - - // Trigger the backspace on the search - var backspace = $.Event('keydown', { - which: KEYS.BACKSPACE - }); - $search.trigger(backspace); - - assert.equal($search.val(), 'One', 'The search text was set'); -}); - -test('updating selection does not shift the focus', function (assert) { - // Check for IE 8, which triggers a false negative during testing - if (window.attachEvent && !window.addEventListener) { - // We must expect 0 assertions or the test will fail - assert.expect(0); - return; - } - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - - var $element = $('#qunit-fixture .multiple'); - var selection = new CustomSelection($element, options); - - var $selection = selection.render(); - selection.bind(container, $container); - - // Update the selection so the search is rendered - selection.update([]); - - // Make it visible so the browser can place focus on the search - $container.append($selection); - - var $search = $selection.find('input'); - $search.trigger('focus'); - - assert.equal($search.length, 1, 'The search was not visible'); - - assert.equal( - document.activeElement, - $search[0], - 'The search did not have focus originally' - ); - - // Trigger an update, this should redraw the search box - selection.update([]); - - assert.equal($search.length, 1, 'The search box disappeared'); - - assert.equal( - document.activeElement, - $search[0], - 'The search did not have focus after the selection was updated' - ); -}); - -test('the focus event shifts the focus', function (assert) { - // Check for IE 8, which triggers a false negative during testing - if (window.attachEvent && !window.addEventListener) { - // We must expect 0 assertions or the test will fail - assert.expect(0); - return; - } - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var CustomSelection = Utils.Decorate(MultipleSelection, InlineSearch); - - var $element = $('#qunit-fixture .multiple'); - var selection = new CustomSelection($element, options); - - var $selection = selection.render(); - selection.bind(container, $container); - - // Update the selection so the search is rendered - selection.update([]); - - // Make it visible so the browser can place focus on the search - $container.append($selection); - - // The search should not be automatically focused - - var $search = $selection.find('input'); - - assert.notEqual( - document.activeElement, - $search[0], - 'The search had focus originally' - ); - - assert.equal($search.length, 1, 'The search was not visible'); - - // Focus the container - - container.trigger('focus'); - - // Make sure it focuses the search - - assert.equal($search.length, 1, 'The search box disappeared'); - - assert.equal( - document.activeElement, - $search[0], - 'The search did not have focus originally' - ); -}); \ No newline at end of file diff --git a/static/vendor/select2/tests/selection/single-tests.js b/static/vendor/select2/tests/selection/single-tests.js deleted file mode 100644 index 9ab16367..00000000 --- a/static/vendor/select2/tests/selection/single-tests.js +++ /dev/null @@ -1,119 +0,0 @@ -module('Selection containers - Single'); - -var SingleSelection = require('select2/selection/single'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var options = new Options({}); - -test('display uses templateSelection', function (assert) { - var called = false; - - var templateOptions = new Options({ - templateSelection: function (data) { - called = true; - - return data.text; - } - }); - - var selection = new SingleSelection( - $('#qunit-fixture .single'), - templateOptions - ); - - var out = selection.display({ - text: 'test' - }); - - assert.ok(called); - - assert.equal(out, 'test'); -}); - -test('templateSelection can addClass', function (assert) { - var called = false; - - var templateOptions = new Options({ - templateSelection: function (data, container) { - called = true; - container.addClass('testclass'); - return data.text; - } - }); - - var selection = new SingleSelection( - $('#qunit-fixture .single'), - templateOptions - ); - - var $container = selection.selectionContainer(); - - var out = selection.display({ - text: 'test' - }, $container); - - assert.ok(called); - - assert.equal(out, 'test'); - - assert.ok($container.hasClass('testclass')); -}); - -test('empty update clears the selection', function (assert) { - var selection = new SingleSelection( - $('#qunit-fixture .single'), - options - ); - - var $selection = selection.render(); - var $rendered = $selection.find('.select2-selection__rendered'); - - $rendered.text('testing'); - $rendered.attr('title', 'testing'); - - selection.update([]); - - assert.equal($rendered.text(), ''); - assert.equal($rendered.attr('title'), undefined); -}); - -test('update renders the data text', function (assert) { - var selection = new SingleSelection( - $('#qunit-fixture .single'), - options - ); - - var $selection = selection.render(); - var $rendered = $selection.find('.select2-selection__rendered'); - - selection.update([{ - text: 'test' - }]); - - assert.equal($rendered.text(), 'test'); -}); - -test('escapeMarkup is being used', function (assert) { - var selection = new SingleSelection( - $('#qunit-fixture .single'), - options - ); - - var $selection = selection.render(); - var $rendered = $selection.find('.select2-selection__rendered'); - - var unescapedText = ''; - - selection.update([{ - text: unescapedText - }]); - - assert.equal( - $rendered.text(), - unescapedText, - 'The text should be escaped by default to prevent injection' - ); -}); diff --git a/static/vendor/select2/tests/selection/stopPropagation-tests.js b/static/vendor/select2/tests/selection/stopPropagation-tests.js deleted file mode 100644 index d8d8897b..00000000 --- a/static/vendor/select2/tests/selection/stopPropagation-tests.js +++ /dev/null @@ -1,33 +0,0 @@ -module('Selection containers - Stoping event propagation'); - -var SingleSelection = require('select2/selection/single'); -var StopPropagation = require('select2/selection/stopPropagation'); - -var $ = require('jquery'); -var Options = require('select2/options'); -var Utils = require('select2/utils'); - -var CutomSelection = Utils.Decorate(SingleSelection, StopPropagation); - -var options = new Options(); - -test('click event does not propagate', function (assert) { - assert.expect(1); - - var $container = $('#qunit-fixture .event-container'); - var container = new MockContainer(); - - var selection = new CutomSelection($('#qunit-fixture select'), options); - - var $selection = selection.render(); - selection.bind(container, $container); - - $container.append($selection); - $container.on('click', function () { - assert.ok(false, 'The click event should have been stopped'); - }); - - $selection.trigger('click'); - - assert.ok(true, 'Something went wrong if this failed'); -}); diff --git a/static/vendor/select2/tests/unit-jq1.html b/static/vendor/select2/tests/unit-jq1.html deleted file mode 100644 index 7de1bfa2..00000000 --- a/static/vendor/select2/tests/unit-jq1.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - -
          -
          -
          - -
          - - - - - - - - - - - - - - - - -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/unit-jq2.html b/static/vendor/select2/tests/unit-jq2.html deleted file mode 100644 index eb7eb12d..00000000 --- a/static/vendor/select2/tests/unit-jq2.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - -
          -
          -
          - -
          - - - - - - - - - - - - - - - - -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/unit-jq3.html b/static/vendor/select2/tests/unit-jq3.html deleted file mode 100644 index a14fa9e6..00000000 --- a/static/vendor/select2/tests/unit-jq3.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - -
          -
          -
          - -
          - - - - - - - - - - - - - - - - -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/vendor/select2/tests/utils/decorator-tests.js b/static/vendor/select2/tests/utils/decorator-tests.js deleted file mode 100644 index 4888991f..00000000 --- a/static/vendor/select2/tests/utils/decorator-tests.js +++ /dev/null @@ -1,189 +0,0 @@ -module('Decorators'); - -var Utils = require('select2/utils'); - -test('overridden - method', function (assert) { - function BaseClass () {} - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass () {} - - DecoratorClass.prototype.hello = function () { - return 'B'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.strictEqual(inst.hello(), 'B'); -}); - -test('overridden - constructor', function (assert) { - function BaseClass () { - this.inherited = true; - } - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass (decorated) { - this.called = true; - } - - DecoratorClass.prototype.other = function () { - return 'B'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.ok(inst.called); - assert.ok(!inst.inherited); -}); - -test('not overridden - method', function (assert) { - function BaseClass () {} - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass () {} - - DecoratorClass.prototype.other = function () { - return 'B'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.strictEqual(inst.hello(), 'A'); -}); - -test('not overridden - constructor', function (assert) { - function BaseClass () { - this.called = true; - } - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass () {} - - DecoratorClass.prototype.other = function () { - return 'B'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.ok(inst.called); -}); - -test('inherited - method', function (assert) { - function BaseClass () {} - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass (decorated) {} - - DecoratorClass.prototype.hello = function (decorated) { - return 'B' + decorated.call(this) + 'C'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.strictEqual(inst.hello(), 'BAC'); -}); - -test('inherited - constructor', function (assert) { - function BaseClass () { - this.inherited = true; - } - - BaseClass.prototype.hello = function () { - return 'A'; - }; - - function DecoratorClass (decorated) { - this.called = true; - - decorated.call(this); - } - - DecoratorClass.prototype.other = function () { - return 'B'; - }; - - var DecoratedClass = Utils.Decorate(BaseClass, DecoratorClass); - - var inst = new DecoratedClass(); - - assert.ok(inst.called); - assert.ok(inst.inherited); -}); - -test('inherited - three levels', function (assert) { - function BaseClass (testArgument) { - this.baseCalled = true; - this.baseTestArgument = testArgument; - } - - BaseClass.prototype.test = function (a) { - return a + 'c'; - }; - - function MiddleClass (decorated, testArgument) { - this.middleCalled = true; - this.middleTestArgument = testArgument; - - decorated.call(this, testArgument); - } - - MiddleClass.prototype.test = function (decorated, a) { - return decorated.call(this, a + 'b'); - }; - - function DecoratorClass (decorated, testArgument) { - this.decoratorCalled = true; - this.decoratorTestArgument = testArgument; - - decorated.call(this, testArgument); - } - - DecoratorClass.prototype.test = function (decorated, a) { - return decorated.call(this, a + 'a'); - }; - - var DecoratedClass = Utils.Decorate( - Utils.Decorate(BaseClass, MiddleClass), - DecoratorClass - ); - - var inst = new DecoratedClass('test'); - - assert.ok(inst.baseCalled, 'The base class contructor was called'); - assert.ok(inst.middleCalled, 'The middle class constructor was called'); - assert.ok(inst.decoratorCalled, 'The decorator constructor was called'); - - assert.strictEqual(inst.baseTestArgument, 'test'); - assert.strictEqual(inst.middleTestArgument, 'test'); - assert.strictEqual(inst.decoratorTestArgument, 'test'); - - var out = inst.test('test'); - - assert.strictEqual(out, 'testabc'); -}); diff --git a/static/vendor/select2/tests/utils/escapeMarkup-tests.js b/static/vendor/select2/tests/utils/escapeMarkup-tests.js deleted file mode 100644 index 726f09de..00000000 --- a/static/vendor/select2/tests/utils/escapeMarkup-tests.js +++ /dev/null @@ -1,36 +0,0 @@ -module('Utils - escapeMarkup'); - -var Utils = require('select2/utils'); - -test('text passes through', function (assert) { - var text = 'testing this'; - var escaped = Utils.escapeMarkup(text); - - assert.equal(text, escaped); -}); - -test('html tags are escaped', function (assert) { - var text = ''; - var escaped = Utils.escapeMarkup(text); - - assert.notEqual(text, escaped); - assert.equal(escaped.indexOf(' +{% endblock %} diff --git a/templates/member/signup.html b/templates/registration/signup.html similarity index 100% rename from templates/member/signup.html rename to templates/registration/signup.html From b1cd46bf7de7533078ba34b59072fac05950d7cc Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 08:01:51 +0200 Subject: [PATCH 46/66] Invalidate registrations, fix profile creation --- apps/member/signals.py | 4 +- apps/member/views.py | 13 +++-- apps/registration/urls.py | 6 ++- apps/registration/views.py | 47 +++++++++++++--- apps/treasury/forms.py | 2 +- .../account_activation_email.html | 2 +- .../registration/future_profile_detail.html | 54 +++++++++++++++++++ templates/registration/future_user_list.html | 14 +++-- 8 files changed, 121 insertions(+), 21 deletions(-) create mode 100644 templates/registration/future_profile_detail.html diff --git a/apps/member/signals.py b/apps/member/signals.py index 2b03e3ce..fbb66c1f 100644 --- a/apps/member/signals.py +++ b/apps/member/signals.py @@ -10,7 +10,7 @@ def save_user_profile(instance, created, raw, **_kwargs): # When provisionning data, do not try to autocreate return - if created: + if created and instance.is_active: from .models import Profile Profile.objects.get_or_create(user=instance) - instance.profile.save() + instance.profile.save() diff --git a/apps/member/views.py b/apps/member/views.py index 29b16222..ed5826ef 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -102,11 +102,8 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return super().form_valid(form) def get_success_url(self, **kwargs): - if kwargs: - return reverse_lazy('member:user_detail', - kwargs={'pk': kwargs['id']}) - else: - return reverse_lazy('member:user_detail', args=(self.object.id,)) + url = 'member:user_detail' if self.object.profile.registration_valid else 'registration:future_user_detail' + return reverse_lazy(url, args=(self.object.id,)) class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): @@ -117,6 +114,12 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context_object_name = "user_object" template_name = "member/profile_detail.html" + def get_queryset(self, **kwargs): + """ + We can't display information of a not registered user. + """ + return super().get_queryset().filter(profile__registration_valid=True) + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) user = context['user_object'] diff --git a/apps/registration/urls.py b/apps/registration/urls.py index ce2977dc..ae9b2fca 100644 --- a/apps/registration/urls.py +++ b/apps/registration/urls.py @@ -8,7 +8,9 @@ from . import views app_name = 'registration' urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), - path('validate_email/sent', views.UserActivationEmailSentView.as_view(), name='account_activation_sent'), - path('validate_email//', views.UserActivateView.as_view(), name='account_activation'), + path('validate_email/sent/', views.UserActivationEmailSentView.as_view(), name='account_activation_sent'), + path('validate_email///', views.UserActivateView.as_view(), name='account_activation'), path('validate_user/', views.FutureUserListView.as_view(), name="future_user_list"), + path('validate_user//', views.FutureUserDetailView.as_view(), name="future_user_detail"), + path('validate_user//invalidate/', views.FutureUserInvalidateView.as_view(), name="future_user_invalidate"), ] diff --git a/apps/registration/views.py b/apps/registration/views.py index 543f2fb9..7f06f92f 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -5,15 +5,18 @@ from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.core.exceptions import ValidationError -from django.shortcuts import resolve_url +from django.shortcuts import resolve_url, redirect from django.urls import reverse_lazy from django.utils.decorators import method_decorator from django.utils.http import urlsafe_base64_decode from django.utils.translation import gettext_lazy as _ +from django.views import View from django.views.decorators.csrf import csrf_protect -from django.views.generic import CreateView, TemplateView +from django.views.generic import CreateView, TemplateView, DetailView from django_tables2 import SingleTableView from member.forms import ProfileForm +from member.models import Profile +from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .forms import SignUpForm @@ -42,15 +45,19 @@ class UserCreateView(CreateView): If the form is valid, then the user is created with is_active set to False so that the user cannot log in until the email has been validated. """ - profile_form = ProfileForm(self.request.POST) + profile_form = ProfileForm(data=self.request.POST) if not profile_form.is_valid(): return self.form_invalid(form) user = form.save(commit=False) user.is_active = False - user.profile = profile_form.save(commit=False) + profile_form.instance.user = user + profile = profile_form.save(commit=False) + user.profile = profile user.save() - user.profile.save() + user.refresh_from_db() + profile.user = user + profile.save() user.profile.send_email_validation_link() @@ -86,7 +93,6 @@ class UserActivateView(TemplateView): return self.render_to_response(self.get_context_data()) def get_user(self, uidb64): - print(uidb64) try: # urlsafe_base64_decode() decodes to bytestring uid = urlsafe_base64_decode(uidb64).decode() @@ -131,3 +137,32 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi return context + +class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + Affiche les informations sur un utilisateur, sa note, ses clubs... + """ + model = User + context_object_name = "user_object" + template_name = "registration/future_profile_detail.html" + + def get_queryset(self, **kwargs): + """ + We only display information of a not registered user. + """ + return super().get_queryset().filter(profile__registration_valid=False) + + +class FutureUserInvalidateView(ProtectQuerysetMixin, LoginRequiredMixin, View): + """ + Affiche les informations sur un utilisateur, sa note, ses clubs... + """ + + def dispatch(self, request, *args, **kwargs): + user = User.objects.filter(profile__registration_valid=False)\ + .filter(PermissionBackend.filter_queryset(request.user, User, "change", "is_valid"))\ + .get(pk=self.kwargs["pk"]) + + user.delete() + + return redirect('registration:future_user_list') diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index ad479e14..b09a46c7 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -53,7 +53,7 @@ ProductFormSet = forms.inlineformset_factory( class ProductFormSetHelper(FormHelper): """ - Specify some template informations for the product form. + Specify some template information for the product form. """ def __init__(self, form=None): diff --git a/templates/registration/account_activation_email.html b/templates/registration/account_activation_email.html index e8f2032d..252b83c7 100644 --- a/templates/registration/account_activation_email.html +++ b/templates/registration/account_activation_email.html @@ -2,7 +2,7 @@ Hi {{ user.username }}, Welcome to {{ site_name }}. Please click on the link below to confirm your registration. -{{ protocol }}://{{ domain }}{% url 'member:account_activation' uidb64=uid token=token %} +{{ protocol }}://{{ domain }}{% url 'registration:account_activation' uidb64=uid token=token %} This link is only valid for a couple of days, after that you will need to contact us to validate your email. diff --git a/templates/registration/future_profile_detail.html b/templates/registration/future_profile_detail.html new file mode 100644 index 00000000..9b7449e2 --- /dev/null +++ b/templates/registration/future_profile_detail.html @@ -0,0 +1,54 @@ +{% extends "base.html" %} +{% load static %} +{% load i18n %} +{% load render_table from django_tables2 %} +{% load pretty_money %} + +{% block content %} + +
          +
          +

          {% trans "Account #" %} {{ object.pk }}

          +
          +
          +
          +
          {% trans 'name'|capfirst %}, {% trans 'first name' %}
          +
          {{ object.last_name }} {{ object.first_name }}
          + +
          {% trans 'username'|capfirst %}
          +
          {{ object.username }}
          + +
          {% trans 'email'|capfirst %}
          +
          {{ object.email }}
          + +
          {% trans 'password'|capfirst %}
          +
          + + {% trans 'Change password' %} + +
          + +
          {% trans 'section'|capfirst %}
          +
          {{ object.profile.section }}
          + +
          {% trans 'address'|capfirst %}
          +
          {{ object.profile.address }}
          + +
          {% trans 'phone number'|capfirst %}
          +
          {{ object.profile.phone_number }}
          + +
          {% trans 'paid'|capfirst %}
          +
          {{ object.profile.paid|yesno }}
          +
          + + {% if object.pk == user.pk %} + {% trans 'Manage auth token' %} + {% endif %} +
          +
          + {% trans 'Update Profile' %} + {% trans 'Delete registration' %} +
          +
          + +{% endblock %} \ No newline at end of file diff --git a/templates/registration/future_user_list.html b/templates/registration/future_user_list.html index e500ee19..490fe2ab 100644 --- a/templates/registration/future_user_list.html +++ b/templates/registration/future_user_list.html @@ -4,13 +4,19 @@ {% load i18n %} {% block content %} -
          - {% render_table table %} -
          +
          - + {% if table.data %} +
          + {% render_table table %} +
          + {% else %} +
          + {% trans "There is no pending user." %} +
          + {% endif %} {% endblock %} {% block extrajavascript %} From fbc25240e68b5282da82c0786627bec3973bab2d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 09:09:21 +0200 Subject: [PATCH 47/66] Validate registrations, closes #14, #18, #19 --- apps/member/models.py | 1 + apps/note/admin.py | 13 ++- apps/registration/forms.py | 46 +++++++++ apps/registration/views.py | 97 ++++++++++++++++++- note_kfet/inputs.py | 2 +- .../registration/future_profile_detail.html | 95 ++++++++++-------- 6 files changed, 204 insertions(+), 50 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 46051fe1..9f1b341b 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -230,6 +230,7 @@ class Membership(models.Model): ) date_start = models.DateField( + default=datetime.date.today, verbose_name=_('membership starts on'), ) diff --git a/apps/note/admin.py b/apps/note/admin.py index 7b4ba870..dc6470d2 100644 --- a/apps/note/admin.py +++ b/apps/note/admin.py @@ -8,7 +8,7 @@ from polymorphic.admin import PolymorphicChildModelAdmin, \ from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \ - RecurrentTransaction, MembershipTransaction + RecurrentTransaction, MembershipTransaction, SpecialTransaction class AliasInlines(admin.TabularInline): @@ -102,7 +102,7 @@ class TransactionAdmin(PolymorphicParentModelAdmin): """ Admin customisation for Transaction """ - child_models = (RecurrentTransaction, MembershipTransaction) + child_models = (RecurrentTransaction, MembershipTransaction, SpecialTransaction) list_display = ('created_at', 'poly_source', 'poly_destination', 'quantity', 'amount', 'valid') list_filter = ('valid',) @@ -141,7 +141,14 @@ class TransactionAdmin(PolymorphicParentModelAdmin): @admin.register(MembershipTransaction) class MembershipTransactionAdmin(PolymorphicChildModelAdmin): """ - Admin customisation for Transaction + Admin customisation for MembershipTransaction + """ + + +@admin.register(SpecialTransaction) +class SpecialTransactionAdmin(PolymorphicChildModelAdmin): + """ + Admin customisation for SpecialTransaction """ diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 3f4063d5..656f2243 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -1,9 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from django import forms from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.models import User from django.utils.translation import gettext_lazy as _ +from note.models import NoteSpecial +from note_kfet.inputs import AmountInput class SignUpForm(UserCreationForm): @@ -19,3 +22,46 @@ class SignUpForm(UserCreationForm): class Meta: model = User fields = ('first_name', 'last_name', 'username', 'email', ) + + +class ValidationForm(forms.Form): + credit_type = forms.ModelChoiceField( + queryset=NoteSpecial.objects, + label=_("Credit type"), + empty_label=_("No credit"), + required=False, + ) + + credit_amount = forms.IntegerField( + label=_("Credit amount"), + required=False, + initial=0, + widget=AmountInput(), + ) + + last_name = forms.CharField( + label=_("Last name"), + required=False, + ) + + first_name = forms.CharField( + label=_("First name"), + required=False, + ) + + bank = forms.CharField( + label=_("Bank"), + required=False, + ) + + join_BDE = forms.BooleanField( + label=_("Join BDE"), + required=False, + initial=True, + ) + + join_Kfet = forms.BooleanField( + label=_("Join Kfet"), + required=False, + initial=True, + ) diff --git a/apps/registration/views.py b/apps/registration/views.py index 7f06f92f..0f09cda4 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -12,14 +12,16 @@ from django.utils.http import urlsafe_base64_decode from django.utils.translation import gettext_lazy as _ from django.views import View from django.views.decorators.csrf import csrf_protect -from django.views.generic import CreateView, TemplateView, DetailView +from django.views.generic import CreateView, TemplateView, DetailView, FormView from django_tables2 import SingleTableView from member.forms import ProfileForm -from member.models import Profile +from member.models import Membership, Club +from note.models import SpecialTransaction +from note.templatetags.pretty_money import pretty_money from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin -from .forms import SignUpForm +from .forms import SignUpForm, ValidationForm from .tables import FutureUserTable from .tokens import account_activation_token @@ -138,11 +140,12 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi return context -class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): +class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, FormView): """ Affiche les informations sur un utilisateur, sa note, ses clubs... """ model = User + form_class = ValidationForm context_object_name = "user_object" template_name = "registration/future_profile_detail.html" @@ -152,6 +155,92 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView) """ return super().get_queryset().filter(profile__registration_valid=False) + def get_form(self, form_class=None): + form = super().get_form(form_class) + user = self.get_object() + form.fields["last_name"].initial = user.last_name + form.fields["first_name"].initial = user.first_name + return form + + def form_valid(self, form): + user = self.object = self.get_object() + + print(form.cleaned_data) + credit_type = form.cleaned_data["credit_type"] + credit_amount = form.cleaned_data["credit_amount"] + last_name = form.cleaned_data["last_name"] + first_name = form.cleaned_data["first_name"] + bank = form.cleaned_data["bank"] + join_BDE = form.cleaned_data["join_BDE"] + join_Kfet = form.cleaned_data["join_Kfet"] + + fee = 0 + bde = Club.objects.get(name="BDE") + bde_fee = bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid + if join_BDE: + fee += bde_fee + kfet = Club.objects.get(name="Kfet") + kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + if join_Kfet: + fee += kfet_fee + + if join_Kfet and not join_BDE: + form.add_error('join_Kfet', _("You must join BDE club before joining Kfet club.")) + + if fee > credit_amount: + form.add_error('credit_type', + _("The entered amount is not enough for the memberships, should be at least {}") + .format(pretty_money(fee))) + return self.form_invalid(form) + + if credit_type is not None and credit_amount > 0: + if not last_name or not first_name or not bank: + if not last_name: + form.add_error('last_name', _("This field is required.")) + if not first_name: + form.add_error('first_name', _("This field is required.")) + if not bank: + form.add_error('bank', _("This field is required.")) + return self.form_invalid(form) + + ret = super().form_valid(form) + user.is_active = True + user.profile.registration_valid = True + user.save() + user.profile.save() + + if credit_type is not None and credit_amount > 0: + SpecialTransaction.objects.create( + source=credit_type, + destination=user.note, + quantity=1, + amount=credit_amount, + reason="Crédit " + credit_type.special_type + " (Inscription)", + last_name=last_name, + first_name=first_name, + bank=bank, + valid=True, + ) + + if join_BDE: + Membership.objects.create( + club=bde, + user=user, + fee=bde_fee, + ) + + if join_Kfet: + Membership.objects.create( + club=kfet, + user=user, + fee=kfet_fee, + ) + + return ret + + def get_success_url(self): + return reverse_lazy('member:user_detail', args=(self.get_object().pk, )) + class FutureUserInvalidateView(ProtectQuerysetMixin, LoginRequiredMixin, View): """ diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index ecd758e0..b3cccbce 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -13,7 +13,7 @@ class AmountInput(NumberInput): template_name = "note/amount_input.html" def format_value(self, value): - return None if value is None or value == "" else "{:.02f}".format(value / 100, ) + return None if value is None or value == "" else "{:.02f}".format(int(value) / 100, ) def value_from_datadict(self, data, files, name): val = super().value_from_datadict(data, files, name) diff --git a/templates/registration/future_profile_detail.html b/templates/registration/future_profile_detail.html index 9b7449e2..2172749a 100644 --- a/templates/registration/future_profile_detail.html +++ b/templates/registration/future_profile_detail.html @@ -1,54 +1,65 @@ {% extends "base.html" %} {% load static %} {% load i18n %} -{% load render_table from django_tables2 %} +{% load crispy_forms_tags %} {% load pretty_money %} {% block content %} +
          +
          +

          {% trans "Account #" %} {{ object.pk }}

          +
          +
          +
          +
          {% trans 'name'|capfirst %}, {% trans 'first name' %}
          +
          {{ object.last_name }} {{ object.first_name }}
          -
          -
          -

          {% trans "Account #" %} {{ object.pk }}

          +
          {% trans 'username'|capfirst %}
          +
          {{ object.username }}
          + +
          {% trans 'email'|capfirst %}
          +
          {{ object.email }}
          + +
          {% trans 'password'|capfirst %}
          +
          + + {% trans 'Change password' %} + +
          + +
          {% trans 'section'|capfirst %}
          +
          {{ object.profile.section }}
          + +
          {% trans 'address'|capfirst %}
          +
          {{ object.profile.address }}
          + +
          {% trans 'phone number'|capfirst %}
          +
          {{ object.profile.phone_number }}
          + +
          {% trans 'paid'|capfirst %}
          +
          {{ object.profile.paid|yesno }}
          +
          +
          +
          + {% trans 'Update Profile' %} + {% trans 'Delete registration' %} +
          -
          -
          -
          {% trans 'name'|capfirst %}, {% trans 'first name' %}
          -
          {{ object.last_name }} {{ object.first_name }}
          -
          {% trans 'username'|capfirst %}
          -
          {{ object.username }}
          +
          -
          {% trans 'email'|capfirst %}
          -
          {{ object.email }}
          - -
          {% trans 'password'|capfirst %}
          -
          - - {% trans 'Change password' %} - -
          - -
          {% trans 'section'|capfirst %}
          -
          {{ object.profile.section }}
          - -
          {% trans 'address'|capfirst %}
          -
          {{ object.profile.address }}
          - -
          {% trans 'phone number'|capfirst %}
          -
          {{ object.profile.phone_number }}
          - -
          {% trans 'paid'|capfirst %}
          -
          {{ object.profile.paid|yesno }}
          -
          - - {% if object.pk == user.pk %} - {% trans 'Manage auth token' %} - {% endif %} +
          +
          +
          +

          {% trans "Validate account" %}

          +
          +
          + {% csrf_token %} + {{ form|crispy }} +
          +
          + +
          +
          -
          - {% trans 'Update Profile' %} - {% trans 'Delete registration' %} -
          -
          - {% endblock %} \ No newline at end of file From 3516b1fa044f619536393645312729e62e4b42d7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 09:48:23 +0200 Subject: [PATCH 48/66] Add links to resend mail confirmations --- apps/member/models.py | 6 ++-- apps/registration/tokens.py | 2 +- apps/registration/urls.py | 6 ++-- apps/registration/views.py | 31 ++++++++++++++----- templates/member/profile_tables.html | 9 ++++++ ...te.html => email_validation_complete.html} | 0 ...email.html => email_validation_email.html} | 2 +- ....html => email_validation_email_sent.html} | 0 .../registration/future_profile_detail.html | 11 ++++++- 9 files changed, 51 insertions(+), 16 deletions(-) rename templates/registration/{account_activation_complete.html => email_validation_complete.html} (100%) rename templates/registration/{account_activation_email.html => email_validation_email.html} (72%) rename templates/registration/{account_activation_email_sent.html => email_validation_email_sent.html} (100%) diff --git a/apps/member/models.py b/apps/member/models.py index 9f1b341b..2cbb71eb 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -12,7 +12,7 @@ from django.urls import reverse, reverse_lazy from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ -from registration.tokens import account_activation_token +from registration.tokens import email_validation_token from note.models import MembershipTransaction @@ -73,13 +73,13 @@ class Profile(models.Model): def send_email_validation_link(self): subject = "Activate your Note Kfet account" - message = loader.render_to_string('registration/account_activation_email.html', + message = loader.render_to_string('registration/email_validation_email.html', { 'user': self.user, 'domain': "nk20.ynerant.fr", 'site_name': "La Note Kfet", 'protocol': 'https', - 'token': account_activation_token.make_token(self.user), + 'token': email_validation_token.make_token(self.user), 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)).decode('UTF-8'), }) self.user.email_user(subject, message) diff --git a/apps/registration/tokens.py b/apps/registration/tokens.py index f45c00de..c5ddc82b 100644 --- a/apps/registration/tokens.py +++ b/apps/registration/tokens.py @@ -27,4 +27,4 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator): return str(user.pk) + str(user.profile.email_confirmed) + str(login_timestamp) + str(timestamp) -account_activation_token = AccountActivationTokenGenerator() +email_validation_token = AccountActivationTokenGenerator() diff --git a/apps/registration/urls.py b/apps/registration/urls.py index ae9b2fca..14678cbb 100644 --- a/apps/registration/urls.py +++ b/apps/registration/urls.py @@ -8,8 +8,10 @@ from . import views app_name = 'registration' urlpatterns = [ path('signup/', views.UserCreateView.as_view(), name="signup"), - path('validate_email/sent/', views.UserActivationEmailSentView.as_view(), name='account_activation_sent'), - path('validate_email///', views.UserActivateView.as_view(), name='account_activation'), + path('validate_email/sent/', views.UserValidationEmailSentView.as_view(), name='email_validation_sent'), + path('validate_email/resend//', views.UserResendValidationEmailView.as_view(), + name='email_validation_resend'), + path('validate_email///', views.UserValidateView.as_view(), name='email_validation'), path('validate_user/', views.FutureUserListView.as_view(), name="future_user_list"), path('validate_user//', views.FutureUserDetailView.as_view(), name="future_user_detail"), path('validate_user//invalidate/', views.FutureUserInvalidateView.as_view(), name="future_user_invalidate"), diff --git a/apps/registration/views.py b/apps/registration/views.py index 0f09cda4..2ce349c4 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -16,14 +16,14 @@ from django.views.generic import CreateView, TemplateView, DetailView, FormView from django_tables2 import SingleTableView from member.forms import ProfileForm from member.models import Membership, Club -from note.models import SpecialTransaction +from note.models import SpecialTransaction, Transaction from note.templatetags.pretty_money import pretty_money from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .forms import SignUpForm, ValidationForm from .tables import FutureUserTable -from .tokens import account_activation_token +from .tokens import email_validation_token class UserCreateView(CreateView): @@ -32,7 +32,7 @@ class UserCreateView(CreateView): """ form_class = SignUpForm - success_url = reverse_lazy('registration:account_activation_sent') + success_url = reverse_lazy('registration:email_validation_sent') template_name = 'registration/signup.html' second_form = ProfileForm @@ -66,9 +66,9 @@ class UserCreateView(CreateView): return super().form_valid(form) -class UserActivateView(TemplateView): +class UserValidateView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): title = _("Account Activation") - template_name = 'registration/account_activation_complete.html' + template_name = 'registration/email_validation_complete.html' @method_decorator(csrf_protect) def dispatch(self, *args, **kwargs): @@ -84,7 +84,7 @@ class UserActivateView(TemplateView): user = self.get_user(kwargs['uidb64']) token = kwargs['token'] - if user is not None and account_activation_token.check_token(user, token): + if user is not None and email_validation_token.check_token(user, token): self.validlink = True user.is_active = True user.profile.email_confirmed = True @@ -116,11 +116,26 @@ class UserActivateView(TemplateView): return context -class UserActivationEmailSentView(TemplateView): - template_name = 'registration/account_activation_email_sent.html' +class UserValidationEmailSentView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): + template_name = 'registration/email_validation_email_sent.html' title = _('Account activation email sent') +class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, DetailView): + model = User + + def get_queryset(self, **kwargs): + return super().get_queryset(**kwargs).filter(profile__email_confirmed=False) + + def get(self, request, *args, **kwargs): + user = self.get_object() + + user.profile.send_email_validation_link() + + url = 'member:user_detail' if user.profile.registration_valid else 'registration:future_user_detail' + return redirect(url, user.id) + + class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ Affiche la liste des utilisateurs, avec une fonction de recherche statique diff --git a/templates/member/profile_tables.html b/templates/member/profile_tables.html index 9d2c687f..9016289a 100644 --- a/templates/member/profile_tables.html +++ b/templates/member/profile_tables.html @@ -1,5 +1,14 @@ {% load render_table from django_tables2 %} {% load i18n %} +{% load perms %} + +{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:object.profile %} +
          + {% trans "This user doesn't have confirmed his/her e-mail address." %} + {% trans "Click here to resend a validation link." %} +
          +{% endif %} +
          diff --git a/templates/registration/account_activation_complete.html b/templates/registration/email_validation_complete.html similarity index 100% rename from templates/registration/account_activation_complete.html rename to templates/registration/email_validation_complete.html diff --git a/templates/registration/account_activation_email.html b/templates/registration/email_validation_email.html similarity index 72% rename from templates/registration/account_activation_email.html rename to templates/registration/email_validation_email.html index 252b83c7..feb46876 100644 --- a/templates/registration/account_activation_email.html +++ b/templates/registration/email_validation_email.html @@ -2,7 +2,7 @@ Hi {{ user.username }}, Welcome to {{ site_name }}. Please click on the link below to confirm your registration. -{{ protocol }}://{{ domain }}{% url 'registration:account_activation' uidb64=uid token=token %} +{{ protocol }}://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} This link is only valid for a couple of days, after that you will need to contact us to validate your email. diff --git a/templates/registration/account_activation_email_sent.html b/templates/registration/email_validation_email_sent.html similarity index 100% rename from templates/registration/account_activation_email_sent.html rename to templates/registration/email_validation_email_sent.html diff --git a/templates/registration/future_profile_detail.html b/templates/registration/future_profile_detail.html index 2172749a..d422aec4 100644 --- a/templates/registration/future_profile_detail.html +++ b/templates/registration/future_profile_detail.html @@ -2,7 +2,7 @@ {% load static %} {% load i18n %} {% load crispy_forms_tags %} -{% load pretty_money %} +{% load perms %} {% block content %}
          @@ -20,6 +20,15 @@
          {% trans 'email'|capfirst %}
          {{ object.email }}
          + {% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:object.profile %} +
          +
          + {% trans "This user doesn't have confirmed his/her e-mail address." %} + {% trans "Click here to resend a validation link." %} +
          +
          + {% endif %} +
          {% trans 'password'|capfirst %}
          From f286f99ced381cb982a34feff1c7f9ba1ec70d83 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 15:31:39 +0200 Subject: [PATCH 49/66] =?UTF-8?q?Handle=20payments=20from=20the=20Soci?= =?UTF-8?q?=C3=A9t=C3=A9=20G=C3=A9n=C3=A9rale,=20closes=20#15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/member/forms.py | 2 +- apps/member/models.py | 10 +- apps/registration/forms.py | 10 +- apps/registration/views.py | 34 +++- .../registration/future_profile_detail.html | 167 +++++++++++------- 5 files changed, 152 insertions(+), 71 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 70ffcf5e..5c060f58 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -26,7 +26,7 @@ class ProfileForm(forms.ModelForm): class Meta: model = Profile fields = '__all__' - exclude = ('user', 'email_confirmed', 'registration_valid', ) + exclude = ('user', 'email_confirmed', 'registration_valid', 'soge', ) class ClubForm(forms.ModelForm): diff --git a/apps/member/models.py b/apps/member/models.py index 2cbb71eb..80681824 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -53,13 +53,19 @@ class Profile(models.Model): default=False, ) + email_confirmed = models.BooleanField( + verbose_name=_("email confirmed"), + default=False, + ) + registration_valid = models.BooleanField( verbose_name=_("registration valid"), default=False, ) - email_confirmed = models.BooleanField( - verbose_name=_("email confirmed"), + soge = models.BooleanField( + verbose_name=_("Société générale"), + help_text=_("Has the user ever be paid by the Société générale?"), default=False, ) diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 656f2243..3bd1cbbf 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -25,6 +25,12 @@ class SignUpForm(UserCreationForm): class ValidationForm(forms.Form): + soge = forms.BooleanField( + label=_("Inscription paid by Société Générale"), + required=False, + help_text=_("Check this case is the Société Générale paid the inscription."), + ) + credit_type = forms.ModelChoiceField( queryset=NoteSpecial.objects, label=_("Credit type"), @@ -55,13 +61,13 @@ class ValidationForm(forms.Form): ) join_BDE = forms.BooleanField( - label=_("Join BDE"), + label=_("Join BDE Club"), required=False, initial=True, ) join_Kfet = forms.BooleanField( - label=_("Join Kfet"), + label=_("Join Kfet Club"), required=False, initial=True, ) diff --git a/apps/registration/views.py b/apps/registration/views.py index 2ce349c4..f154b3e0 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -16,7 +16,7 @@ from django.views.generic import CreateView, TemplateView, DetailView, FormView from django_tables2 import SingleTableView from member.forms import ProfileForm from member.models import Membership, Club -from note.models import SpecialTransaction, Transaction +from note.models import SpecialTransaction, NoteSpecial from note.templatetags.pretty_money import pretty_money from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin @@ -66,7 +66,7 @@ class UserCreateView(CreateView): return super().form_valid(form) -class UserValidateView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): +class UserValidateView(TemplateView): title = _("Account Activation") template_name = 'registration/email_validation_complete.html' @@ -89,6 +89,7 @@ class UserValidateView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): user.is_active = True user.profile.email_confirmed = True user.save() + user.profile.save() return super().dispatch(*args, **kwargs) else: # Display the "Account Activation unsuccessful" page. @@ -116,7 +117,7 @@ class UserValidateView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): return context -class UserValidationEmailSentView(LoginRequiredMixin, ProtectQuerysetMixin, TemplateView): +class UserValidationEmailSentView(TemplateView): template_name = 'registration/email_validation_email_sent.html' title = _('Account activation email sent') @@ -170,6 +171,19 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, """ return super().get_queryset().filter(profile__registration_valid=False) + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + + user = self.get_object() + fee = 0 + bde = Club.objects.get(name="BDE") + fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid + kfet = Club.objects.get(name="Kfet") + fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + ctx["total_fee"] = "{:.02f}".format(fee / 100, ) + + return ctx + def get_form(self, form_class=None): form = super().get_form(form_class) user = self.get_object() @@ -180,7 +194,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, def form_valid(self, form): user = self.object = self.get_object() - print(form.cleaned_data) + soge = form.cleaned_data["soge"] credit_type = form.cleaned_data["credit_type"] credit_amount = form.cleaned_data["credit_amount"] last_name = form.cleaned_data["last_name"] @@ -189,6 +203,10 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, join_BDE = form.cleaned_data["join_BDE"] join_Kfet = form.cleaned_data["join_Kfet"] + if soge: + join_BDE = True + join_Kfet = True + fee = 0 bde = Club.objects.get(name="BDE") bde_fee = bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid @@ -199,6 +217,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, if join_Kfet: fee += kfet_fee + if soge: + credit_type = NoteSpecial.objects.get(special_type="Virement bancaire") + credit_amount = fee + bank = "Société générale" + if join_Kfet and not join_BDE: form.add_error('join_Kfet', _("You must join BDE club before joining Kfet club.")) @@ -221,6 +244,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, ret = super().form_valid(form) user.is_active = True user.profile.registration_valid = True + user.profile.soge = soge user.save() user.profile.save() @@ -230,7 +254,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, destination=user.note, quantity=1, amount=credit_amount, - reason="Crédit " + credit_type.special_type + " (Inscription)", + reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)", last_name=last_name, first_name=first_name, bank=bank, diff --git a/templates/registration/future_profile_detail.html b/templates/registration/future_profile_detail.html index d422aec4..8c78fb8d 100644 --- a/templates/registration/future_profile_detail.html +++ b/templates/registration/future_profile_detail.html @@ -5,70 +5,115 @@ {% load perms %} {% block content %} -
          -
          -

          {% trans "Account #" %} {{ object.pk }}

          +
          +
          +
          +
          +

          {% trans "Account #" %} {{ object.pk }}

          +
          +
          +
          +
          {% trans 'name'|capfirst %}, {% trans 'first name' %}
          +
          {{ object.last_name }} {{ object.first_name }}
          + +
          {% trans 'username'|capfirst %}
          +
          {{ object.username }}
          + +
          {% trans 'email'|capfirst %}
          +
          {{ object.email }}
          + + {% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:object.profile %} +
          +
          + {% trans "This user doesn't have confirmed his/her e-mail address." %} + {% trans "Click here to resend a validation link." %} +
          +
          + {% endif %} + +
          {% trans 'password'|capfirst %}
          +
          + + {% trans 'Change password' %} + +
          + +
          {% trans 'section'|capfirst %}
          +
          {{ object.profile.section }}
          + +
          {% trans 'address'|capfirst %}
          +
          {{ object.profile.address }}
          + +
          {% trans 'phone number'|capfirst %}
          +
          {{ object.profile.phone_number }}
          + +
          {% trans 'paid'|capfirst %}
          +
          {{ object.profile.paid|yesno }}
          +
          +
          +
          + {% trans 'Update Profile' %} + {% trans 'Delete registration' %} +
          +
          -
          -
          -
          {% trans 'name'|capfirst %}, {% trans 'first name' %}
          -
          {{ object.last_name }} {{ object.first_name }}
          - -
          {% trans 'username'|capfirst %}
          -
          {{ object.username }}
          - -
          {% trans 'email'|capfirst %}
          -
          {{ object.email }}
          - - {% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:object.profile %} -
          -
          - {% trans "This user doesn't have confirmed his/her e-mail address." %} - {% trans "Click here to resend a validation link." %} -
          -
          - {% endif %} - -
          {% trans 'password'|capfirst %}
          -
          - - {% trans 'Change password' %} - -
          - -
          {% trans 'section'|capfirst %}
          -
          {{ object.profile.section }}
          - -
          {% trans 'address'|capfirst %}
          -
          {{ object.profile.address }}
          - -
          {% trans 'phone number'|capfirst %}
          -
          {{ object.profile.phone_number }}
          - -
          {% trans 'paid'|capfirst %}
          -
          {{ object.profile.paid|yesno }}
          -
          -
          -
          - {% trans 'Update Profile' %} - {% trans 'Delete registration' %} +
          +
          +
          +
          +

          {% trans "Validate account" %}

          +
          +
          + {% csrf_token %} + {{ form|crispy }} +
          +
          + +
          +
          +
          +{% endblock %} -
          +{% block extrajavascript %} + {% endblock %} \ No newline at end of file From ff820ef086f357e34bb5c431af17cc3ebca9c491 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 15:42:09 +0200 Subject: [PATCH 50/66] Update translations --- apps/registration/views.py | 6 +- locale/de/LC_MESSAGES/django.po | 408 ++++++++++++++++++++++--------- locale/fr/LC_MESSAGES/django.po | 416 ++++++++++++++++++++++---------- 3 files changed, 586 insertions(+), 244 deletions(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index f154b3e0..8d303392 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -67,7 +67,7 @@ class UserCreateView(CreateView): class UserValidateView(TemplateView): - title = _("Account Activation") + title = _("Email validation") template_name = 'registration/email_validation_complete.html' @method_decorator(csrf_protect) @@ -111,7 +111,7 @@ class UserValidateView(TemplateView): context['validlink'] = True else: context.update({ - 'title': _('Account Activation unsuccessful'), + 'title': _('Email validation unsuccessful'), 'validlink': False, }) return context @@ -119,7 +119,7 @@ class UserValidateView(TemplateView): class UserValidationEmailSentView(TemplateView): template_name = 'registration/email_validation_email_sent.html' - title = _('Account activation email sent') + title = _('Email validation email sent') class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, DetailView): diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 16c73f35..41ed293d 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-04-01 18:39+0200\n" +"POT-Creation-Date: 2020-04-05 15:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,36 +18,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:111 -#: apps/activity/models.py:120 +#: apps/activity/apps.py:10 apps/activity/models.py:102 +#: apps/activity/models.py:111 msgid "activity" msgstr "" -#: apps/activity/forms.py:45 apps/activity/models.py:217 +#: apps/activity/forms.py:45 apps/activity/models.py:206 msgid "You can't invite someone once the activity is started." msgstr "" -#: apps/activity/forms.py:48 apps/activity/models.py:220 +#: apps/activity/forms.py:48 apps/activity/models.py:209 msgid "This activity is not validated yet." msgstr "" -#: apps/activity/forms.py:58 apps/activity/models.py:228 +#: apps/activity/forms.py:58 apps/activity/models.py:217 msgid "This person has been already invited 5 times this year." msgstr "" -#: apps/activity/forms.py:62 apps/activity/models.py:232 +#: apps/activity/forms.py:62 apps/activity/models.py:221 msgid "This person is already invited." msgstr "" -#: apps/activity/forms.py:66 apps/activity/models.py:236 +#: apps/activity/forms.py:66 apps/activity/models.py:225 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:66 apps/member/models.py:169 +#: apps/member/models.py:100 apps/member/models.py:203 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: templates/registration/future_profile_detail.html:16 msgid "name" msgstr "" @@ -67,18 +68,18 @@ msgstr "" msgid "activity types" msgstr "" -#: apps/activity/models.py:53 apps/note/models/transactions.py:69 +#: apps/activity/models.py:53 apps/note/models/transactions.py:74 #: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "" #: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:62 +#: apps/note/models/transactions.py:64 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224 #: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -87,73 +88,74 @@ msgstr "" msgid "organizer" msgstr "" -#: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 -msgid "note" -msgstr "" - -#: apps/activity/models.py:89 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:80 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "" -#: apps/activity/models.py:93 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:84 templates/activity/activity_detail.html:22 msgid "start date" msgstr "" -#: apps/activity/models.py:97 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:88 templates/activity/activity_detail.html:25 msgid "end date" msgstr "" -#: apps/activity/models.py:102 apps/note/models/transactions.py:134 +#: apps/activity/models.py:93 apps/note/models/transactions.py:139 #: templates/activity/activity_detail.html:47 msgid "valid" msgstr "" -#: apps/activity/models.py:107 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:98 templates/activity/activity_detail.html:61 msgid "open" msgstr "" -#: apps/activity/models.py:112 +#: apps/activity/models.py:103 msgid "activities" msgstr "" -#: apps/activity/models.py:125 +#: apps/activity/models.py:116 msgid "entry time" msgstr "" -#: apps/activity/models.py:148 +#: apps/activity/models.py:122 apps/note/apps.py:14 +#: apps/note/models/notes.py:58 +msgid "note" +msgstr "" + +#: apps/activity/models.py:139 msgid "Already entered on " msgstr "" -#: apps/activity/models.py:148 apps/activity/tables.py:54 +#: apps/activity/models.py:139 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "" -#: apps/activity/models.py:156 +#: apps/activity/models.py:147 msgid "The balance is negative." msgstr "" -#: apps/activity/models.py:188 +#: apps/activity/models.py:177 msgid "last name" msgstr "" -#: apps/activity/models.py:193 templates/member/profile_info.html:14 +#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: templates/registration/future_profile_detail.html:16 msgid "first name" msgstr "" -#: apps/activity/models.py:200 +#: apps/activity/models.py:189 msgid "inviter" msgstr "" -#: apps/activity/models.py:241 +#: apps/activity/models.py:230 msgid "guest" msgstr "" -#: apps/activity/models.py:242 +#: apps/activity/models.py:231 msgid "guests" msgstr "" -#: apps/activity/models.py:254 +#: apps/activity/models.py:243 msgid "Invitation" msgstr "" @@ -169,12 +171,13 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/treasury/forms.py:121 +#: apps/activity/tables.py:77 apps/registration/forms.py:49 +#: apps/treasury/forms.py:121 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/treasury/forms.py:123 -#: templates/note/transaction_form.html:92 +#: apps/activity/tables.py:79 apps/registration/forms.py:54 +#: apps/treasury/forms.py:123 templates/note/transaction_form.html:92 msgid "First name" msgstr "" @@ -182,11 +185,11 @@ msgstr "" msgid "Note" msgstr "" -#: apps/activity/tables.py:83 +#: apps/activity/tables.py:83 apps/member/tables.py:35 msgid "Balance" msgstr "" -#: apps/activity/views.py:45 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:106 msgid "Activities" msgstr "" @@ -226,12 +229,12 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:144 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:149 msgid "delete" msgstr "" @@ -251,166 +254,200 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/models.py:28 +#: apps/member/models.py:32 +#: templates/registration/future_profile_detail.html:47 msgid "phone number" msgstr "" -#: apps/member/models.py:34 templates/member/profile_info.html:27 +#: apps/member/models.py:38 templates/member/profile_info.html:27 +#: templates/registration/future_profile_detail.html:41 msgid "section" msgstr "" -#: apps/member/models.py:35 +#: apps/member/models.py:39 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:41 templates/member/profile_info.html:30 +#: apps/member/models.py:45 templates/member/profile_info.html:30 +#: templates/registration/future_profile_detail.html:44 msgid "address" msgstr "" -#: apps/member/models.py:47 +#: apps/member/models.py:51 +#: templates/registration/future_profile_detail.html:50 msgid "paid" msgstr "" -#: apps/member/models.py:52 apps/member/models.py:53 +#: apps/member/models.py:52 +msgid "Tells if the user receive a salary." +msgstr "" + +#: apps/member/models.py:57 +msgid "email confirmed" +msgstr "" + +#: apps/member/models.py:62 +msgid "registration valid" +msgstr "" + +#: apps/member/models.py:67 +msgid "Société générale" +msgstr "" + +#: apps/member/models.py:68 +msgid "Has the user ever be paid by the Société générale?" +msgstr "" + +#: apps/member/models.py:73 apps/member/models.py:74 msgid "user profile" msgstr "" -#: apps/member/models.py:71 templates/member/club_info.html:46 +#: apps/member/models.py:105 templates/member/club_info.html:46 +#: templates/registration/future_profile_detail.html:22 msgid "email" msgstr "" -#: apps/member/models.py:78 +#: apps/member/models.py:112 msgid "parent club" msgstr "" -#: apps/member/models.py:87 +#: apps/member/models.py:121 msgid "require memberships" msgstr "" -#: apps/member/models.py:88 +#: apps/member/models.py:122 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:93 templates/member/club_info.html:35 +#: apps/member/models.py:127 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:98 templates/member/club_info.html:38 +#: apps/member/models.py:132 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/models.py:104 templates/member/club_info.html:28 +#: apps/member/models.py:138 templates/member/club_info.html:28 msgid "membership duration" msgstr "" -#: apps/member/models.py:105 +#: apps/member/models.py:139 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:112 templates/member/club_info.html:22 +#: apps/member/models.py:146 templates/member/club_info.html:22 msgid "membership start" msgstr "" -#: apps/member/models.py:113 +#: apps/member/models.py:147 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:120 templates/member/club_info.html:25 +#: apps/member/models.py:154 templates/member/club_info.html:25 msgid "membership end" msgstr "" -#: apps/member/models.py:121 +#: apps/member/models.py:155 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:154 apps/member/models.py:196 +#: apps/member/models.py:188 apps/member/models.py:230 #: apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:155 +#: apps/member/models.py:189 msgid "clubs" msgstr "" -#: apps/member/models.py:175 apps/permission/models.py:288 +#: apps/member/models.py:209 apps/permission/models.py:288 msgid "role" msgstr "" -#: apps/member/models.py:176 apps/member/models.py:201 +#: apps/member/models.py:210 apps/member/models.py:235 msgid "roles" msgstr "" -#: apps/member/models.py:205 +#: apps/member/models.py:240 msgid "membership starts on" msgstr "" -#: apps/member/models.py:209 +#: apps/member/models.py:244 msgid "membership ends on" msgstr "" -#: apps/member/models.py:214 +#: apps/member/models.py:249 msgid "fee" msgstr "" -#: apps/member/models.py:226 apps/member/views.py:383 +#: apps/member/models.py:261 apps/member/views.py:385 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:236 apps/member/views.py:392 +#: apps/member/models.py:271 apps/member/views.py:394 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:271 +#: apps/member/models.py:306 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:274 +#: apps/member/models.py:309 msgid "membership" msgstr "" -#: apps/member/models.py:275 +#: apps/member/models.py:310 msgid "memberships" msgstr "" -#: apps/member/tables.py:73 +#: apps/member/tables.py:93 msgid "Renew" msgstr "" -#: apps/member/views.py:80 templates/member/profile_info.html:45 +#: apps/member/views.py:59 apps/registration/forms.py:20 +msgid "This address must be valid." +msgstr "" + +#: apps/member/views.py:62 templates/member/profile_info.html:45 +#: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "" -#: apps/member/views.py:93 +#: apps/member/views.py:72 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:379 +#: apps/member/views.py:167 +msgid "Search user" +msgstr "" + +#: apps/member/views.py:381 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:396 apps/member/views.py:428 +#: apps/member/views.py:398 apps/member/views.py:430 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:401 apps/member/views.py:433 +#: apps/member/views.py:403 apps/member/views.py:435 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:455 +#: apps/member/views.py:457 msgid "This membership is already renewed" msgstr "" -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:99 msgid "source" msgstr "" -#: apps/note/admin.py:128 apps/note/admin.py:163 -#: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 +#: apps/note/admin.py:128 apps/note/admin.py:170 +#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:112 msgid "destination" msgstr "" @@ -452,7 +489,7 @@ msgstr "" msgid "display image" msgstr "" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:122 msgid "created at" msgstr "" @@ -535,78 +572,82 @@ msgstr "" msgid "A template with this name already exist" msgstr "" -#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:125 +#: apps/note/models/transactions.py:58 apps/note/models/transactions.py:130 msgid "amount" msgstr "" -#: apps/note/models/transactions.py:57 +#: apps/note/models/transactions.py:59 msgid "in centimes" msgstr "" -#: apps/note/models/transactions.py:75 +#: apps/note/models/transactions.py:70 +msgid "display" +msgstr "" + +#: apps/note/models/transactions.py:80 msgid "transaction template" msgstr "" -#: apps/note/models/transactions.py:76 +#: apps/note/models/transactions.py:81 msgid "transaction templates" msgstr "" -#: apps/note/models/transactions.py:100 apps/note/models/transactions.py:113 +#: apps/note/models/transactions.py:105 apps/note/models/transactions.py:118 #: apps/note/tables.py:33 apps/note/tables.py:42 msgid "used alias" msgstr "" -#: apps/note/models/transactions.py:121 +#: apps/note/models/transactions.py:126 msgid "quantity" msgstr "" -#: apps/note/models/transactions.py:129 +#: apps/note/models/transactions.py:134 msgid "reason" msgstr "" -#: apps/note/models/transactions.py:139 apps/note/tables.py:95 +#: apps/note/models/transactions.py:144 apps/note/tables.py:95 msgid "invalidity reason" msgstr "" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:152 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:148 +#: apps/note/models/transactions.py:153 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:202 templates/base.html:84 +#: apps/note/models/transactions.py:207 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:222 +#: apps/note/models/transactions.py:227 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:237 +#: apps/note/models/transactions.py:242 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:242 +#: apps/note/models/transactions.py:247 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:24 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:28 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 +#: apps/note/models/transactions.py:269 apps/note/models/transactions.py:274 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:265 +#: apps/note/models/transactions.py:270 msgid "membership transactions" msgstr "" @@ -622,6 +663,15 @@ msgstr "" msgid "No reason specified" msgstr "" +#: apps/note/tables.py:122 apps/note/tables.py:151 +msgid "Delete" +msgstr "" + +#: apps/note/tables.py:146 templates/member/club_info.html:55 +#: templates/note/conso_form.html:121 +msgid "Edit" +msgstr "" + #: apps/note/views.py:39 msgid "Transfer money" msgstr "" @@ -648,7 +698,74 @@ msgstr "" msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/treasury/apps.py:12 templates/base.html:99 +#: apps/registration/apps.py:10 +msgid "registration" +msgstr "" + +#: apps/registration/forms.py:29 +msgid "Inscription paid by Société Générale" +msgstr "" + +#: apps/registration/forms.py:31 +msgid "Check this case is the Société Générale paid the inscription." +msgstr "" + +#: apps/registration/forms.py:36 +msgid "Credit type" +msgstr "" + +#: apps/registration/forms.py:37 +msgid "No credit" +msgstr "" + +#: apps/registration/forms.py:42 +msgid "Credit amount" +msgstr "" + +#: apps/registration/forms.py:59 apps/treasury/forms.py:125 +#: templates/note/transaction_form.html:98 +msgid "Bank" +msgstr "" + +#: apps/registration/forms.py:64 +msgid "Join BDE Club" +msgstr "" + +#: apps/registration/forms.py:70 +msgid "Join Kfet Club" +msgstr "" + +#: apps/registration/views.py:70 +msgid "Email validation" +msgstr "" + +#: apps/registration/views.py:114 +msgid "Email validation unsuccessful" +msgstr "" + +#: apps/registration/views.py:122 +msgid "Email validation email sent" +msgstr "" + +#: apps/registration/views.py:154 +msgid "Unregistered users" +msgstr "" + +#: apps/registration/views.py:226 +msgid "You must join BDE club before joining Kfet club." +msgstr "" + +#: apps/registration/views.py:230 +msgid "" +"The entered amount is not enough for the memberships, should be at least {}" +msgstr "" + +#: apps/registration/views.py:237 apps/registration/views.py:239 +#: apps/registration/views.py:241 +msgid "This field is required." +msgstr "" + +#: apps/treasury/apps.py:12 templates/base.html:111 msgid "Treasury" msgstr "" @@ -673,10 +790,6 @@ msgstr "" msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:125 templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "" - #: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 @@ -781,15 +894,15 @@ msgid "" "again unless your session expires or you logout." msgstr "" -#: note_kfet/settings/base.py:152 +#: note_kfet/settings/base.py:153 msgid "German" msgstr "" -#: note_kfet/settings/base.py:153 +#: note_kfet/settings/base.py:154 msgid "English" msgstr "" -#: note_kfet/settings/base.py:154 +#: note_kfet/settings/base.py:155 msgid "French" msgstr "" @@ -858,9 +971,23 @@ msgid "The ENS Paris-Saclay BDE note." msgstr "" #: templates/base.html:89 +msgid "Users" +msgstr "" + +#: templates/base.html:94 msgid "Clubs" msgstr "" +#: templates/base.html:100 +msgid "Registrations" +msgstr "" + +#: templates/base.html:150 +msgid "" +"Your e-mail address is not validated. Please check your mail inbox and click " +"on the validation link." +msgstr "" + #: templates/cas_server/base.html:7 msgid "Central Authentication Service" msgstr "" @@ -936,10 +1063,6 @@ msgstr "" msgid "Add member" msgstr "" -#: templates/member/club_info.html:55 templates/note/conso_form.html:121 -msgid "Edit" -msgstr "" - #: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "" @@ -960,7 +1083,7 @@ msgstr "" msgid "Member of the Club" msgstr "" -#: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31 msgid "Transaction history" msgstr "" @@ -977,18 +1100,22 @@ msgid "Regenerate token" msgstr "" #: templates/member/profile_info.html:5 +#: templates/registration/future_profile_detail.html:12 msgid "Account #" msgstr "" #: templates/member/profile_info.html:17 +#: templates/registration/future_profile_detail.html:19 msgid "username" msgstr "" #: templates/member/profile_info.html:20 +#: templates/registration/future_profile_detail.html:34 msgid "password" msgstr "" #: templates/member/profile_info.html:23 +#: templates/registration/future_profile_detail.html:37 msgid "Change password" msgstr "" @@ -1000,7 +1127,17 @@ msgstr "" msgid "Manage auth token" msgstr "" -#: templates/member/profile_tables.html:9 +#: templates/member/profile_tables.html:7 +#: templates/registration/future_profile_detail.html:28 +msgid "This user doesn't have confirmed his/her e-mail address." +msgstr "" + +#: templates/member/profile_tables.html:8 +#: templates/registration/future_profile_detail.html:29 +msgid "Click here to resend a validation link." +msgstr "" + +#: templates/member/profile_tables.html:18 msgid "View my memberships" msgstr "" @@ -1008,11 +1145,6 @@ msgstr "" msgid "Save Changes" msgstr "" -#: templates/member/signup.html:5 templates/member/signup.html:8 -#: templates/member/signup.html:14 -msgid "Sign up" -msgstr "" - #: templates/note/conso_form.html:28 templates/note/transaction_form.html:50 msgid "Select emitters" msgstr "" @@ -1095,6 +1227,39 @@ msgstr "" msgid "Unable to delete button " msgstr "" +#: templates/registration/email_validation_complete.html:8 +#, python-format +msgid "" +"Your account have successfully been activated. You can now log in." +msgstr "" + +#: templates/registration/email_validation_complete.html:12 +msgid "" +"The link was invalid. The token may have expired. Please send us an email to " +"activate your account." +msgstr "" + +#: templates/registration/future_profile_detail.html:56 +msgid "Delete registration" +msgstr "" + +#: templates/registration/future_profile_detail.html:64 +msgid "Validate account" +msgstr "" + +#: templates/registration/future_profile_detail.html:71 +msgid "Validate registration" +msgstr "" + +#: templates/registration/future_user_list.html:7 +msgid "New user" +msgstr "" + +#: templates/registration/future_user_list.html:17 +msgid "There is no pending user." +msgstr "" + #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" @@ -1181,6 +1346,11 @@ msgstr "" msgid "Reset my password" msgstr "" +#: templates/registration/signup.html:5 templates/registration/signup.html:8 +#: templates/registration/signup.html:14 +msgid "Sign up" +msgstr "" + #: templates/treasury/invoice_form.html:6 msgid "Invoices list" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9754fa9c..279a73ff 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-04-01 18:39+0200\n" +"POT-Creation-Date: 2020-04-05 15:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,37 +13,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:111 -#: apps/activity/models.py:120 +#: apps/activity/apps.py:10 apps/activity/models.py:102 +#: apps/activity/models.py:111 msgid "activity" msgstr "activité" -#: apps/activity/forms.py:45 apps/activity/models.py:217 +#: apps/activity/forms.py:45 apps/activity/models.py:206 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 +#: apps/activity/forms.py:48 apps/activity/models.py:209 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 +#: apps/activity/forms.py:58 apps/activity/models.py:217 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:62 apps/activity/models.py:232 +#: apps/activity/forms.py:62 apps/activity/models.py:221 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:66 apps/activity/models.py:236 +#: apps/activity/forms.py:66 apps/activity/models.py:225 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:66 apps/member/models.py:169 +#: apps/member/models.py:100 apps/member/models.py:203 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:232 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 +#: templates/registration/future_profile_detail.html:16 msgid "name" msgstr "nom" @@ -63,18 +64,18 @@ msgstr "type d'activité" msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:53 apps/note/models/transactions.py:69 +#: apps/activity/models.py:53 apps/note/models/transactions.py:74 #: apps/permission/models.py:103 templates/activity/activity_detail.html:16 msgid "description" msgstr "description" #: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:62 +#: apps/note/models/transactions.py:64 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:190 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224 #: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -83,73 +84,74 @@ msgstr "utilisateur" msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:82 apps/activity/models.py:131 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 -msgid "note" -msgstr "note" - -#: apps/activity/models.py:89 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:80 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "club attendu" -#: apps/activity/models.py:93 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:84 templates/activity/activity_detail.html:22 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:97 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:88 templates/activity/activity_detail.html:25 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:102 apps/note/models/transactions.py:134 +#: apps/activity/models.py:93 apps/note/models/transactions.py:139 #: templates/activity/activity_detail.html:47 msgid "valid" msgstr "valide" -#: apps/activity/models.py:107 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:98 templates/activity/activity_detail.html:61 msgid "open" msgstr "ouvrir" -#: apps/activity/models.py:112 +#: apps/activity/models.py:103 msgid "activities" msgstr "activités" -#: apps/activity/models.py:125 +#: apps/activity/models.py:116 msgid "entry time" msgstr "heure d'entrée" -#: apps/activity/models.py:148 +#: apps/activity/models.py:122 apps/note/apps.py:14 +#: apps/note/models/notes.py:58 +msgid "note" +msgstr "note" + +#: apps/activity/models.py:139 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:148 apps/activity/tables.py:54 +#: apps/activity/models.py:139 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:156 +#: apps/activity/models.py:147 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:188 +#: apps/activity/models.py:177 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:193 templates/member/profile_info.html:14 +#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: templates/registration/future_profile_detail.html:16 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:200 +#: apps/activity/models.py:189 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:241 +#: apps/activity/models.py:230 msgid "guest" msgstr "invité" -#: apps/activity/models.py:242 +#: apps/activity/models.py:231 msgid "guests" msgstr "invités" -#: apps/activity/models.py:254 +#: apps/activity/models.py:243 msgid "Invitation" msgstr "Invitation" @@ -165,12 +167,13 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/treasury/forms.py:121 +#: apps/activity/tables.py:77 apps/registration/forms.py:49 +#: apps/treasury/forms.py:121 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/treasury/forms.py:123 -#: templates/note/transaction_form.html:92 +#: apps/activity/tables.py:79 apps/registration/forms.py:54 +#: apps/treasury/forms.py:123 templates/note/transaction_form.html:92 msgid "First name" msgstr "Prénom" @@ -178,11 +181,11 @@ msgstr "Prénom" msgid "Note" msgstr "Note" -#: apps/activity/tables.py:83 +#: apps/activity/tables.py:83 apps/member/tables.py:35 msgid "Balance" msgstr "Solde du compte" -#: apps/activity/views.py:45 templates/base.html:94 +#: apps/activity/views.py:45 templates/base.html:106 msgid "Activities" msgstr "Activités" @@ -222,12 +225,12 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:142 +#: apps/logs/models.py:61 apps/note/tables.py:144 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:146 +#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:149 msgid "delete" msgstr "Supprimer" @@ -247,77 +250,102 @@ msgstr "Les logs ne peuvent pas être détruits." msgid "member" msgstr "adhérent" -#: apps/member/models.py:28 +#: apps/member/models.py:32 +#: templates/registration/future_profile_detail.html:47 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:34 templates/member/profile_info.html:27 +#: apps/member/models.py:38 templates/member/profile_info.html:27 +#: templates/registration/future_profile_detail.html:41 msgid "section" msgstr "section" -#: apps/member/models.py:35 +#: apps/member/models.py:39 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:41 templates/member/profile_info.html:30 +#: apps/member/models.py:45 templates/member/profile_info.html:30 +#: templates/registration/future_profile_detail.html:44 msgid "address" msgstr "adresse" -#: apps/member/models.py:47 +#: apps/member/models.py:51 +#: templates/registration/future_profile_detail.html:50 msgid "paid" msgstr "payé" -#: apps/member/models.py:52 apps/member/models.py:53 +#: apps/member/models.py:52 +msgid "Tells if the user receive a salary." +msgstr "Indique si l'utilisateur perçoit un salaire." + +#: apps/member/models.py:57 +msgid "email confirmed" +msgstr "adresse email confirmée" + +#: apps/member/models.py:62 +msgid "registration valid" +msgstr "inscription valid" + +#: apps/member/models.py:67 +msgid "Société générale" +msgstr "Société générale" + +#: apps/member/models.py:68 +msgid "Has the user ever be paid by the Société générale?" +msgstr "Est-ce que l'utilisateur a déjà été payé par la Société Générale ?" + +#: apps/member/models.py:73 apps/member/models.py:74 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:71 templates/member/club_info.html:46 +#: apps/member/models.py:105 templates/member/club_info.html:46 +#: templates/registration/future_profile_detail.html:22 msgid "email" msgstr "courriel" -#: apps/member/models.py:78 +#: apps/member/models.py:112 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:87 +#: apps/member/models.py:121 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:88 +#: apps/member/models.py:122 msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:93 templates/member/club_info.html:35 +#: apps/member/models.py:127 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:98 templates/member/club_info.html:38 +#: apps/member/models.py:132 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/models.py:104 templates/member/club_info.html:28 +#: apps/member/models.py:138 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:105 +#: apps/member/models.py:139 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:112 templates/member/club_info.html:22 +#: apps/member/models.py:146 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:113 +#: apps/member/models.py:147 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:120 templates/member/club_info.html:25 +#: apps/member/models.py:154 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:121 +#: apps/member/models.py:155 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -325,92 +353,103 @@ 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:154 apps/member/models.py:196 +#: apps/member/models.py:188 apps/member/models.py:230 #: apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:155 +#: apps/member/models.py:189 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:175 apps/permission/models.py:288 +#: apps/member/models.py:209 apps/permission/models.py:288 msgid "role" msgstr "rôle" -#: apps/member/models.py:176 apps/member/models.py:201 +#: apps/member/models.py:210 apps/member/models.py:235 msgid "roles" msgstr "rôles" -#: apps/member/models.py:205 +#: apps/member/models.py:240 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:209 +#: apps/member/models.py:244 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:214 +#: apps/member/models.py:249 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:226 apps/member/views.py:383 +#: apps/member/models.py:261 apps/member/views.py:385 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:236 apps/member/views.py:392 +#: apps/member/models.py:271 apps/member/views.py:394 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:271 +#: apps/member/models.py:306 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:274 +#: apps/member/models.py:309 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:275 +#: apps/member/models.py:310 msgid "memberships" msgstr "adhésions" -#: apps/member/tables.py:73 +#: apps/member/tables.py:93 msgid "Renew" -msgstr "" +msgstr "Renouveler" -#: apps/member/views.py:80 templates/member/profile_info.html:45 +#: apps/member/views.py:59 apps/registration/forms.py:20 +msgid "This address must be valid." +msgstr "Cette adresse doit être valide." + +#: apps/member/views.py:62 templates/member/profile_info.html:45 +#: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:93 +#: apps/member/views.py:72 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:379 +#: apps/member/views.py:167 +msgid "Search user" +msgstr "Chercher un utilisateur" + +#: apps/member/views.py:381 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" +"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne " +"peut pas avoir un solde négatif." -#: apps/member/views.py:396 apps/member/views.py:428 +#: apps/member/views.py:398 apps/member/views.py:430 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:401 apps/member/views.py:433 +#: apps/member/views.py:403 apps/member/views.py:435 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:455 +#: apps/member/views.py:457 msgid "This membership is already renewed" msgstr "Cette adhésion est déjà renouvelée" -#: apps/note/admin.py:120 apps/note/models/transactions.py:94 +#: apps/note/admin.py:120 apps/note/models/transactions.py:99 msgid "source" msgstr "source" -#: apps/note/admin.py:128 apps/note/admin.py:163 -#: apps/note/models/transactions.py:53 apps/note/models/transactions.py:107 +#: apps/note/admin.py:128 apps/note/admin.py:170 +#: apps/note/models/transactions.py:54 apps/note/models/transactions.py:112 msgid "destination" msgstr "destination" @@ -453,7 +492,7 @@ msgstr "" msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:117 +#: apps/note/models/notes.py:53 apps/note/models/transactions.py:122 msgid "created at" msgstr "créée le" @@ -536,80 +575,84 @@ msgstr "catégories de transaction" 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:56 apps/note/models/transactions.py:125 +#: apps/note/models/transactions.py:58 apps/note/models/transactions.py:130 msgid "amount" msgstr "montant" -#: apps/note/models/transactions.py:57 +#: apps/note/models/transactions.py:59 msgid "in centimes" msgstr "en centimes" -#: apps/note/models/transactions.py:75 +#: apps/note/models/transactions.py:70 +msgid "display" +msgstr "afficher" + +#: apps/note/models/transactions.py:80 msgid "transaction template" msgstr "modèle de transaction" -#: apps/note/models/transactions.py:76 +#: apps/note/models/transactions.py:81 msgid "transaction templates" msgstr "modèles de transaction" -#: apps/note/models/transactions.py:100 apps/note/models/transactions.py:113 +#: apps/note/models/transactions.py:105 apps/note/models/transactions.py:118 #: apps/note/tables.py:33 apps/note/tables.py:42 msgid "used alias" msgstr "alias utilisé" -#: apps/note/models/transactions.py:121 +#: apps/note/models/transactions.py:126 msgid "quantity" msgstr "quantité" -#: apps/note/models/transactions.py:129 +#: apps/note/models/transactions.py:134 msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:139 apps/note/tables.py:95 +#: apps/note/models/transactions.py:144 apps/note/tables.py:95 msgid "invalidity reason" msgstr "Motif d'invalidité" -#: apps/note/models/transactions.py:147 +#: apps/note/models/transactions.py:152 msgid "transaction" msgstr "transaction" -#: apps/note/models/transactions.py:148 +#: apps/note/models/transactions.py:153 msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:202 templates/base.html:84 +#: apps/note/models/transactions.py:207 templates/base.html:84 #: templates/note/transaction_form.html:19 #: templates/note/transaction_form.html:140 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:222 +#: apps/note/models/transactions.py:227 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:237 +#: apps/note/models/transactions.py:242 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:242 +#: apps/note/models/transactions.py:247 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:24 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:248 templates/note/transaction_form.html:28 +#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:28 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:264 apps/note/models/transactions.py:269 +#: apps/note/models/transactions.py:269 apps/note/models/transactions.py:274 msgid "membership transaction" -msgstr "transaction d'adhésion" +msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:265 +#: apps/note/models/transactions.py:270 msgid "membership transactions" -msgstr "transactions d'adhésion" +msgstr "Transactions d'adhésion" #: apps/note/tables.py:57 msgid "Click to invalidate" @@ -623,6 +666,15 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" +#: apps/note/tables.py:122 apps/note/tables.py:151 +msgid "Delete" +msgstr "Supprimer" + +#: apps/note/tables.py:146 templates/member/club_info.html:55 +#: templates/note/conso_form.html:121 +msgid "Edit" +msgstr "Éditer" + #: apps/note/views.py:39 msgid "Transfer money" msgstr "Transférer de l'argent" @@ -649,7 +701,74 @@ msgstr "Rang" msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/treasury/apps.py:12 templates/base.html:99 +#: apps/registration/apps.py:10 +msgid "registration" +msgstr "inscription" + +#: apps/registration/forms.py:29 +msgid "Inscription paid by Société Générale" +msgstr "Inscription payée par la Société générale" + +#: apps/registration/forms.py:31 +msgid "Check this case is the Société Générale paid the inscription." +msgstr "Cochez cette case si la Société Générale a payé l'inscription." + +#: apps/registration/forms.py:36 +msgid "Credit type" +msgstr "Type de rechargement" + +#: apps/registration/forms.py:37 +msgid "No credit" +msgstr "Pas de rechargement" + +#: apps/registration/forms.py:42 +msgid "Credit amount" +msgstr "Montant à créditer" + +#: apps/registration/forms.py:59 apps/treasury/forms.py:125 +#: templates/note/transaction_form.html:98 +msgid "Bank" +msgstr "Banque" + +#: apps/registration/forms.py:64 +msgid "Join BDE Club" +msgstr "Adhérer au club BDE" + +#: apps/registration/forms.py:70 +msgid "Join Kfet Club" +msgstr "Adhérer au club Kfet" + +#: apps/registration/views.py:70 +msgid "Email validation" +msgstr "Validation de l'adresse mail" + +#: apps/registration/views.py:114 +msgid "Email validation unsuccessful" +msgstr " La validation de l'adresse mail a échoué" + +#: apps/registration/views.py:122 +msgid "Email validation email sent" +msgstr "L'email de vérification de l'adresse email a bien été envoyé." + +#: apps/registration/views.py:154 +msgid "Unregistered users" +msgstr "Utilisateurs en attente d'inscription" + +#: apps/registration/views.py:226 +msgid "You must join BDE club before joining Kfet club." +msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet." + +#: apps/registration/views.py:230 +msgid "" +"The entered amount is not enough for the memberships, should be at least {}" +msgstr "Le montant crédité est trop faible pour adhérer, il doit être au minimum de {}" + +#: apps/registration/views.py:237 apps/registration/views.py:239 +#: apps/registration/views.py:241 +msgid "This field is required." +msgstr "Ce champ est requis." + +#: apps/treasury/apps.py:12 templates/base.html:111 msgid "Treasury" msgstr "Trésorerie" @@ -674,10 +793,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:125 templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "Banque" - #: apps/treasury/forms.py:127 apps/treasury/tables.py:47 #: templates/note/transaction_form.html:128 #: templates/treasury/remittance_form.html:18 @@ -782,15 +897,15 @@ msgid "" "again unless your session expires or you logout." msgstr "" -#: note_kfet/settings/base.py:152 +#: note_kfet/settings/base.py:153 msgid "German" msgstr "" -#: note_kfet/settings/base.py:153 +#: note_kfet/settings/base.py:154 msgid "English" msgstr "" -#: note_kfet/settings/base.py:154 +#: note_kfet/settings/base.py:155 msgid "French" msgstr "" @@ -859,9 +974,23 @@ msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." #: templates/base.html:89 +msgid "Users" +msgstr "" + +#: templates/base.html:94 msgid "Clubs" msgstr "Clubs" +#: templates/base.html:100 +msgid "Registrations" +msgstr "Inscriptions" + +#: templates/base.html:150 +msgid "" +"Your e-mail address is not validated. Please check your mail inbox and click " +"on the validation link." +msgstr "" + #: templates/cas_server/base.html:7 msgid "Central Authentication Service" msgstr "" @@ -939,10 +1068,6 @@ msgstr "cotisation pour adhérer" msgid "Add member" msgstr "Ajouter un membre" -#: templates/member/club_info.html:55 templates/note/conso_form.html:121 -msgid "Edit" -msgstr "Éditer" - #: templates/member/club_info.html:59 templates/member/profile_info.html:48 msgid "View Profile" msgstr "Voir le profil" @@ -963,7 +1088,7 @@ msgstr "Liste des clubs" msgid "Member of the Club" msgstr "Membre du club" -#: templates/member/club_tables.html:22 templates/member/profile_tables.html:22 +#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31 msgid "Transaction history" msgstr "Historique des transactions" @@ -980,18 +1105,22 @@ msgid "Regenerate token" msgstr "Regénérer le jeton" #: templates/member/profile_info.html:5 +#: templates/registration/future_profile_detail.html:12 msgid "Account #" msgstr "Compte n°" #: templates/member/profile_info.html:17 +#: templates/registration/future_profile_detail.html:19 msgid "username" msgstr "pseudo" #: templates/member/profile_info.html:20 +#: templates/registration/future_profile_detail.html:34 msgid "password" msgstr "mot de passe" #: templates/member/profile_info.html:23 +#: templates/registration/future_profile_detail.html:37 msgid "Change password" msgstr "Changer le mot de passe" @@ -1003,7 +1132,17 @@ msgstr "solde du compte" msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: templates/member/profile_tables.html:9 +#: templates/member/profile_tables.html:7 +#: templates/registration/future_profile_detail.html:28 +msgid "This user doesn't have confirmed his/her e-mail address." +msgstr "" + +#: templates/member/profile_tables.html:8 +#: templates/registration/future_profile_detail.html:29 +msgid "Click here to resend a validation link." +msgstr "" + +#: templates/member/profile_tables.html:18 msgid "View my memberships" msgstr "Voir mes adhésions" @@ -1011,11 +1150,6 @@ msgstr "Voir mes adhésions" msgid "Save Changes" msgstr "Sauvegarder les changements" -#: templates/member/signup.html:5 templates/member/signup.html:8 -#: templates/member/signup.html:14 -msgid "Sign up" -msgstr "Inscription" - #: templates/note/conso_form.html:28 templates/note/transaction_form.html:50 msgid "Select emitters" msgstr "Sélection des émetteurs" @@ -1098,6 +1232,39 @@ msgstr "Le bouton a bien été supprimé" msgid "Unable to delete button " msgstr "Impossible de supprimer le bouton " +#: templates/registration/email_validation_complete.html:8 +#, python-format +msgid "" +"Your account have successfully been activated. You can now log in." +msgstr "" + +#: templates/registration/email_validation_complete.html:12 +msgid "" +"The link was invalid. The token may have expired. Please send us an email to " +"activate your account." +msgstr "" + +#: templates/registration/future_profile_detail.html:56 +msgid "Delete registration" +msgstr "" + +#: templates/registration/future_profile_detail.html:64 +msgid "Validate account" +msgstr "" + +#: templates/registration/future_profile_detail.html:71 +msgid "Validate registration" +msgstr "" + +#: templates/registration/future_user_list.html:7 +msgid "New user" +msgstr "Nouvel utilisateur" + +#: templates/registration/future_user_list.html:17 +msgid "There is no pending user." +msgstr "Il n'y a pas d'inscription en attente." + #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" @@ -1184,6 +1351,11 @@ msgstr "" msgid "Reset my password" msgstr "" +#: templates/registration/signup.html:5 templates/registration/signup.html:8 +#: templates/registration/signup.html:14 +msgid "Sign up" +msgstr "Inscription" + #: templates/treasury/invoice_form.html:6 msgid "Invoices list" msgstr "Liste des factures" From f2baeedc013d5c5b1261abbe7fc1632e0730520e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 16:05:49 +0200 Subject: [PATCH 51/66] Add basic roles for BDE and Kfet --- apps/registration/views.py | 10 +++++++--- locale/fr/LC_MESSAGES/django.po | 10 +++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index 8d303392..9f003dac 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -15,7 +15,7 @@ from django.views.decorators.csrf import csrf_protect from django.views.generic import CreateView, TemplateView, DetailView, FormView from django_tables2 import SingleTableView from member.forms import ProfileForm -from member.models import Membership, Club +from member.models import Membership, Club, Role from note.models import SpecialTransaction, NoteSpecial from note.templatetags.pretty_money import pretty_money from permission.backends import PermissionBackend @@ -262,18 +262,22 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, ) if join_BDE: - Membership.objects.create( + membership = Membership.objects.create( club=bde, user=user, fee=bde_fee, ) + membership.roles.add(Role.objects.get(name="Adhérent BDE")) + membership.save() if join_Kfet: - Membership.objects.create( + membership = Membership.objects.create( club=kfet, user=user, fee=kfet_fee, ) + membership.roles.add(Role.objects.get(name="Adhérent Kfet")) + membership.save() return ret diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 279a73ff..dca8fd69 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1135,12 +1135,12 @@ msgstr "Gérer les jetons d'authentification" #: templates/member/profile_tables.html:7 #: templates/registration/future_profile_detail.html:28 msgid "This user doesn't have confirmed his/her e-mail address." -msgstr "" +msgstr "Cet utilisateur n'a pas encore confirmé son adresse e-mail." #: templates/member/profile_tables.html:8 #: templates/registration/future_profile_detail.html:29 msgid "Click here to resend a validation link." -msgstr "" +msgstr "Cliquez ici pour renvoyer un lien de validation." #: templates/member/profile_tables.html:18 msgid "View my memberships" @@ -1247,15 +1247,15 @@ msgstr "" #: templates/registration/future_profile_detail.html:56 msgid "Delete registration" -msgstr "" +msgstr "Supprimer l'inscription" #: templates/registration/future_profile_detail.html:64 msgid "Validate account" -msgstr "" +msgstr "Valider le compte" #: templates/registration/future_profile_detail.html:71 msgid "Validate registration" -msgstr "" +msgstr "Valider l'inscription" #: templates/registration/future_user_list.html:7 msgid "New user" From e8133805f52ae03a6d7baaf1aa784fe82651b29f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 16:07:31 +0200 Subject: [PATCH 52/66] Users must be member of the BDE club --- apps/registration/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 3bd1cbbf..3ca14ca1 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -62,7 +62,7 @@ class ValidationForm(forms.Form): join_BDE = forms.BooleanField( label=_("Join BDE Club"), - required=False, + required=True, initial=True, ) From 5b61db882168eeea998a80c9c88a8444d63285ea Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 16:18:56 +0200 Subject: [PATCH 53/66] We adhere other users, not ourself... --- apps/member/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/member/views.py b/apps/member/views.py index ed5826ef..5391413b 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -361,7 +361,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): def form_valid(self, form): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["pk"]) - user = self.request.user + user = form.instance.user form.instance.club = club if user.profile.paid: @@ -379,6 +379,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note form.add_error('user', _("This user don't have enough money to join this club, and can't have a negative balance.")) + return super().form_invalid(form) if club.parent_club is not None: if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): From 515edc445938036fae23aa45beeb04f1c360ace9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 18:37:04 +0200 Subject: [PATCH 54/66] Credit note for new memberships --- apps/member/forms.py | 33 ++++++++++++++++++++++++++++ apps/member/views.py | 36 +++++++++++++++++++++++++++++-- static/js/autocomplete_model.js | 3 +++ templates/member/add_members.html | 8 +++++++ 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 5c060f58..71335dce 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,6 +4,9 @@ from django import forms from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ + +from note.models import NoteSpecial from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask @@ -48,6 +51,36 @@ class ClubForm(forms.ModelForm): class MembershipForm(forms.ModelForm): + credit_type = forms.ModelChoiceField( + queryset=NoteSpecial.objects, + label=_("Credit type"), + empty_label=_("No credit"), + required=False, + help_text=_("You can credit the note of the user."), + ) + + credit_amount = forms.IntegerField( + label=_("Credit amount"), + required=False, + initial=0, + widget=AmountInput(), + ) + + last_name = forms.CharField( + label=_("Last name"), + required=False, + ) + + first_name = forms.CharField( + label=_("First name"), + required=False, + ) + + bank = forms.CharField( + label=_("Bank"), + required=False, + ) + class Meta: model = Membership fields = ('user', 'roles', 'date_start') diff --git a/apps/member/views.py b/apps/member/views.py index 5391413b..b2befe37 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -22,7 +22,7 @@ from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token from note.forms import ImageForm from note.models import Alias, NoteUser -from note.models.transactions import Transaction +from note.models.transactions import Transaction, SpecialTransaction from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin @@ -355,6 +355,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) context['club'] = club + context['form'].fields['credit_amount'].initial = club.membership_fee_paid return context @@ -364,11 +365,20 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): user = form.instance.user form.instance.club = club + credit_type = form.cleaned_data["credit_type"] + credit_amount = form.cleaned_data["credit_amount"] + last_name = form.cleaned_data["last_name"] + first_name = form.cleaned_data["first_name"] + bank = form.cleaned_data["bank"] + + if credit_type is None: + credit_amount = 0 + if user.profile.paid: fee = club.membership_fee_paid else: fee = club.membership_fee_unpaid - if user.note.balance < fee and not Membership.objects.filter( + if user.note.balance + credit_amount < fee and not Membership.objects.filter( club__name="Kfet", user=user, date_start__lte=datetime.now().date(), @@ -405,6 +415,28 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .format(form.instance.club.membership_start)) return super().form_invalid(form) + if credit_amount > 0: + if not last_name or not first_name or not bank: + if not last_name: + form.add_error('last_name', _("This field is required.")) + if not first_name: + form.add_error('first_name', _("This field is required.")) + if not bank: + form.add_error('bank', _("This field is required.")) + return self.form_invalid(form) + + SpecialTransaction.objects.create( + source=credit_type, + destination=user.note, + quantity=1, + amount=credit_amount, + reason="Crédit " + credit_type.special_type + " (Adhésion " + club.name + ")", + last_name=last_name, + first_name=first_name, + bank=bank, + valid=True, + ) + return super().form_valid(form) def get_success_url(self): diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js index e2a3f0cb..8c3f6f09 100644 --- a/static/js/autocomplete_model.js +++ b/static/js/autocomplete_model.js @@ -24,6 +24,9 @@ $(document).ready(function () { $("#" + prefix + "_" + obj.id).click(function() { target.val(obj[name_field]); $("#" + prefix + "_pk").val(obj.id); + + if (typeof autocompleted != 'undefined') + autocompleted(obj, prefix) }); if (input === obj[name_field]) diff --git a/templates/member/add_members.html b/templates/member/add_members.html index c44440bf..f9b2276d 100644 --- a/templates/member/add_members.html +++ b/templates/member/add_members.html @@ -17,5 +17,13 @@ {% block extrajavascript %} {% endblock %} From c513759515653af173f48d394006f90026152d3f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 21:56:56 +0200 Subject: [PATCH 55/66] Credit note for membership renewals --- apps/member/forms.py | 1 - apps/member/urls.py | 4 +- apps/member/views.py | 96 +++++++++++++++------------------ apps/note/views.py | 2 +- apps/registration/views.py | 4 +- templates/member/club_info.html | 2 +- tox.ini | 2 +- 7 files changed, 49 insertions(+), 62 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 71335dce..e567fbd5 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -5,7 +5,6 @@ from django import forms from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.models import User from django.utils.translation import gettext_lazy as _ - from note.models import NoteSpecial from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput from permission.models import PermissionMask diff --git a/apps/member/urls.py b/apps/member/urls.py index 37ff8d2b..4be4ceae 100644 --- a/apps/member/urls.py +++ b/apps/member/urls.py @@ -10,9 +10,9 @@ urlpatterns = [ path('club/', views.ClubListView.as_view(), name="club_list"), path('club/create/', views.ClubCreateView.as_view(), name="club_create"), path('club//', views.ClubDetailView.as_view(), name="club_detail"), - path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), + path('club//add_member/', views.ClubAddMemberView.as_view(), name="club_add_member"), path('club/manage_roles//', views.ClubManageRolesView.as_view(), name="club_manage_roles"), - path('club/renew_membership//', views.ClubRenewMembershipView.as_view(), name="club_renew_membership"), + path('club/renew_membership//', views.ClubAddMemberView.as_view(), name="club_renew_membership"), path('club//update/', views.ClubUpdateView.as_view(), name="club_update"), path('club//update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"), path('club//aliases/', views.ClubAliasView.as_view(), name="club_alias"), diff --git a/apps/member/views.py b/apps/member/views.py index b2befe37..f9b76135 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -9,14 +9,11 @@ from django.conf import settings 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.forms import HiddenInput 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 -from django.views.generic.base import View from django.views.generic.edit import FormMixin from django_tables2.views import SingleTableView from rest_framework.authtoken.models import Token @@ -351,18 +348,40 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): template_name = 'member/add_members.html' def get_context_data(self, **kwargs): - club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["pk"]) context = super().get_context_data(**kwargs) + form = context['form'] + + if "club_pk" in self.kwargs: + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ + .get(pk=self.kwargs["club_pk"]) + form.fields['credit_amount'].initial = club.membership_fee_paid + else: + old_membership = self.get_queryset().get(pk=self.kwargs["pk"]) + club = old_membership.club + user = old_membership.user + form.fields['user'].initial = user + form.fields['user'].disabled = True + form.fields['roles'].initial = old_membership.roles.all() + form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1) + form.fields['credit_amount'].initial = club.membership_fee_paid if user.profile.paid \ + else club.membership_fee_unpaid + form.fields['last_name'].initial = user.last_name + form.fields['first_name'].initial = user.first_name + context['club'] = club - context['form'].fields['credit_amount'].initial = club.membership_fee_paid return context def form_valid(self, form): - club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ - .get(pk=self.kwargs["pk"]) - user = form.instance.user + if "club_pk" in self.kwargs: + club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) \ + .get(pk=self.kwargs["club_pk"]) + user = form.instance.user + else: + old_membership = self.get_queryset().get(pk=self.kwargs["pk"]) + club = old_membership.club + user = old_membership.user + form.instance.club = club credit_type = form.cleaned_data["credit_type"] @@ -405,23 +424,23 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.add_error('user', _('User is already a member of the club')) return super().form_invalid(form) - if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: + if club.membership_start and form.instance.date_start < club.membership_start: form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) - if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: + if club.membership_end and form.instance.date_start > club.membership_end: form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") .format(form.instance.club.membership_start)) return super().form_invalid(form) if credit_amount > 0: - if not last_name or not first_name or not bank: + if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"): if not last_name: form.add_error('last_name', _("This field is required.")) if not first_name: form.add_error('first_name', _("This field is required.")) - if not bank: + if not bank and credit_type.special_type == "Chèque": form.add_error('bank', _("This field is required.")) return self.form_invalid(form) @@ -452,49 +471,18 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): context = super().get_context_data(**kwargs) club = self.object.club context['club'] = club - form = context['form'] - form.fields['user'].disabled = True - form.fields['date_start'].widget = HiddenInput() - return context - def form_valid(self, form): - if form.instance.club.membership_start and form.instance.date_start < form.instance.club.membership_start: - form.add_error('user', _("The membership must start after {:%m-%d-%Y}.") - .format(form.instance.club.membership_start)) - return super().form_invalid(form) - - if form.instance.club.membership_end and form.instance.date_start > form.instance.club.membership_end: - form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.") - .format(form.instance.club.membership_start)) - return super().form_invalid(form) - - return super().form_valid(form) + def get_form(self, form_class=None): + form = super().get_form(form_class) + form.fields['user'].disabled = True + del form.fields['date_start'] + del form.fields['credit_type'] + del form.fields['credit_amount'] + del form.fields['last_name'] + del form.fields['first_name'] + del form.fields['bank'] + return form def get_success_url(self): return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id}) - - -class ClubRenewMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, View): - def get(self, *args, **kwargs): - user = self.request.user - membership = Membership.objects.filter(PermissionBackend.filter_queryset(user, Membership, "change"))\ - .filter(pk=self.kwargs["pk"]).get() - - if Membership.objects.filter( - club=membership.club, - user=membership.user, - date_start__gte=membership.club.membership_start, - date_end__lte=membership.club.membership_end, - ).exists(): - raise ValidationError(_("This membership is already renewed")) - - new_membership = Membership.objects.create( - user=user, - club=membership.club, - date_start=membership.date_end + timedelta(days=1), - ) - new_membership.roles.set(membership.roles.all()) - new_membership.save() - - return redirect(reverse_lazy('member:club_detail', kwargs={'pk': membership.club.pk})) diff --git a/apps/note/views.py b/apps/note/views.py index ac9b3e40..4f6575e3 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -84,7 +84,7 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): table_class = HistoryTable def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).order_by("-id").all()[:50] + return super().get_queryset(**kwargs).order_by("-id").all()[:20] def get_context_data(self, **kwargs): """ diff --git a/apps/registration/views.py b/apps/registration/views.py index 9f003dac..d5a6be60 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -232,12 +232,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, return self.form_invalid(form) if credit_type is not None and credit_amount > 0: - if not last_name or not first_name or not bank: + if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"): if not last_name: form.add_error('last_name', _("This field is required.")) if not first_name: form.add_error('first_name', _("This field is required.")) - if not bank: + if not bank and credit_type.special_type == "Chèque": form.add_error('bank', _("This field is required.")) return self.form_invalid(form) diff --git a/templates/member/club_info.html b/templates/member/club_info.html index a781bea8..de0192b4 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -49,7 +49,7 @@
          {% if can_add_members %} - {% trans "Add member" %} + {% trans "Add member" %} {% endif %} {% if ".change_"|has_perm:club %} {% trans "Edit" %} diff --git a/tox.ini b/tox.ini index 01bf4edb..73cf0525 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,7 @@ commands = [flake8] # Ignore too many errors, should be reduced in the future -ignore = D203, W503, E203, I100, I101 +ignore = D203, W503, E203, I100, I101, C901 exclude = .tox, .git, From 2c3127c746fe0aa379a049772a2489ef6b0e6a3b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 5 Apr 2020 22:35:56 +0200 Subject: [PATCH 56/66] =?UTF-8?q?Soci=C3=A9t=C3=A9=20g=C3=A9n=C3=A9rale=20?= =?UTF-8?q?can=20pay=20BDE=20membership=20renewal=20(only=20once)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/member/forms.py | 6 +++ apps/member/views.py | 63 ++++++++++++++++++++++++++++++- templates/member/add_members.html | 46 +++++++++++++++++----- 3 files changed, 103 insertions(+), 12 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index e567fbd5..6fe95f5a 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -50,6 +50,12 @@ class ClubForm(forms.ModelForm): class MembershipForm(forms.ModelForm): + soge = forms.BooleanField( + label=_("Inscription paid by Société Générale"), + required=False, + help_text=_("Check this case is the Société Générale paid the inscription."), + ) + credit_type = forms.ModelChoiceField( queryset=NoteSpecial.objects, label=_("Credit type"), diff --git a/apps/member/views.py b/apps/member/views.py index f9b76135..50c3b813 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -18,14 +18,14 @@ 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.models import Alias, NoteUser +from note.models import Alias, NoteUser, NoteSpecial from note.models.transactions import Transaction, SpecialTransaction from note.tables import HistoryTable, AliasTable from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm -from .models import Club, Membership +from .models import Club, Membership, Role from .tables import ClubTable, UserTable, MembershipTable @@ -355,6 +355,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["club_pk"]) form.fields['credit_amount'].initial = club.membership_fee_paid + + if club.name != "BDE": + del form.fields['soge'] + else: + fee = 0 + bde = Club.objects.get(name="BDE") + fee += bde.membership_fee_paid + kfet = Club.objects.get(name="Kfet") + fee += kfet.membership_fee_paid + context["total_fee"] = "{:.02f}".format(fee / 100, ) else: old_membership = self.get_queryset().get(pk=self.kwargs["pk"]) club = old_membership.club @@ -368,6 +378,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.fields['last_name'].initial = user.last_name form.fields['first_name'].initial = user.first_name + if club.name != "BDE" or user.profile.soge: + del form.fields['soge'] + else: + fee = 0 + bde = Club.objects.get(name="BDE") + fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid + kfet = Club.objects.get(name="Kfet") + fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + context["total_fee"] = "{:.02f}".format(fee / 100, ) + context['club'] = club return context @@ -389,6 +409,18 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): last_name = form.cleaned_data["last_name"] first_name = form.cleaned_data["first_name"] bank = form.cleaned_data["bank"] + soge = form.cleaned_data["soge"] and not user.profile.soge and club.name == "BDE" + + if soge: + credit_type = NoteSpecial.objects.get(special_type="Virement bancaire") + bde = club + kfet = Club.objects.get(name="Kfet") + if user.profile.paid: + fee = bde.membership_fee_paid + kfet.membership_fee_paid + else: + fee = bde.membership_fee_unpaid + kfet.membership_fee_unpaid + credit_amount = fee + bank = "Société générale" if credit_type is None: credit_amount = 0 @@ -456,6 +488,33 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): valid=True, ) + if soge: + user.profile.soge = True + user.profile.save() + + kfet = Club.objects.get(name="Kfet") + kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + + old_membership = Membership.objects.filter( + club__name="Kfet", + user=user, + date_start__lte=datetime.today(), + date_end__gte=datetime.today(), + ) + + membership = Membership.objects.create( + club=kfet, + user=user, + fee=kfet_fee, + date_start=old_membership.get().date_end + timedelta(days=1) + if old_membership.exists() else form.instance.date_start, + ) + if old_membership.exists(): + membership.roles.set(old_membership.get().roles.all()) + else: + membership.roles.add(Role.objects.get(name="Adhérent Kfet")) + membership.save() + return super().form_valid(form) def get_success_url(self): diff --git a/templates/member/add_members.html b/templates/member/add_members.html index f9b2276d..ad6f1f29 100644 --- a/templates/member/add_members.html +++ b/templates/member/add_members.html @@ -16,14 +16,40 @@ {% endblock %} {% block extrajavascript %} - + {% endblock %} From 6498a20b878015fe8942d0a5ac872d7e9614a378 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 03:58:48 +0200 Subject: [PATCH 57/66] A user is active iff the email and the account are validated --- apps/activity/views.py | 1 + apps/registration/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 51e2ebf5..29fbc860 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -139,6 +139,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): | Q(name__regex=pattern) | Q(normalized_name__regex=Alias.normalize(pattern)))) \ .filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\ + .filter(note__noteuser__user__profile__registration_valid=True)\ .distinct("username")[:20] for note in note_qs: note.type = "Adhérent" diff --git a/apps/registration/views.py b/apps/registration/views.py index d5a6be60..b3d4766c 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -86,7 +86,7 @@ class UserValidateView(TemplateView): if user is not None and email_validation_token.check_token(user, token): self.validlink = True - user.is_active = True + user.is_active = user.profile.registration_valid user.profile.email_confirmed = True user.save() user.profile.save() @@ -242,7 +242,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, return self.form_invalid(form) ret = super().form_valid(form) - user.is_active = True + user.is_active = user.profile.email_confirmed user.profile.registration_valid = True user.profile.soge = soge user.save() From 9d584ae87a16729979d2fe0b4f5ba06cb40e327c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 07:06:52 +0200 Subject: [PATCH 58/66] Add shortcuts for transfers and credits in the activity entry page --- apps/activity/views.py | 4 + apps/note/views.py | 9 +- locale/de/LC_MESSAGES/django.po | 144 +++++++++++----------- locale/fr/LC_MESSAGES/django.po | 159 ++++++++++++++----------- static/js/base.js | 17 ++- static/js/transfer.js | 14 ++- templates/activity/activity_entry.html | 30 ++++- templates/note/transaction_form.html | 7 +- 8 files changed, 232 insertions(+), 152 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 29fbc860..714d0dbe 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -155,4 +155,8 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): ctx["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk ctx["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk + ctx["activities_open"] = Activity.objects.filter(open=True).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "view")).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "change")).all() + return ctx diff --git a/apps/note/views.py b/apps/note/views.py index 4f6575e3..4f2321fb 100644 --- a/apps/note/views.py +++ b/apps/note/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.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ @@ -29,7 +30,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl table_class = HistoryTable def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).order_by("-id").all()[:50] + return super().get_queryset(**kwargs).order_by("-id").all()[:20] def get_context_data(self, **kwargs): """ @@ -44,6 +45,12 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl .filter(PermissionBackend.filter_queryset(self.request.user, NoteSpecial, "view"))\ .order_by("special_type").all() + if "activity" in settings.INSTALLED_APPS: + from activity.models import Activity + context["activities_open"] = Activity.objects.filter(open=True).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "view")).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "change")).all() + return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 41ed293d..5fe4ad5a 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-04-05 15:39+0200\n" +"POT-Creation-Date: 2020-04-06 06:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -171,13 +171,14 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/registration/forms.py:49 -#: apps/treasury/forms.py:121 +#: apps/activity/tables.py:77 apps/member/forms.py:75 +#: apps/registration/forms.py:49 apps/treasury/forms.py:121 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/registration/forms.py:54 -#: apps/treasury/forms.py:123 templates/note/transaction_form.html:92 +#: apps/activity/tables.py:79 apps/member/forms.py:80 +#: apps/registration/forms.py:54 apps/treasury/forms.py:123 +#: templates/note/transaction_form.html:97 msgid "First name" msgstr "" @@ -193,7 +194,7 @@ msgstr "" msgid "Activities" msgstr "" -#: apps/activity/views.py:153 +#: apps/activity/views.py:154 msgid "Entry for activity \"{}\"" msgstr "" @@ -254,6 +255,35 @@ msgstr "" msgid "member" msgstr "" +#: apps/member/forms.py:54 apps/registration/forms.py:29 +msgid "Inscription paid by Société Générale" +msgstr "" + +#: apps/member/forms.py:56 apps/registration/forms.py:31 +msgid "Check this case is the Société Générale paid the inscription." +msgstr "" + +#: apps/member/forms.py:61 apps/registration/forms.py:36 +msgid "Credit type" +msgstr "" + +#: apps/member/forms.py:62 apps/registration/forms.py:37 +msgid "No credit" +msgstr "" + +#: apps/member/forms.py:64 +msgid "You can credit the note of the user." +msgstr "" + +#: apps/member/forms.py:68 apps/registration/forms.py:42 +msgid "Credit amount" +msgstr "" + +#: apps/member/forms.py:85 apps/registration/forms.py:59 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:103 +msgid "Bank" +msgstr "" + #: apps/member/models.py:32 #: templates/registration/future_profile_detail.html:47 msgid "phone number" @@ -382,11 +412,11 @@ msgstr "" msgid "fee" msgstr "" -#: apps/member/models.py:261 apps/member/views.py:385 +#: apps/member/models.py:261 apps/member/views.py:447 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:271 apps/member/views.py:394 +#: apps/member/models.py:271 apps/member/views.py:456 msgid "User is already a member of the club" msgstr "" @@ -407,39 +437,41 @@ msgstr "" msgid "Renew" msgstr "" -#: apps/member/views.py:59 apps/registration/forms.py:20 +#: apps/member/views.py:56 apps/registration/forms.py:20 msgid "This address must be valid." msgstr "" -#: apps/member/views.py:62 templates/member/profile_info.html:45 +#: apps/member/views.py:59 templates/member/profile_info.html:45 #: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "" -#: apps/member/views.py:72 +#: apps/member/views.py:69 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:167 +#: apps/member/views.py:164 msgid "Search user" msgstr "" -#: apps/member/views.py:381 +#: apps/member/views.py:442 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:398 apps/member/views.py:430 +#: apps/member/views.py:460 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:403 apps/member/views.py:435 +#: apps/member/views.py:465 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:457 -msgid "This membership is already renewed" +#: apps/member/views.py:472 apps/member/views.py:474 apps/member/views.py:476 +#: apps/registration/views.py:237 apps/registration/views.py:239 +#: apps/registration/views.py:241 +msgid "This field is required." msgstr "" #: apps/note/admin.py:120 apps/note/models/transactions.py:99 @@ -617,9 +649,10 @@ msgstr "" msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:207 templates/base.html:84 +#: apps/note/models/transactions.py:207 +#: templates/activity/activity_entry.html:13 templates/base.html:84 #: templates/note/transaction_form.html:19 -#: templates/note/transaction_form.html:140 +#: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "" @@ -635,7 +668,9 @@ msgstr "" msgid "bank" msgstr "" -#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:253 +#: templates/activity/activity_entry.html:17 +#: templates/note/transaction_form.html:24 msgid "Credit" msgstr "" @@ -672,11 +707,11 @@ msgstr "" msgid "Edit" msgstr "" -#: apps/note/views.py:39 +#: apps/note/views.py:40 msgid "Transfer money" msgstr "" -#: apps/note/views.py:100 templates/base.html:79 +#: apps/note/views.py:107 templates/base.html:79 msgid "Consumptions" msgstr "" @@ -702,31 +737,6 @@ msgstr "" msgid "registration" msgstr "" -#: apps/registration/forms.py:29 -msgid "Inscription paid by Société Générale" -msgstr "" - -#: apps/registration/forms.py:31 -msgid "Check this case is the Société Générale paid the inscription." -msgstr "" - -#: apps/registration/forms.py:36 -msgid "Credit type" -msgstr "" - -#: apps/registration/forms.py:37 -msgid "No credit" -msgstr "" - -#: apps/registration/forms.py:42 -msgid "Credit amount" -msgstr "" - -#: apps/registration/forms.py:59 apps/treasury/forms.py:125 -#: templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "" - #: apps/registration/forms.py:64 msgid "Join BDE Club" msgstr "" @@ -760,11 +770,6 @@ msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" -#: apps/registration/views.py:237 apps/registration/views.py:239 -#: apps/registration/views.py:241 -msgid "This field is required." -msgstr "" - #: apps/treasury/apps.py:12 templates/base.html:111 msgid "Treasury" msgstr "" @@ -791,7 +796,7 @@ msgid "You can't change the type of the remittance." msgstr "" #: apps/treasury/forms.py:127 apps/treasury/tables.py:47 -#: templates/note/transaction_form.html:128 +#: templates/note/transaction_form.html:133 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "" @@ -812,7 +817,7 @@ msgstr "" msgid "Description" msgstr "" -#: apps/treasury/models.py:46 templates/note/transaction_form.html:86 +#: apps/treasury/models.py:46 templates/note/transaction_form.html:91 msgid "Name" msgstr "" @@ -938,15 +943,20 @@ msgstr "" msgid "Guests list" msgstr "" -#: templates/activity/activity_entry.html:10 +#: templates/activity/activity_entry.html:22 +#: templates/note/transaction_form.html:33 +msgid "Entries" +msgstr "" + +#: templates/activity/activity_entry.html:30 msgid "Return to activity page" msgstr "" -#: templates/activity/activity_entry.html:18 +#: templates/activity/activity_entry.html:38 msgid "entries" msgstr "" -#: templates/activity/activity_entry.html:18 +#: templates/activity/activity_entry.html:38 msgid "entry" msgstr "" @@ -1145,7 +1155,7 @@ msgstr "" msgid "Save Changes" msgstr "" -#: templates/note/conso_form.html:28 templates/note/transaction_form.html:50 +#: templates/note/conso_form.html:28 templates/note/transaction_form.html:55 msgid "Select emitters" msgstr "" @@ -1169,7 +1179,7 @@ msgstr "" msgid "Double consumptions" msgstr "" -#: templates/note/conso_form.html:141 templates/note/transaction_form.html:147 +#: templates/note/conso_form.html:141 templates/note/transaction_form.html:152 msgid "Recent transactions history" msgstr "" @@ -1177,29 +1187,29 @@ msgstr "" msgid "Gift" msgstr "" -#: templates/note/transaction_form.html:68 +#: templates/note/transaction_form.html:73 msgid "External payment" msgstr "" -#: templates/note/transaction_form.html:76 +#: templates/note/transaction_form.html:81 msgid "Transfer type" msgstr "" -#: templates/note/transaction_form.html:111 -#: templates/note/transaction_form.html:164 -#: templates/note/transaction_form.html:171 +#: templates/note/transaction_form.html:116 +#: templates/note/transaction_form.html:169 +#: templates/note/transaction_form.html:176 msgid "Select receivers" msgstr "" -#: templates/note/transaction_form.html:133 +#: templates/note/transaction_form.html:138 msgid "Reason" msgstr "" -#: templates/note/transaction_form.html:178 +#: templates/note/transaction_form.html:183 msgid "Credit note" msgstr "" -#: templates/note/transaction_form.html:185 +#: templates/note/transaction_form.html:190 msgid "Debit note" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index dca8fd69..c666c12a 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-04-05 15:31+0200\n" +"POT-Creation-Date: 2020-04-06 06:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -167,13 +167,14 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/registration/forms.py:49 -#: apps/treasury/forms.py:121 +#: apps/activity/tables.py:77 apps/member/forms.py:75 +#: apps/registration/forms.py:49 apps/treasury/forms.py:121 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/registration/forms.py:54 -#: apps/treasury/forms.py:123 templates/note/transaction_form.html:92 +#: apps/activity/tables.py:79 apps/member/forms.py:80 +#: apps/registration/forms.py:54 apps/treasury/forms.py:123 +#: templates/note/transaction_form.html:97 msgid "First name" msgstr "Prénom" @@ -189,7 +190,7 @@ msgstr "Solde du compte" msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:153 +#: apps/activity/views.py:154 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -250,6 +251,35 @@ msgstr "Les logs ne peuvent pas être détruits." msgid "member" msgstr "adhérent" +#: apps/member/forms.py:54 apps/registration/forms.py:29 +msgid "Inscription paid by Société Générale" +msgstr "Inscription payée par la Société générale" + +#: apps/member/forms.py:56 apps/registration/forms.py:31 +msgid "Check this case is the Société Générale paid the inscription." +msgstr "Cochez cette case si la Société Générale a payé l'inscription." + +#: apps/member/forms.py:61 apps/registration/forms.py:36 +msgid "Credit type" +msgstr "Type de rechargement" + +#: apps/member/forms.py:62 apps/registration/forms.py:37 +msgid "No credit" +msgstr "Pas de rechargement" + +#: apps/member/forms.py:64 +msgid "You can credit the note of the user." +msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion." + +#: apps/member/forms.py:68 apps/registration/forms.py:42 +msgid "Credit amount" +msgstr "Montant à créditer" + +#: apps/member/forms.py:85 apps/registration/forms.py:59 +#: apps/treasury/forms.py:125 templates/note/transaction_form.html:103 +msgid "Bank" +msgstr "Banque" + #: apps/member/models.py:32 #: templates/registration/future_profile_detail.html:47 msgid "phone number" @@ -382,11 +412,11 @@ msgstr "l'adhésion finit le" msgid "fee" msgstr "cotisation" -#: apps/member/models.py:261 apps/member/views.py:385 +#: apps/member/models.py:261 apps/member/views.py:447 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:271 apps/member/views.py:394 +#: apps/member/models.py:271 apps/member/views.py:456 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" @@ -407,42 +437,44 @@ msgstr "adhésions" msgid "Renew" msgstr "Renouveler" -#: apps/member/views.py:59 apps/registration/forms.py:20 +#: apps/member/views.py:56 apps/registration/forms.py:20 msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:62 templates/member/profile_info.html:45 +#: apps/member/views.py:59 templates/member/profile_info.html:45 #: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:72 +#: apps/member/views.py:69 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:167 +#: apps/member/views.py:164 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:381 +#: apps/member/views.py:442 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne " -"peut pas avoir un solde négatif." +"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas " +"avoir un solde négatif." -#: apps/member/views.py:398 apps/member/views.py:430 +#: apps/member/views.py:460 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:403 apps/member/views.py:435 +#: apps/member/views.py:465 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:457 -msgid "This membership is already renewed" -msgstr "Cette adhésion est déjà renouvelée" +#: apps/member/views.py:472 apps/member/views.py:474 apps/member/views.py:476 +#: apps/registration/views.py:237 apps/registration/views.py:239 +#: apps/registration/views.py:241 +msgid "This field is required." +msgstr "Ce champ est requis." #: apps/note/admin.py:120 apps/note/models/transactions.py:99 msgid "source" @@ -620,9 +652,10 @@ msgstr "transaction" msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:207 templates/base.html:84 +#: apps/note/models/transactions.py:207 +#: templates/activity/activity_entry.html:13 templates/base.html:84 #: templates/note/transaction_form.html:19 -#: templates/note/transaction_form.html:140 +#: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "Virement" @@ -638,7 +671,9 @@ msgstr "prénom" msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:253 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:253 +#: templates/activity/activity_entry.html:17 +#: templates/note/transaction_form.html:24 msgid "Credit" msgstr "Crédit" @@ -675,11 +710,11 @@ msgstr "Supprimer" msgid "Edit" msgstr "Éditer" -#: apps/note/views.py:39 +#: apps/note/views.py:40 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:100 templates/base.html:79 +#: apps/note/views.py:107 templates/base.html:79 msgid "Consumptions" msgstr "Consommations" @@ -705,31 +740,6 @@ msgstr "" msgid "registration" msgstr "inscription" -#: apps/registration/forms.py:29 -msgid "Inscription paid by Société Générale" -msgstr "Inscription payée par la Société générale" - -#: apps/registration/forms.py:31 -msgid "Check this case is the Société Générale paid the inscription." -msgstr "Cochez cette case si la Société Générale a payé l'inscription." - -#: apps/registration/forms.py:36 -msgid "Credit type" -msgstr "Type de rechargement" - -#: apps/registration/forms.py:37 -msgid "No credit" -msgstr "Pas de rechargement" - -#: apps/registration/forms.py:42 -msgid "Credit amount" -msgstr "Montant à créditer" - -#: apps/registration/forms.py:59 apps/treasury/forms.py:125 -#: templates/note/transaction_form.html:98 -msgid "Bank" -msgstr "Banque" - #: apps/registration/forms.py:64 msgid "Join BDE Club" msgstr "Adhérer au club BDE" @@ -761,12 +771,9 @@ msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet." #: apps/registration/views.py:230 msgid "" "The entered amount is not enough for the memberships, should be at least {}" -msgstr "Le montant crédité est trop faible pour adhérer, il doit être au minimum de {}" - -#: apps/registration/views.py:237 apps/registration/views.py:239 -#: apps/registration/views.py:241 -msgid "This field is required." -msgstr "Ce champ est requis." +msgstr "" +"Le montant crédité est trop faible pour adhérer, il doit être au minimum de " +"{}" #: apps/treasury/apps.py:12 templates/base.html:111 msgid "Treasury" @@ -794,7 +801,7 @@ 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:127 apps/treasury/tables.py:47 -#: templates/note/transaction_form.html:128 +#: templates/note/transaction_form.html:133 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "Montant" @@ -815,7 +822,7 @@ msgstr "Objet" msgid "Description" msgstr "Description" -#: apps/treasury/models.py:46 templates/note/transaction_form.html:86 +#: apps/treasury/models.py:46 templates/note/transaction_form.html:91 msgid "Name" msgstr "Nom" @@ -941,15 +948,20 @@ msgstr "Inviter" msgid "Guests list" msgstr "Liste des invités" -#: templates/activity/activity_entry.html:10 +#: templates/activity/activity_entry.html:22 +#: templates/note/transaction_form.html:33 +msgid "Entries" +msgstr "Entrées" + +#: templates/activity/activity_entry.html:30 msgid "Return to activity page" msgstr "Retour à la page de l'activité" -#: templates/activity/activity_entry.html:18 +#: templates/activity/activity_entry.html:38 msgid "entries" msgstr "entrées" -#: templates/activity/activity_entry.html:18 +#: templates/activity/activity_entry.html:38 msgid "entry" msgstr "entrée" @@ -975,7 +987,7 @@ msgstr "La note du BDE de l'ENS Paris-Saclay." #: templates/base.html:89 msgid "Users" -msgstr "" +msgstr "Utilisateurs" #: templates/base.html:94 msgid "Clubs" @@ -1150,7 +1162,7 @@ msgstr "Voir mes adhésions" msgid "Save Changes" msgstr "Sauvegarder les changements" -#: templates/note/conso_form.html:28 templates/note/transaction_form.html:50 +#: templates/note/conso_form.html:28 templates/note/transaction_form.html:55 msgid "Select emitters" msgstr "Sélection des émetteurs" @@ -1174,7 +1186,7 @@ msgstr "Consommations simples" msgid "Double consumptions" msgstr "Consommations doubles" -#: templates/note/conso_form.html:141 templates/note/transaction_form.html:147 +#: templates/note/conso_form.html:141 templates/note/transaction_form.html:152 msgid "Recent transactions history" msgstr "Historique des transactions récentes" @@ -1182,29 +1194,29 @@ msgstr "Historique des transactions récentes" msgid "Gift" msgstr "Don" -#: templates/note/transaction_form.html:68 +#: templates/note/transaction_form.html:73 msgid "External payment" msgstr "Paiement externe" -#: templates/note/transaction_form.html:76 +#: templates/note/transaction_form.html:81 msgid "Transfer type" msgstr "Type de transfert" -#: templates/note/transaction_form.html:111 -#: templates/note/transaction_form.html:164 -#: templates/note/transaction_form.html:171 +#: templates/note/transaction_form.html:116 +#: templates/note/transaction_form.html:169 +#: templates/note/transaction_form.html:176 msgid "Select receivers" msgstr "Sélection des destinataires" -#: templates/note/transaction_form.html:133 +#: templates/note/transaction_form.html:138 msgid "Reason" msgstr "Raison" -#: templates/note/transaction_form.html:178 +#: templates/note/transaction_form.html:183 msgid "Credit note" msgstr "Note à recharger" -#: templates/note/transaction_form.html:185 +#: templates/note/transaction_form.html:190 msgid "Debit note" msgstr "Note à débiter" @@ -1424,3 +1436,6 @@ 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 "This membership is already renewed" +#~ msgstr "Cette adhésion est déjà renouvelée" diff --git a/static/js/base.js b/static/js/base.js index 7febd3d6..bb73b328 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -19,23 +19,32 @@ function pretty_money(value) { * Add a message on the top of the page. * @param msg The message to display * @param alert_type The type of the alert. Choices: info, success, warning, danger + * @param timeout The delay (in millis) after that the message is auto-closed. If negative, then it is ignored. */ -function addMsg(msg, alert_type) { +function addMsg(msg, alert_type, timeout=-1) { let msgDiv = $("#messages"); let html = msgDiv.html(); + let id = Math.floor(10000 * Math.random() + 1); html += "
          " + - "" + "" + msg + "
          \n"; msgDiv.html(html); + + if (timeout > 0) { + setTimeout(function () { + $("#close-message-" + id).click(); + }, timeout); + } } /** * add Muliple error message from err_obj * @param errs_obj [{error_code:erro_message}] + * @param timeout The delay (in millis) after that the message is auto-closed. If negative, then it is ignored. */ -function errMsg(errs_obj){ +function errMsg(errs_obj, timeout=-1) { for (const err_msg of Object.values(errs_obj)) { - addMsg(err_msg,'danger'); + addMsg(err_msg,'danger', timeout); } } diff --git a/static/js/transfer.js b/static/js/transfer.js index cf62e453..9aff4649 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -28,6 +28,7 @@ function reset() { } $(document).ready(function() { + console.log(42); autoCompleteNote("source_note", "source_alias_matched", "source_note_list", sources, sources_notes_display, "source_alias", "source_note", "user_note", "profile_pic"); autoCompleteNote("dest_note", "dest_alias_matched", "dest_note_list", dests, dests_notes_display, @@ -61,16 +62,25 @@ $(document).ready(function() { // Ensure we begin in gift mode. Removing these lines may cause problems when reloading. - $("#type_gift").prop('checked', 'true'); + let type_gift = $("#type_gift"); // Default mode + type_gift.removeAttr('checked'); $("#type_transfer").removeAttr('checked'); $("#type_credit").removeAttr('checked'); $("#type_debit").removeAttr('checked'); + $("label[for='type_gift']").attr('class', 'btn btn-sm btn-outline-primary'); $("label[for='type_transfer']").attr('class', 'btn btn-sm btn-outline-primary'); $("label[for='type_credit']").attr('class', 'btn btn-sm btn-outline-primary'); $("label[for='type_debit']").attr('class', 'btn btn-sm btn-outline-primary'); + + console.log("#type_" + location.hash.substr(1)); + if (location.hash) + $("#type_" + location.hash.substr(1)).click(); + else + type_gift.click(); + location.hash = ""; }); -$("#transfer").click(function() { +$("#btn_transfer").click(function() { if ($("#type_gift").is(':checked')) { dests_notes_display.forEach(function (dest) { $.post("/api/note/transaction/transaction/", diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html index c06a5188..a712228d 100644 --- a/templates/activity/activity_entry.html +++ b/templates/activity/activity_entry.html @@ -6,6 +6,26 @@ {% load perms %} {% block content %} +
          +
          +
          + + {% trans "Transfer" %} + + {% if "note.notespecial"|not_empty_model_list %} + + {% trans "Credit" %} + + {% endif %} + {% for a in activities_open %} + + {% trans "Entries" %} {{ a.name }} + + {% endfor %} +
          +
          +
          + @@ -56,10 +76,10 @@ note: id, guest: null }).done(function () { - addMsg("Entrée effectuée !", "success"); + addMsg("Entrée effectuée !", "success", 4000); reloadTable(true); }).fail(function(xhr) { - errMsg(xhr.responseJSON); + errMsg(xhr.responseJSON, 4000); }); } else { @@ -84,10 +104,10 @@ note: target.attr("data-inviter"), guest: id }).done(function () { - addMsg("Entrée effectuée !", "success"); + addMsg("Entrée effectuée !", "success", 4000); reloadTable(true); }).fail(function (xhr) { - errMsg(xhr.responseJSON); + errMsg(xhr.responseJSON, 4000); }); }; @@ -111,7 +131,7 @@ makeTransaction(); reset(); }).fail(function (xhr) { - errMsg(xhr.responseJSON); + errMsg(xhr.responseJSON, 4000); }); }; }; diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index 65aaa635..0b53df61 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -28,6 +28,11 @@ SPDX-License-Identifier: GPL-2.0-or-later {% trans "Debit" %} {% endif %} + {% for activity in activities_open %} + + {% trans "Entries" %} {{ activity.name }} + + {% endfor %}
          @@ -137,7 +142,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
          - +
          From f833f1c46cc1a11f115c1d7418ac0c8d2b00adce Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 08:58:39 +0200 Subject: [PATCH 59/66] Comment code --- apps/member/models.py | 9 +++ apps/member/tables.py | 20 ++++++ apps/member/views.py | 54 +++++++++++++- apps/note/views.py | 6 +- apps/registration/api/__init__.py | 0 apps/registration/forms.py | 7 ++ apps/registration/tables.py | 3 + apps/registration/views.py | 76 +++++++++++++++----- locale/de/LC_MESSAGES/django.po | 2 +- locale/fr/LC_MESSAGES/django.po | 4 +- static/js/transfer.js | 2 - templates/activity/activity_detail.html | 1 - templates/member/club_list.html | 1 - templates/member/user_list.html | 8 ++- templates/note/transactiontemplate_list.html | 1 - templates/registration/future_user_list.html | 47 +++++++++--- 16 files changed, 201 insertions(+), 40 deletions(-) delete mode 100644 apps/registration/api/__init__.py diff --git a/apps/member/models.py b/apps/member/models.py index 80681824..c51a95c8 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -250,12 +250,18 @@ class Membership(models.Model): ) def valid(self): + """ + A membership is valid if today is between the start and the end date. + """ if self.date_end is not None: return self.date_start.toordinal() <= datetime.datetime.now().toordinal() < self.date_end.toordinal() else: return self.date_start.toordinal() <= datetime.datetime.now().toordinal() def save(self, *args, **kwargs): + """ + Calculate fee and end date before saving the membership and creating the transaction if needed. + """ if self.club.parent_club is not None: if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name) @@ -287,6 +293,9 @@ class Membership(models.Model): self.make_transaction() def make_transaction(self): + """ + Create Membership transaction associated to this membership. + """ if not self.fee or MembershipTransaction.objects.filter(membership=self).exists(): return diff --git a/apps/member/tables.py b/apps/member/tables.py index c8a510ff..515d7836 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -15,6 +15,9 @@ from .models import Club, Membership class ClubTable(tables.Table): + """ + List all clubs. + """ class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -30,6 +33,9 @@ class ClubTable(tables.Table): class UserTable(tables.Table): + """ + List all users. + """ section = tables.Column(accessor='profile.section') balance = tables.Column(accessor='note.balance', verbose_name=_("Balance")) @@ -51,6 +57,9 @@ class UserTable(tables.Table): class MembershipTable(tables.Table): + """ + List all memberships. + """ roles = tables.Column( attrs={ "td": { @@ -59,7 +68,17 @@ class MembershipTable(tables.Table): } ) + def render_user(self, value): + # If the user has the right, link the displayed user with the page of its detail. + s = value.username + if PermissionBackend.check_perm(get_current_authenticated_user(), "auth.view_user", value): + s = format_html("{name}", + url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s) + + return s + def render_club(self, value): + # If the user has the right, link the displayed club with the page of its detail. s = value.name if PermissionBackend.check_perm(get_current_authenticated_user(), "member.view_club", value): s = format_html("{name}", @@ -94,6 +113,7 @@ class MembershipTable(tables.Table): return t def render_roles(self, record): + # If the user has the right to manage the roles, display the link to manage them roles = record.roles.all() s = ", ".join(str(role) for role in roles) if PermissionBackend.check_perm(get_current_authenticated_user(), "member.change_membership_roles", record): diff --git a/apps/member/views.py b/apps/member/views.py index 50c3b813..b8048d6e 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -30,6 +30,9 @@ from .tables import ClubTable, UserTable, MembershipTable class CustomLoginView(LoginView): + """ + Login view, where the user can select its permission mask. + """ form_class = CustomAuthenticationForm def form_valid(self, form): @@ -38,6 +41,9 @@ class CustomLoginView(LoginView): class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + """ + Update the user information. + """ model = User fields = ['first_name', 'last_name', 'username', 'email'] template_name = 'member/profile_update.html' @@ -93,6 +99,7 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): user.save() if olduser.email != user.email: + # If the user changed her/his email, then it is unvalidated and a confirmation link is sent. user.profile.email_confirmed = False user.profile.send_email_validation_link() @@ -132,13 +139,16 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ - Affiche la liste des utilisateurs, avec une fonction de recherche statique + Display user list, with a search bar """ model = User table_class = UserTable template_name = 'member/user_list.html' def get_queryset(self, **kwargs): + """ + Filter the user list with the given pattern. + """ qs = super().get_queryset().filter(profile__registration_valid=True) if "search" in self.request.GET: pattern = self.request.GET["search"] @@ -150,6 +160,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): Q(first_name__iregex=pattern) | Q(last_name__iregex=pattern) | Q(profile__section__iregex=pattern) + | Q(profile__username__iregex="^" + pattern) | Q(note__alias__name__iregex="^" + pattern) | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern)) ) @@ -167,6 +178,9 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + View and manage user aliases. + """ model = User template_name = 'member/profile_alias.html' context_object_name = 'user_object' @@ -179,6 +193,9 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView): + """ + Update profile picture of the user note. + """ form_class = ImageForm def get_context_data(self, **kwargs): @@ -278,6 +295,9 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + Display details of a club + """ model = Club context_object_name = "club" @@ -298,6 +318,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context['member_list'] = MembershipTable(data=club_member) + # Check if the user has the right to create a membership, to display the button. empty_membership = Membership( club=club, user=User.objects.first(), @@ -312,6 +333,9 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + Manage aliases of a club. + """ model = Club template_name = 'member/club_alias.html' context_object_name = 'club' @@ -324,6 +348,9 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): class ClubUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + """ + Update the information of a club. + """ model = Club context_object_name = "club" form_class = ClubForm @@ -334,6 +361,9 @@ class ClubUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): class ClubPictureUpdateView(PictureUpdateView): + """ + Update the profile picture of a club. + """ model = Club template_name = 'member/club_picture_update.html' context_object_name = 'club' @@ -343,6 +373,9 @@ class ClubPictureUpdateView(PictureUpdateView): class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): + """ + Add a membership to a club. + """ model = Membership form_class = MembershipForm template_name = 'member/add_members.html' @@ -352,10 +385,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form = context['form'] if "club_pk" in self.kwargs: + # We create a new membership. club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["club_pk"]) form.fields['credit_amount'].initial = club.membership_fee_paid + # If the concerned club is the BDE, then we add the option that Société générale pays the membership. if club.name != "BDE": del form.fields['soge'] else: @@ -366,6 +401,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): fee += kfet.membership_fee_paid context["total_fee"] = "{:.02f}".format(fee / 100, ) else: + # This is a renewal. Fields can be pre-completed. old_membership = self.get_queryset().get(pk=self.kwargs["pk"]) club = old_membership.club user = old_membership.user @@ -378,6 +414,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.fields['last_name'].initial = user.last_name form.fields['first_name'].initial = user.first_name + # If this is a renewal of a BDE membership, Société générale can pays, if it is not yet done if club.name != "BDE" or user.profile.soge: del form.fields['soge'] else: @@ -393,6 +430,10 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): return context def form_valid(self, form): + """ + Create membership, check that all is good, make transactions + """ + # Get the club that is concerned by the membership if "club_pk" in self.kwargs: club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) \ .get(pk=self.kwargs["club_pk"]) @@ -404,6 +445,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.instance.club = club + # Get form data credit_type = form.cleaned_data["credit_type"] credit_amount = form.cleaned_data["credit_amount"] last_name = form.cleaned_data["last_name"] @@ -411,6 +453,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): bank = form.cleaned_data["bank"] soge = form.cleaned_data["soge"] and not user.profile.soge and club.name == "BDE" + # If Société générale pays, then we auto-fill some data if soge: credit_type = NoteSpecial.objects.get(special_type="Virement bancaire") bde = club @@ -466,6 +509,9 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .format(form.instance.club.membership_start)) return super().form_invalid(form) + # Now, all is fine, the membership can be created. + + # Credit note before the membership is created. if credit_amount > 0: if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"): if not last_name: @@ -488,6 +534,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): valid=True, ) + # If Société générale pays, then we store the information: the bank can't pay twice to a same person. if soge: user.profile.soge = True user.profile.save() @@ -495,6 +542,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): kfet = Club.objects.get(name="Kfet") kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + # Get current membership, to get the end date old_membership = Membership.objects.filter( club__name="Kfet", user=user, @@ -522,6 +570,9 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + """ + Manage the roles of a user in a club + """ model = Membership form_class = MembershipForm template_name = 'member/add_members.html' @@ -534,6 +585,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): def get_form(self, form_class=None): form = super().get_form(form_class) + # We don't create a full membership, we only update one field form.fields['user'].disabled = True del form.fields['date_start'] del form.fields['credit_type'] diff --git a/apps/note/views.py b/apps/note/views.py index 4f2321fb..88d47847 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -45,6 +45,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl .filter(PermissionBackend.filter_queryset(self.request.user, NoteSpecial, "view"))\ .order_by("special_type").all() + # Add a shortcut for entry page for open activities if "activity" in settings.INSTALLED_APPS: from activity.models import Activity context["activities_open"] = Activity.objects.filter(open=True).filter( @@ -56,7 +57,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl class TransactionTemplateCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): """ - Create TransactionTemplate + Create Transaction template """ model = TransactionTemplate form_class = TransactionTemplateForm @@ -65,7 +66,7 @@ class TransactionTemplateCreateView(ProtectQuerysetMixin, LoginRequiredMixin, Cr class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ - List TransactionsTemplates + List Transaction templates """ model = TransactionTemplate table_class = ButtonTable @@ -73,6 +74,7 @@ class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, Sing class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ + Update Transaction template """ model = TransactionTemplate form_class = TransactionTemplateForm diff --git a/apps/registration/api/__init__.py b/apps/registration/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 3ca14ca1..4955c4a8 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -10,6 +10,9 @@ from note_kfet.inputs import AmountInput class SignUpForm(UserCreationForm): + """ + Pre-register users with all information + """ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields['username'].widget.attrs.pop("autofocus", None) @@ -25,6 +28,9 @@ class SignUpForm(UserCreationForm): class ValidationForm(forms.Form): + """ + Validate the inscription of the new users and pay memberships. + """ soge = forms.BooleanField( label=_("Inscription paid by Société Générale"), required=False, @@ -66,6 +72,7 @@ class ValidationForm(forms.Form): initial=True, ) + # The user can join the Kfet club at the inscription join_Kfet = forms.BooleanField( label=_("Join Kfet Club"), required=False, diff --git a/apps/registration/tables.py b/apps/registration/tables.py index 7fd7537f..7068f6ca 100644 --- a/apps/registration/tables.py +++ b/apps/registration/tables.py @@ -6,6 +6,9 @@ from django.contrib.auth.models import User class FutureUserTable(tables.Table): + """ + Display the list of pre-registered users + """ phone_number = tables.Column(accessor='profile.phone_number') section = tables.Column(accessor='profile.section') diff --git a/apps/registration/views.py b/apps/registration/views.py index b3d4766c..2daca037 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -5,13 +5,12 @@ from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.core.exceptions import ValidationError +from django.db.models import Q from django.shortcuts import resolve_url, redirect from django.urls import reverse_lazy -from django.utils.decorators import method_decorator from django.utils.http import urlsafe_base64_decode from django.utils.translation import gettext_lazy as _ from django.views import View -from django.views.decorators.csrf import csrf_protect from django.views.generic import CreateView, TemplateView, DetailView, FormView from django_tables2 import SingleTableView from member.forms import ProfileForm @@ -46,11 +45,13 @@ class UserCreateView(CreateView): """ If the form is valid, then the user is created with is_active set to False so that the user cannot log in until the email has been validated. + The user must also wait that someone validate her/his account. """ profile_form = ProfileForm(data=self.request.POST) if not profile_form.is_valid(): return self.form_invalid(form) + # Save the user and the profile user = form.save(commit=False) user.is_active = False profile_form.instance.user = user @@ -67,16 +68,15 @@ class UserCreateView(CreateView): class UserValidateView(TemplateView): + """ + A view to validate the email address. + """ title = _("Email validation") template_name = 'registration/email_validation_complete.html' - @method_decorator(csrf_protect) - def dispatch(self, *args, **kwargs): + def get(self, *args, **kwargs): """ - The dispatch method looks at the request to determine whether it is a GET, POST, etc, - and relays the request to a matching method if one is defined, or raises HttpResponseNotAllowed - if not. We chose to check the token in the dispatch method to mimic PasswordReset from - django.contrib.auth + With a given token and user id (in params), validate the email address. """ assert 'uidb64' in kwargs and 'token' in kwargs @@ -84,18 +84,23 @@ class UserValidateView(TemplateView): user = self.get_user(kwargs['uidb64']) token = kwargs['token'] + # Validate the token if user is not None and email_validation_token.check_token(user, token): self.validlink = True + # The user must wait that someone validates the account before the user can be active and login. user.is_active = user.profile.registration_valid user.profile.email_confirmed = True user.save() user.profile.save() return super().dispatch(*args, **kwargs) else: - # Display the "Account Activation unsuccessful" page. + # Display the "Email validation unsuccessful" page. return self.render_to_response(self.get_context_data()) def get_user(self, uidb64): + """ + Get user from the base64-encoded string. + """ try: # urlsafe_base64_decode() decodes to bytestring uid = urlsafe_base64_decode(uidb64).decode() @@ -118,16 +123,19 @@ class UserValidateView(TemplateView): class UserValidationEmailSentView(TemplateView): + """ + Display the information that the validation link has been sent. + """ template_name = 'registration/email_validation_email_sent.html' title = _('Email validation email sent') class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, DetailView): + """ + Rensend the email validation link. + """ model = User - def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).filter(profile__email_confirmed=False) - def get(self, request, *args, **kwargs): user = self.get_object() @@ -139,14 +147,35 @@ class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, De class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ - Affiche la liste des utilisateurs, avec une fonction de recherche statique + Display pre-registered users, with a search bar """ model = User table_class = FutureUserTable template_name = 'registration/future_user_list.html' def get_queryset(self, **kwargs): - return super().get_queryset().filter(profile__registration_valid=False) + """ + Filter the table with the given parameter. + :param kwargs: + :return: + """ + qs = super().get_queryset().filter(profile__registration_valid=False) + if "search" in self.request.GET: + pattern = self.request.GET["search"] + + if not pattern: + return qs.none() + + qs = qs.filter( + Q(first_name__iregex=pattern) + | Q(last_name__iregex=pattern) + | Q(profile__section__iregex=pattern) + | Q(username__iregex="^" + pattern) + ) + else: + qs = qs.none() + + return qs[:20] def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -158,7 +187,7 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, FormView): """ - Affiche les informations sur un utilisateur, sa note, ses clubs... + Display information about a pre-registered user, in order to complete the registration. """ model = User form_class = ValidationForm @@ -194,6 +223,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, def form_valid(self, form): user = self.object = self.get_object() + # Get form data soge = form.cleaned_data["soge"] credit_type = form.cleaned_data["credit_type"] credit_amount = form.cleaned_data["credit_amount"] @@ -204,6 +234,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, join_Kfet = form.cleaned_data["join_Kfet"] if soge: + # If Société Générale pays the inscription, the user joins the two clubs join_BDE = True join_Kfet = True @@ -218,6 +249,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, fee += kfet_fee if soge: + # Fill payment information if Société Générale pays the inscription credit_type = NoteSpecial.objects.get(special_type="Virement bancaire") credit_amount = fee bank = "Société générale" @@ -226,6 +258,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, form.add_error('join_Kfet', _("You must join BDE club before joining Kfet club.")) if fee > credit_amount: + # Check if the user credits enough money form.add_error('credit_type', _("The entered amount is not enough for the memberships, should be at least {}") .format(pretty_money(fee))) @@ -241,14 +274,18 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, form.add_error('bank', _("This field is required.")) return self.form_invalid(form) + # Save the user and finally validate the registration + # Saving the user creates the associated note ret = super().form_valid(form) user.is_active = user.profile.email_confirmed user.profile.registration_valid = True + # Store if Société générale paid for next years user.profile.soge = soge user.save() user.profile.save() if credit_type is not None and credit_amount > 0: + # Credit the note SpecialTransaction.objects.create( source=credit_type, destination=user.note, @@ -262,6 +299,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, ) if join_BDE: + # Create membership for the user to the BDE starting today membership = Membership.objects.create( club=bde, user=user, @@ -271,6 +309,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, membership.save() if join_Kfet: + # Create membership for the user to the Kfet starting today membership = Membership.objects.create( club=kfet, user=user, @@ -287,10 +326,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, class FutureUserInvalidateView(ProtectQuerysetMixin, LoginRequiredMixin, View): """ - Affiche les informations sur un utilisateur, sa note, ses clubs... + Delete a pre-registered user. """ - def dispatch(self, request, *args, **kwargs): + def get(self, request, *args, **kwargs): + """ + Delete the pre-registered user which id is given in the URL. + """ user = User.objects.filter(profile__registration_valid=False)\ .filter(PermissionBackend.filter_queryset(request.user, User, "change", "is_valid"))\ .get(pk=self.kwargs["pk"]) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 5fe4ad5a..1e791220 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -1267,7 +1267,7 @@ msgid "New user" msgstr "" #: templates/registration/future_user_list.html:17 -msgid "There is no pending user." +msgid "There is no pending user with this pattern." msgstr "" #: templates/registration/logged_out.html:8 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c666c12a..4e282bea 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1274,8 +1274,8 @@ msgid "New user" msgstr "Nouvel utilisateur" #: templates/registration/future_user_list.html:17 -msgid "There is no pending user." -msgstr "Il n'y a pas d'inscription en attente." +msgid "There is no pending user with this pattern." +msgstr "Il n'y a pas d'inscription en attente avec cette entrée." #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." diff --git a/static/js/transfer.js b/static/js/transfer.js index 9aff4649..e5aafc39 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -28,7 +28,6 @@ function reset() { } $(document).ready(function() { - console.log(42); autoCompleteNote("source_note", "source_alias_matched", "source_note_list", sources, sources_notes_display, "source_alias", "source_note", "user_note", "profile_pic"); autoCompleteNote("dest_note", "dest_alias_matched", "dest_note_list", dests, dests_notes_display, @@ -72,7 +71,6 @@ $(document).ready(function() { $("label[for='type_credit']").attr('class', 'btn btn-sm btn-outline-primary'); $("label[for='type_debit']").attr('class', 'btn btn-sm btn-outline-primary'); - console.log("#type_" + location.hash.substr(1)); if (location.hash) $("#type_" + location.hash.substr(1)).click(); else diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index 84182065..7ee9f7c0 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -118,7 +118,6 @@ }); $("#validate_activity").click(function () { - console.log(42); $.ajax({ url: "/api/activity/activity/{{ activity.pk }}/", type: "PATCH", diff --git a/templates/member/club_list.html b/templates/member/club_list.html index 2653ace8..4682164c 100644 --- a/templates/member/club_list.html +++ b/templates/member/club_list.html @@ -36,7 +36,6 @@ function getInfo() { if (asked.length >= 1) { $.getJSON("/api/members/club/?format=json&search="+asked, function(buttons){ let selected_id = buttons.results.map((a => "#row-"+a.id)); - console.log(selected_id.join()); $(".table-row,"+selected_id.join()).show(); $(".table-row").not(selected_id.join()).hide(); diff --git a/templates/member/user_list.html b/templates/member/user_list.html index d0eaaedb..0bcd7e89 100644 --- a/templates/member/user_list.html +++ b/templates/member/user_list.html @@ -7,7 +7,13 @@
          - {% render_table table %} + {% if table.data %} + {% render_table table %} + {% else %} +
          + {% trans "There is no pending user with this pattern." %} +
          + {% endif %}
          {% endblock %} diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index af0a02b4..cf9bc5ed 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -37,7 +37,6 @@ function getInfo() { if (asked.length >= 1) { $.getJSON("/api/note/transaction/template/?format=json&search="+asked, function(buttons){ let selected_id = buttons.results.map((a => "#row-"+a.id)); - console.log(selected_id.join()); $(".table-row,"+selected_id.join()).show(); $(".table-row").not(selected_id.join()).hide(); diff --git a/templates/registration/future_user_list.html b/templates/registration/future_user_list.html index 490fe2ab..1e10dcbb 100644 --- a/templates/registration/future_user_list.html +++ b/templates/registration/future_user_list.html @@ -5,24 +5,49 @@ {% block content %} - +
          +
          - {% if table.data %} -
          +
          + {% if table.data %} {% render_table table %} -
          - {% else %} -
          - {% trans "There is no pending user." %} -
          - {% endif %} + {% else %} +
          + {% trans "There is no pending user with this pattern." %} +
          + {% endif %} +
          {% endblock %} {% block extrajavascript %} {% endblock %} From bd41560f45da5f4a161d3bf7ca3179c4cb74077a Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 10:45:32 +0200 Subject: [PATCH 60/66] Update permission fixtures --- apps/activity/fixtures/initial.json | 20 + apps/member/views.py | 1 + apps/note/signals.py | 2 +- apps/permission/fixtures/initial.json | 703 ++++++++++++++++---------- apps/registration/forms.py | 2 +- apps/registration/views.py | 23 +- 6 files changed, 478 insertions(+), 273 deletions(-) create mode 100644 apps/activity/fixtures/initial.json diff --git a/apps/activity/fixtures/initial.json b/apps/activity/fixtures/initial.json new file mode 100644 index 00000000..1856bce4 --- /dev/null +++ b/apps/activity/fixtures/initial.json @@ -0,0 +1,20 @@ +[ + { + "model": "activity.activitytype", + "pk": 1, + "fields": { + "name": "Pot", + "can_invite": true, + "guest_entry_fee": 500 + } + }, + { + "model": "activity.activitytype", + "pk": 2, + "fields": { + "name": "Soir\u00e9e de club", + "can_invite": false, + "guest_entry_fee": 0 + } + } +] \ No newline at end of file diff --git a/apps/member/views.py b/apps/member/views.py index b8048d6e..e03c5ff5 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -389,6 +389,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\ .get(pk=self.kwargs["club_pk"]) form.fields['credit_amount'].initial = club.membership_fee_paid + form.fields['roles'].initial = Role.objects.filter(name="Membre de club").all() # If the concerned club is the BDE, then we add the option that Société générale pays the membership. if club.name != "BDE": diff --git a/apps/note/signals.py b/apps/note/signals.py index 78312682..37737a45 100644 --- a/apps/note/signals.py +++ b/apps/note/signals.py @@ -10,7 +10,7 @@ def save_user_note(instance, raw, **_kwargs): # When provisionning data, do not try to autocreate return - if instance.profile.registration_valid and instance.is_active: + if (instance.is_superuser or instance.profile.registration_valid) and instance.is_active: # Create note only when the registration is validated from note.models import NoteUser NoteUser.objects.get_or_create(user=instance) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 4cf3ecfa..d7eca508 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -17,54 +17,61 @@ "model": "member.role", "pk": 3, "fields": { - "name": "Pr\u00e9sident\u00b7e BDE" + "name": "Membre de club" } }, { "model": "member.role", "pk": 4, "fields": { - "name": "Tr\u00e9sorier\u00b7\u00e8re BDE" + "name": "Bureau de club" } }, { "model": "member.role", "pk": 5, "fields": { - "name": "Respo info" + "name": "Pr\u00e9sident\u00b7e de club" } }, { "model": "member.role", "pk": 6, "fields": { - "name": "GC Kfet" + "name": "Tr\u00e9sorier\u00b7\u00e8re de club" } }, { "model": "member.role", "pk": 7, "fields": { - "name": "Pr\u00e9sident\u00b7e de club" + "name": "Pr\u00e9sident\u00b7e BDE" } }, { "model": "member.role", "pk": 8, "fields": { - "name": "Tr\u00e9sorier\u00b7\u00e8re de club" - } - }, - { - "model": "member.role", - "pk": 8, - "fields": { - "name": "Tr\u00e9sorier\u00b7\u00e8re de club" + "name": "Tr\u00e9sorier\u00b7\u00e8re BDE" } }, { "model": "member.role", "pk": 9, + "fields": { + "name": "Respo info" + } + }, + { + "model": "member.role", + "pk": 10, + "fields": { + "name": "GC Kfet" + } + }, + { + "model": "member.role", + "pk": 11, "fields": { "name": "Res[pot]" } @@ -97,10 +104,7 @@ "model": "permission.permission", "pk": 1, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "view", "mask": 1, @@ -112,10 +116,7 @@ "model": "permission.permission", "pk": 2, "fields": { - "model": [ - "member", - "profile" - ], + "model": 17, "query": "{\"user\": [\"user\"]}", "type": "view", "mask": 1, @@ -127,10 +128,7 @@ "model": "permission.permission", "pk": 3, "fields": { - "model": [ - "note", - "noteuser" - ], + "model": 27, "query": "{\"pk\": [\"user\", \"note\", \"pk\"]}", "type": "view", "mask": 1, @@ -142,10 +140,7 @@ "model": "permission.permission", "pk": 4, "fields": { - "model": [ - "authtoken", - "token" - ], + "model": 8, "query": "{\"user\": [\"user\"]}", "type": "view", "mask": 1, @@ -157,10 +152,7 @@ "model": "permission.permission", "pk": 5, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "[\"OR\", {\"source\": [\"user\", \"note\"]}, {\"destination\": [\"user\", \"note\"]}]", "type": "view", "mask": 1, @@ -172,10 +164,7 @@ "model": "permission.permission", "pk": 6, "fields": { - "model": [ - "note", - "alias" - ], + "model": 19, "query": "[\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}]", "type": "view", "mask": 1, @@ -187,10 +176,7 @@ "model": "permission.permission", "pk": 7, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "change", "mask": 1, @@ -202,10 +188,7 @@ "model": "permission.permission", "pk": 8, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "change", "mask": 1, @@ -217,10 +200,7 @@ "model": "permission.permission", "pk": 9, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "change", "mask": 1, @@ -232,10 +212,7 @@ "model": "permission.permission", "pk": 10, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "change", "mask": 1, @@ -247,10 +224,7 @@ "model": "permission.permission", "pk": 11, "fields": { - "model": [ - "auth", - "user" - ], + "model": 4, "query": "{\"pk\": [\"user\", \"pk\"]}", "type": "change", "mask": 1, @@ -262,10 +236,7 @@ "model": "permission.permission", "pk": 12, "fields": { - "model": [ - "authtoken", - "token" - ], + "model": 8, "query": "{\"user\": [\"user\"]}", "type": "delete", "mask": 1, @@ -277,10 +248,7 @@ "model": "permission.permission", "pk": 13, "fields": { - "model": [ - "authtoken", - "token" - ], + "model": 8, "query": "{\"user\": [\"user\"]}", "type": "add", "mask": 1, @@ -292,10 +260,7 @@ "model": "permission.permission", "pk": 14, "fields": { - "model": [ - "note", - "alias" - ], + "model": 19, "query": "{\"note\": [\"user\", \"note\"]}", "type": "delete", "mask": 1, @@ -307,10 +272,7 @@ "model": "permission.permission", "pk": 15, "fields": { - "model": [ - "note", - "alias" - ], + "model": 19, "query": "{\"note\": [\"user\", \"note\"]}", "type": "add", "mask": 1, @@ -322,10 +284,7 @@ "model": "permission.permission", "pk": 16, "fields": { - "model": [ - "note", - "noteuser" - ], + "model": 27, "query": "{\"pk\": [\"user\", \"note\", \"pk\"]}", "type": "change", "mask": 1, @@ -337,10 +296,7 @@ "model": "permission.permission", "pk": 17, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "[\"AND\", {\"source\": [\"user\", \"note\"]}, [\"OR\", {\"amount__lte\": [\"user\", \"note\", \"balance\"]}, {\"valid\": false}]]", "type": "add", "mask": 1, @@ -352,10 +308,7 @@ "model": "permission.permission", "pk": 18, "fields": { - "model": [ - "note", - "note" - ], + "model": 20, "query": "{}", "type": "change", "mask": 1, @@ -367,10 +320,7 @@ "model": "permission.permission", "pk": 19, "fields": { - "model": [ - "note", - "note" - ], + "model": 20, "query": "[\"OR\", {\"pk\": [\"club\", \"note\", \"pk\"]}, {\"pk__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__membership__club\": [\"club\"]}], [\"all\"]]}]", "type": "view", "mask": 2, @@ -382,10 +332,7 @@ "model": "permission.permission", "pk": 20, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, @@ -397,10 +344,7 @@ "model": "permission.permission", "pk": 21, "fields": { - "model": [ - "note", - "recurrenttransaction" - ], + "model": 28, "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, @@ -412,10 +356,7 @@ "model": "permission.permission", "pk": 22, "fields": { - "model": [ - "member", - "club" - ], + "model": 15, "query": "{\"pk\": [\"club\", \"pk\"]}", "type": "view", "mask": 1, @@ -427,10 +368,7 @@ "model": "permission.permission", "pk": 23, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "{}", "type": "change", "mask": 1, @@ -442,10 +380,7 @@ "model": "permission.permission", "pk": 24, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "{}", "type": "view", "mask": 2, @@ -457,10 +392,7 @@ "model": "permission.permission", "pk": 25, "fields": { - "model": [ - "note", - "notespecial" - ], + "model": 26, "query": "{}", "type": "view", "mask": 2, @@ -472,10 +404,7 @@ "model": "permission.permission", "pk": 26, "fields": { - "model": [ - "note", - "specialtransaction" - ], + "model": 29, "query": "{}", "type": "add", "mask": 2, @@ -487,10 +416,7 @@ "model": "permission.permission", "pk": 27, "fields": { - "model": [ - "note", - "templatecategory" - ], + "model": 21, "query": "{}", "type": "view", "mask": 2, @@ -502,10 +428,7 @@ "model": "permission.permission", "pk": 28, "fields": { - "model": [ - "note", - "templatecategory" - ], + "model": 21, "query": "{}", "type": "change", "mask": 3, @@ -517,10 +440,7 @@ "model": "permission.permission", "pk": 29, "fields": { - "model": [ - "note", - "templatecategory" - ], + "model": 21, "query": "{}", "type": "add", "mask": 3, @@ -532,10 +452,7 @@ "model": "permission.permission", "pk": 30, "fields": { - "model": [ - "note", - "transactiontemplate" - ], + "model": 23, "query": "{}", "type": "view", "mask": 2, @@ -547,10 +464,7 @@ "model": "permission.permission", "pk": 31, "fields": { - "model": [ - "note", - "transactiontemplate" - ], + "model": 23, "query": "{}", "type": "add", "mask": 3, @@ -562,10 +476,7 @@ "model": "permission.permission", "pk": 32, "fields": { - "model": [ - "note", - "transactiontemplate" - ], + "model": 23, "query": "{}", "type": "change", "mask": 3, @@ -577,10 +488,7 @@ "model": "permission.permission", "pk": 33, "fields": { - "model": [ - "note", - "transaction" - ], + "model": 22, "query": "{}", "type": "add", "mask": 2, @@ -592,10 +500,7 @@ "model": "permission.permission", "pk": 34, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "[\"OR\", {\"valid\": true}, {\"creater\": [\"user\"]}]", "type": "view", "mask": 1, @@ -607,10 +512,7 @@ "model": "permission.permission", "pk": 35, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "[\"AND\", {\"valid\": false}, {\"creater\": [\"user\"]}]", "type": "change", "mask": 1, @@ -622,10 +524,7 @@ "model": "permission.permission", "pk": 36, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "{\"creater\": [\"user\"], \"valid\": false}", "type": "add", "mask": 1, @@ -637,10 +536,7 @@ "model": "permission.permission", "pk": 37, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "{}", "type": "change", "mask": 2, @@ -652,10 +548,7 @@ "model": "permission.permission", "pk": 38, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "{}", "type": "change", "mask": 2, @@ -667,10 +560,7 @@ "model": "permission.permission", "pk": 39, "fields": { - "model": [ - "activity", - "guest" - ], + "model": 12, "query": "{\"inviter\": [\"user\", \"note\"], \"activity__activity_type__can_invite\": true}", "type": "add", "mask": 1, @@ -682,10 +572,7 @@ "model": "permission.permission", "pk": 40, "fields": { - "model": [ - "activity", - "guest" - ], + "model": 12, "query": "{\"inviter\": [\"user\", \"note\"]}", "type": "view", "mask": 1, @@ -697,10 +584,7 @@ "model": "permission.permission", "pk": 41, "fields": { - "model": [ - "activity", - "activity" - ], + "model": 9, "query": "{}", "type": "view", "mask": 2, @@ -712,10 +596,7 @@ "model": "permission.permission", "pk": 42, "fields": { - "model": [ - "activity", - "guest" - ], + "model": 12, "query": "{}", "type": "view", "mask": 2, @@ -727,10 +608,7 @@ "model": "permission.permission", "pk": 43, "fields": { - "model": [ - "activity", - "entry" - ], + "model": 11, "query": "{}", "type": "add", "mask": 2, @@ -742,10 +620,7 @@ "model": "permission.permission", "pk": 44, "fields": { - "model": [ - "activity", - "guesttransaction" - ], + "model": 13, "query": "{}", "type": "add", "mask": 2, @@ -757,10 +632,7 @@ "model": "permission.permission", "pk": 45, "fields": { - "model": [ - "activity", - "guesttransaction" - ], + "model": 13, "query": "{}", "type": "view", "mask": 1, @@ -772,10 +644,7 @@ "model": "permission.permission", "pk": 46, "fields": { - "model": [ - "activity", - "guesttransaction" - ], + "model": 13, "query": "{}", "type": "change", "mask": 2, @@ -787,10 +656,7 @@ "model": "permission.permission", "pk": 47, "fields": { - "model": [ - "member", - "club" - ], + "model": 15, "query": "{\"pk\": [\"club\", \"pk\"]}", "type": "change", "mask": 1, @@ -802,10 +668,7 @@ "model": "permission.permission", "pk": 48, "fields": { - "model": [ - "member", - "membership" - ], + "model": 16, "query": "{\"user\": [\"user\"]}", "type": "view", "mask": 1, @@ -817,10 +680,7 @@ "model": "permission.permission", "pk": 49, "fields": { - "model": [ - "member", - "membership" - ], + "model": 16, "query": "{\"club\": [\"club\"]}", "type": "view", "mask": 1, @@ -832,10 +692,7 @@ "model": "permission.permission", "pk": 50, "fields": { - "model": [ - "member", - "membership" - ], + "model": 16, "query": "{\"club\": [\"club\"]}", "type": "add", "mask": 2, @@ -843,6 +700,234 @@ "description": "Add a membership to a club" } }, + { + "model": "permission.permission", + "pk": 51, + "fields": { + "model": 16, + "query": "{\"club\": [\"club\"]}", + "type": "change", + "mask": 2, + "field": "roles", + "description": "Update user roles" + } + }, + { + "model": "permission.permission", + "pk": 52, + "fields": { + "model": 17, + "query": "{\"user\": [\"user\"]}", + "type": "change", + "mask": 1, + "field": "", + "description": "Change own profile" + } + }, + { + "model": "permission.permission", + "pk": 53, + "fields": { + "model": 17, + "query": "{}", + "type": "change", + "mask": 2, + "field": "", + "description": "Change any profile" + } + }, + { + "model": "permission.permission", + "pk": 54, + "fields": { + "model": 4, + "query": "{}", + "type": "change", + "mask": 2, + "field": "", + "description": "Change any user" + } + }, + { + "model": "permission.permission", + "pk": 55, + "fields": { + "model": 4, + "query": "{}", + "type": "add", + "mask": 1, + "field": "", + "description": "Add user" + } + }, + { + "model": "permission.permission", + "pk": 56, + "fields": { + "model": 17, + "query": "{\"email_confirmed\": false, \"registration_valid\": false}", + "type": "add", + "mask": 1, + "field": "", + "description": "Add profile" + } + }, + { + "model": "permission.permission", + "pk": 57, + "fields": { + "model": 4, + "query": "{\"profile__registration_valid\": false}", + "type": "delete", + "mask": 2, + "field": "", + "description": "Delete pre-registered user" + } + }, + { + "model": "permission.permission", + "pk": 58, + "fields": { + "model": 17, + "query": "{\"registration_valid\": false}", + "type": "delete", + "mask": 2, + "field": "", + "description": "Delete pre-registered user profile" + } + }, + { + "model": "permission.permission", + "pk": 59, + "fields": { + "model": 23, + "query": "{\"destination\": [\"club\", \"note\"]}", + "type": "view", + "mask": 2, + "field": "", + "description": "New club button" + } + }, + { + "model": "permission.permission", + "pk": 60, + "fields": { + "model": 23, + "query": "{\"destination\": [\"club\", \"note\"]}", + "type": "add", + "mask": 2, + "field": "", + "description": "Create club button" + } + }, + { + "model": "permission.permission", + "pk": 61, + "fields": { + "model": 23, + "query": "{\"destination\": [\"club\", \"note\"]}", + "type": "change", + "mask": 2, + "field": "", + "description": "Update club button" + } + }, + { + "model": "permission.permission", + "pk": 62, + "fields": { + "model": 22, + "query": "[\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}]", + "type": "view", + "mask": 1, + "field": "", + "description": "View transactions of a club" + } + }, + { + "model": "permission.permission", + "pk": 63, + "fields": { + "model": 33, + "query": "{}", + "type": "view", + "mask": 3, + "field": "", + "description": "View invoices" + } + }, + { + "model": "permission.permission", + "pk": 64, + "fields": { + "model": 33, + "query": "{}", + "type": "add", + "mask": 3, + "field": "", + "description": "Add invoice" + } + }, + { + "model": "permission.permission", + "pk": 65, + "fields": { + "model": 33, + "query": "{}", + "type": "change", + "mask": 3, + "field": "", + "description": "Change invoice" + } + }, + { + "model": "permission.permission", + "pk": 66, + "fields": { + "model": 34, + "query": "{}", + "type": "view", + "mask": 3, + "field": "", + "description": "View products" + } + }, + { + "model": "permission.permission", + "pk": 67, + "fields": { + "model": 34, + "query": "{}", + "type": "add", + "mask": 3, + "field": "", + "description": "Add products" + } + }, + { + "model": "permission.permission", + "pk": 68, + "fields": { + "model": 34, + "query": "{}", + "type": "change", + "mask": 3, + "field": "", + "description": "Change product" + } + }, + { + "model": "permission.permission", + "pk": 69, + "fields": { + "model": 34, + "query": "{}", + "type": "delete", + "mask": 3, + "field": "", + "description": "Delete product" + } + }, { "model": "permission.rolepermissions", "pk": 1, @@ -851,12 +936,18 @@ "permissions": [ 1, 2, + 3, + 4, + 5, 7, 8, 9, 10, 11, - 48 + 12, + 13, + 48, + 52 ] } }, @@ -866,19 +957,7 @@ "fields": { "role": 2, "permissions": [ - 1, - 2, - 3, - 4, - 5, 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, 14, 15, 16, @@ -894,23 +973,73 @@ }, { "model": "permission.rolepermissions", - "pk": 3, + "pk": 4, "fields": { - "role": 8, + "role": 4, "permissions": [ - 19, - 20, - 21, - 22 + 22, + 47, + 49 ] } }, { "model": "permission.rolepermissions", - "pk": 4, + "pk": 5, "fields": { - "role": 4, + "role": 5, "permissions": [ + 50, + 51, + 62 + ] + } + }, + { + "model": "permission.rolepermissions", + "pk": 6, + "fields": { + "role": 6, + "permissions": [ + 19, + 21, + 27, + 59, + 60, + 61, + 20, + 62 + ] + } + }, + { + "model": "permission.rolepermissions", + "pk": 7, + "fields": { + "role": 7, + "permissions": [ + 33, + 24, + 25, + 26, + 27 + ] + } + }, + { + "model": "permission.rolepermissions", + "pk": 8, + "fields": { + "role": 8, + "permissions": [ + 32, + 33, + 56, + 58, + 55, + 57, + 53, + 54, 23, 24, 25, @@ -920,44 +1049,21 @@ 29, 30, 31, - 32, - 33 + 64, + 65, + 66, + 67, + 68, + 69, + 63 ] } }, { "model": "permission.rolepermissions", - "pk": 5, + "pk": 9, "fields": { "role": 9, - "permissions": [ - 37, - 38, - 41, - 42, - 43, - 44, - 45, - 46 - ] - } - }, - { - "model": "permission.rolepermissions", - "pk": 6, - "fields": { - "role": 7, - "permissions": [ - 22, - 47 - ] - } - }, - { - "model": "permission.rolepermissions", - "pk": 7, - "fields": { - "role": 5, "permissions": [ 1, 2, @@ -978,7 +1084,6 @@ 17, 18, 19, - 20, 21, 22, 23, @@ -1008,7 +1113,71 @@ 47, 48, 49, - 50 + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 20, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69 + ] + } + }, + { + "model": "permission.rolepermissions", + "pk": 10, + "fields": { + "role": 10, + "permissions": [ + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 52, + 53, + 54, + 55, + 56, + 57, + 58 + ] + } + }, + { + "model": "permission.rolepermissions", + "pk": 11, + "fields": { + "role": 11, + "permissions": [ + 37, + 38, + 41, + 42, + 43, + 44, + 45, + 46 ] } } diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 4955c4a8..cba5c2ae 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -68,7 +68,7 @@ class ValidationForm(forms.Form): join_BDE = forms.BooleanField( label=_("Join BDE Club"), - required=True, + required=False, initial=True, ) diff --git a/apps/registration/views.py b/apps/registration/views.py index 2daca037..575ada8f 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -12,6 +12,7 @@ from django.utils.http import urlsafe_base64_decode from django.utils.translation import gettext_lazy as _ from django.views import View from django.views.generic import CreateView, TemplateView, DetailView, FormView +from django.views.generic.edit import FormMixin from django_tables2 import SingleTableView from member.forms import ProfileForm from member.models import Membership, Club, Role @@ -88,7 +89,7 @@ class UserValidateView(TemplateView): if user is not None and email_validation_token.check_token(user, token): self.validlink = True # The user must wait that someone validates the account before the user can be active and login. - user.is_active = user.profile.registration_valid + user.is_active = user.profile.registration_valid or user.is_superuser user.profile.email_confirmed = True user.save() user.profile.save() @@ -185,7 +186,7 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi return context -class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, FormView): +class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView): """ Display information about a pre-registered user, in order to complete the registration. """ @@ -194,6 +195,14 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, context_object_name = "user_object" template_name = "registration/future_profile_detail.html" + def post(self, request, *args, **kwargs): + form = self.get_form() + self.object = self.get_object() + if form.is_valid(): + return self.form_valid(form) + else: + return self.form_invalid(form) + def get_queryset(self, **kwargs): """ We only display information of a not registered user. @@ -221,7 +230,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, return form def form_valid(self, form): - user = self.object = self.get_object() + user = self.get_object() # Get form data soge = form.cleaned_data["soge"] @@ -238,6 +247,10 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, join_BDE = True join_Kfet = True + if not join_BDE: + form.add_error('join_BDE', _("You must join the BDE.")) + return super().form_invalid(form) + fee = 0 bde = Club.objects.get(name="BDE") bde_fee = bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid @@ -254,6 +267,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, credit_amount = fee bank = "Société générale" + print("OK") + if join_Kfet and not join_BDE: form.add_error('join_Kfet', _("You must join BDE club before joining Kfet club.")) @@ -277,7 +292,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView, # Save the user and finally validate the registration # Saving the user creates the associated note ret = super().form_valid(form) - user.is_active = user.profile.email_confirmed + user.is_active = user.profile.email_confirmed or user.is_superuser user.profile.registration_valid = True # Store if Société générale paid for next years user.profile.soge = soge From 6fedbe2a2aa08585df735d4548c7f490e2961bc1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 10:58:16 +0200 Subject: [PATCH 61/66] Some model translations were missing --- apps/activity/models.py | 2 + apps/logs/models.py | 4 + apps/permission/models.py | 10 ++ apps/treasury/models.py | 20 +++ locale/de/LC_MESSAGES/django.po | 223 +++++++++++++++++++++----------- locale/fr/LC_MESSAGES/django.po | 223 +++++++++++++++++++++----------- 6 files changed, 332 insertions(+), 150 deletions(-) diff --git a/apps/activity/models.py b/apps/activity/models.py index ed2d94c9..215aa0cc 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -130,6 +130,8 @@ class Entry(models.Model): class Meta: unique_together = (('activity', 'note', 'guest', ), ) + verbose_name = _("entry") + verbose_name_plural = _("entries") def save(self, force_insert=False, force_update=False, using=None, update_fields=None): diff --git a/apps/logs/models.py b/apps/logs/models.py index 10e2651f..94e2b4ce 100644 --- a/apps/logs/models.py +++ b/apps/logs/models.py @@ -75,3 +75,7 @@ class Changelog(models.Model): def delete(self, using=None, keep_parents=False): raise ValidationError(_("Logs cannot be destroyed.")) + + class Meta: + verbose_name = _("changelog") + verbose_name_plural = _("changelogs") diff --git a/apps/permission/models.py b/apps/permission/models.py index 8aaf416c..81174389 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -106,6 +106,10 @@ class PermissionMask(models.Model): def __str__(self): return self.description + class Meta: + verbose_name = _("permission mask") + verbose_name_plural = _("permission masks") + class Permission(models.Model): @@ -153,6 +157,8 @@ class Permission(models.Model): class Meta: unique_together = ('model', 'query', 'type', 'field') + verbose_name = _("permission") + verbose_name_plural = _("permissions") def clean(self): self.query = json.dumps(json.loads(self.query)) @@ -293,3 +299,7 @@ class RolePermissions(models.Model): def __str__(self): return str(self.role) + + class Meta: + verbose_name = _("role permissions") + verbose_name_plural = _("role permissions") diff --git a/apps/treasury/models.py b/apps/treasury/models.py index bcd89db9..ca1da3a4 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -59,6 +59,10 @@ class Invoice(models.Model): verbose_name=_("Acquitted"), ) + class Meta: + verbose_name = _("invoice") + verbose_name_plural = _("invoices") + class Product(models.Model): """ @@ -95,6 +99,10 @@ class Product(models.Model): def total_euros(self): return self.total / 100 + class Meta: + verbose_name = _("product") + verbose_name_plural = _("products") + class RemittanceType(models.Model): """ @@ -109,6 +117,10 @@ class RemittanceType(models.Model): def __str__(self): return str(self.note) + class Meta: + verbose_name = _("remittance type") + verbose_name_plural = _("remittance types") + class Remittance(models.Model): """ @@ -136,6 +148,10 @@ class Remittance(models.Model): verbose_name=_("Closed"), ) + class Meta: + verbose_name = _("remittance") + verbose_name_plural = _("remittances") + @property def transactions(self): """ @@ -187,3 +203,7 @@ class SpecialTransactionProxy(models.Model): null=True, verbose_name=_("Remittance"), ) + + class Meta: + verbose_name = _("special transaction proxy") + verbose_name_plural = _("special transaction proxies") diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 1e791220..ff98db5b 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-04-06 06:43+0200\n" +"POT-Creation-Date: 2020-04-06 10:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,23 +23,23 @@ msgstr "" msgid "activity" msgstr "" -#: apps/activity/forms.py:45 apps/activity/models.py:206 +#: apps/activity/forms.py:45 apps/activity/models.py:208 msgid "You can't invite someone once the activity is started." msgstr "" -#: apps/activity/forms.py:48 apps/activity/models.py:209 +#: apps/activity/forms.py:48 apps/activity/models.py:211 msgid "This activity is not validated yet." msgstr "" -#: apps/activity/forms.py:58 apps/activity/models.py:217 +#: apps/activity/forms.py:58 apps/activity/models.py:219 msgid "This person has been already invited 5 times this year." msgstr "" -#: apps/activity/forms.py:62 apps/activity/models.py:221 +#: apps/activity/forms.py:62 apps/activity/models.py:223 msgid "This person is already invited." msgstr "" -#: apps/activity/forms.py:66 apps/activity/models.py:225 +#: apps/activity/forms.py:66 apps/activity/models.py:227 msgid "You can't invite more than 3 people to this activity." msgstr "" @@ -122,40 +122,48 @@ msgstr "" msgid "note" msgstr "" -#: apps/activity/models.py:139 +#: apps/activity/models.py:133 templates/activity/activity_entry.html:38 +msgid "entry" +msgstr "" + +#: apps/activity/models.py:134 templates/activity/activity_entry.html:38 +msgid "entries" +msgstr "" + +#: apps/activity/models.py:141 msgid "Already entered on " msgstr "" -#: apps/activity/models.py:139 apps/activity/tables.py:54 +#: apps/activity/models.py:141 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "" -#: apps/activity/models.py:147 +#: apps/activity/models.py:149 msgid "The balance is negative." msgstr "" -#: apps/activity/models.py:177 +#: apps/activity/models.py:179 msgid "last name" msgstr "" -#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: apps/activity/models.py:184 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 msgid "first name" msgstr "" -#: apps/activity/models.py:189 +#: apps/activity/models.py:191 msgid "inviter" msgstr "" -#: apps/activity/models.py:230 +#: apps/activity/models.py:232 msgid "guest" msgstr "" -#: apps/activity/models.py:231 +#: apps/activity/models.py:233 msgid "guests" msgstr "" -#: apps/activity/models.py:243 +#: apps/activity/models.py:245 msgid "Invitation" msgstr "" @@ -167,17 +175,17 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:75 apps/treasury/models.py:126 +#: apps/activity/tables.py:75 apps/treasury/models.py:138 msgid "Type" msgstr "" #: apps/activity/tables.py:77 apps/member/forms.py:75 -#: apps/registration/forms.py:49 apps/treasury/forms.py:121 +#: apps/registration/forms.py:55 apps/treasury/forms.py:121 msgid "Last name" msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:80 -#: apps/registration/forms.py:54 apps/treasury/forms.py:123 +#: apps/registration/forms.py:60 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:97 msgid "First name" msgstr "" @@ -186,7 +194,7 @@ msgstr "" msgid "Note" msgstr "" -#: apps/activity/tables.py:83 apps/member/tables.py:35 +#: apps/activity/tables.py:83 apps/member/tables.py:41 msgid "Balance" msgstr "" @@ -251,23 +259,31 @@ msgstr "" msgid "Logs cannot be destroyed." msgstr "" +#: apps/logs/models.py:80 +msgid "changelog" +msgstr "" + +#: apps/logs/models.py:81 +msgid "changelogs" +msgstr "" + #: apps/member/apps.py:14 msgid "member" msgstr "" -#: apps/member/forms.py:54 apps/registration/forms.py:29 +#: apps/member/forms.py:54 apps/registration/forms.py:35 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:56 apps/registration/forms.py:31 +#: apps/member/forms.py:56 apps/registration/forms.py:37 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:61 apps/registration/forms.py:36 +#: apps/member/forms.py:61 apps/registration/forms.py:42 msgid "Credit type" msgstr "" -#: apps/member/forms.py:62 apps/registration/forms.py:37 +#: apps/member/forms.py:62 apps/registration/forms.py:43 msgid "No credit" msgstr "" @@ -275,11 +291,11 @@ msgstr "" msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:68 apps/registration/forms.py:42 +#: apps/member/forms.py:68 apps/registration/forms.py:48 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:85 apps/registration/forms.py:59 +#: apps/member/forms.py:85 apps/registration/forms.py:65 #: apps/treasury/forms.py:125 templates/note/transaction_form.html:103 msgid "Bank" msgstr "" @@ -392,7 +408,7 @@ msgstr "" msgid "clubs" msgstr "" -#: apps/member/models.py:209 apps/permission/models.py:288 +#: apps/member/models.py:209 apps/permission/models.py:294 msgid "role" msgstr "" @@ -412,65 +428,65 @@ msgstr "" msgid "fee" msgstr "" -#: apps/member/models.py:261 apps/member/views.py:447 +#: apps/member/models.py:267 apps/member/views.py:491 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:271 apps/member/views.py:456 +#: apps/member/models.py:277 apps/member/views.py:500 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:306 +#: apps/member/models.py:315 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:309 +#: apps/member/models.py:318 msgid "membership" msgstr "" -#: apps/member/models.py:310 +#: apps/member/models.py:319 msgid "memberships" msgstr "" -#: apps/member/tables.py:93 +#: apps/member/tables.py:112 msgid "Renew" msgstr "" -#: apps/member/views.py:56 apps/registration/forms.py:20 +#: apps/member/views.py:62 apps/registration/forms.py:23 msgid "This address must be valid." msgstr "" -#: apps/member/views.py:59 templates/member/profile_info.html:45 +#: apps/member/views.py:65 templates/member/profile_info.html:45 #: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "" -#: apps/member/views.py:69 +#: apps/member/views.py:75 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:164 +#: apps/member/views.py:175 msgid "Search user" msgstr "" -#: apps/member/views.py:442 +#: apps/member/views.py:486 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:460 +#: apps/member/views.py:504 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:465 +#: apps/member/views.py:509 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:472 apps/member/views.py:474 apps/member/views.py:476 -#: apps/registration/views.py:237 apps/registration/views.py:239 -#: apps/registration/views.py:241 +#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523 +#: apps/registration/views.py:285 apps/registration/views.py:287 +#: apps/registration/views.py:289 msgid "This field is required." msgstr "" @@ -711,16 +727,16 @@ msgstr "" msgid "Transfer money" msgstr "" -#: apps/note/views.py:107 templates/base.html:79 +#: apps/note/views.py:109 templates/base.html:79 msgid "Consumptions" msgstr "" -#: apps/permission/models.py:82 apps/permission/models.py:275 +#: apps/permission/models.py:82 apps/permission/models.py:281 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:84 apps/permission/models.py:277 +#: apps/permission/models.py:84 apps/permission/models.py:283 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" @@ -729,43 +745,67 @@ msgstr "" msgid "rank" msgstr "" +#: apps/permission/models.py:110 +msgid "permission mask" +msgstr "" + +#: apps/permission/models.py:111 +msgid "permission masks" +msgstr "" + #: apps/permission/models.py:160 +msgid "permission" +msgstr "" + +#: apps/permission/models.py:161 +msgid "permissions" +msgstr "" + +#: apps/permission/models.py:166 msgid "Specifying field applies only to view and change permission types." msgstr "" +#: apps/permission/models.py:304 apps/permission/models.py:305 +msgid "role permissions" +msgstr "" + #: apps/registration/apps.py:10 msgid "registration" msgstr "" -#: apps/registration/forms.py:64 +#: apps/registration/forms.py:70 msgid "Join BDE Club" msgstr "" -#: apps/registration/forms.py:70 +#: apps/registration/forms.py:77 msgid "Join Kfet Club" msgstr "" -#: apps/registration/views.py:70 +#: apps/registration/views.py:75 msgid "Email validation" msgstr "" -#: apps/registration/views.py:114 +#: apps/registration/views.py:120 msgid "Email validation unsuccessful" msgstr "" -#: apps/registration/views.py:122 +#: apps/registration/views.py:131 msgid "Email validation email sent" msgstr "" -#: apps/registration/views.py:154 +#: apps/registration/views.py:184 msgid "Unregistered users" msgstr "" -#: apps/registration/views.py:226 +#: apps/registration/views.py:251 +msgid "You must join the BDE." +msgstr "" + +#: apps/registration/views.py:273 msgid "You must join BDE club before joining Kfet club." msgstr "" -#: apps/registration/views.py:230 +#: apps/registration/views.py:278 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" @@ -833,40 +873,80 @@ msgstr "" msgid "Acquitted" msgstr "" -#: apps/treasury/models.py:75 -msgid "Designation" +#: apps/treasury/models.py:63 +msgid "invoice" +msgstr "" + +#: apps/treasury/models.py:64 +msgid "invoices" msgstr "" #: apps/treasury/models.py:79 -msgid "Quantity" +msgid "Designation" msgstr "" #: apps/treasury/models.py:83 +msgid "Quantity" +msgstr "" + +#: apps/treasury/models.py:87 msgid "Unit price" msgstr "" -#: apps/treasury/models.py:120 +#: apps/treasury/models.py:103 +msgid "product" +msgstr "" + +#: apps/treasury/models.py:104 +msgid "products" +msgstr "" + +#: apps/treasury/models.py:121 +msgid "remittance type" +msgstr "" + +#: apps/treasury/models.py:122 +msgid "remittance types" +msgstr "" + +#: apps/treasury/models.py:132 msgid "Date" msgstr "" -#: apps/treasury/models.py:131 +#: apps/treasury/models.py:143 msgid "Comment" msgstr "" -#: apps/treasury/models.py:136 +#: apps/treasury/models.py:148 msgid "Closed" msgstr "" -#: apps/treasury/models.py:169 +#: apps/treasury/models.py:152 +msgid "remittance" +msgstr "" + +#: apps/treasury/models.py:153 +msgid "remittances" +msgstr "" + +#: apps/treasury/models.py:185 msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:188 apps/treasury/tables.py:76 +#: apps/treasury/models.py:204 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/models.py:208 +msgid "special transaction proxy" +msgstr "" + +#: apps/treasury/models.py:209 +msgid "special transaction proxies" +msgstr "" + #: apps/treasury/tables.py:19 msgid "Invoice #{:d}" msgstr "" @@ -952,14 +1032,6 @@ msgstr "" msgid "Return to activity page" msgstr "" -#: templates/activity/activity_entry.html:38 -msgid "entries" -msgstr "" - -#: templates/activity/activity_entry.html:38 -msgid "entry" -msgstr "" - #: templates/activity/activity_list.html:5 msgid "Upcoming activities" msgstr "" @@ -1155,6 +1227,11 @@ msgstr "" msgid "Save Changes" msgstr "" +#: templates/member/user_list.html:14 +#: templates/registration/future_user_list.html:17 +msgid "There is no pending user with this pattern." +msgstr "" + #: templates/note/conso_form.html:28 templates/note/transaction_form.html:55 msgid "Select emitters" msgstr "" @@ -1229,11 +1306,11 @@ msgstr "" msgid "buttons listing " msgstr "" -#: templates/note/transactiontemplate_list.html:71 +#: templates/note/transactiontemplate_list.html:70 msgid "button successfully deleted " msgstr "" -#: templates/note/transactiontemplate_list.html:75 +#: templates/note/transactiontemplate_list.html:74 msgid "Unable to delete button " msgstr "" @@ -1266,10 +1343,6 @@ msgstr "" msgid "New user" msgstr "" -#: templates/registration/future_user_list.html:17 -msgid "There is no pending user with this pattern." -msgstr "" - #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 4e282bea..be518ebf 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-04-06 06:43+0200\n" +"POT-Creation-Date: 2020-04-06 10:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,24 +18,24 @@ msgstr "" msgid "activity" msgstr "activité" -#: apps/activity/forms.py:45 apps/activity/models.py:206 +#: apps/activity/forms.py:45 apps/activity/models.py:208 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:209 +#: apps/activity/forms.py:48 apps/activity/models.py:211 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:217 +#: apps/activity/forms.py:58 apps/activity/models.py:219 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:62 apps/activity/models.py:221 +#: apps/activity/forms.py:62 apps/activity/models.py:223 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:66 apps/activity/models.py:225 +#: apps/activity/forms.py:66 apps/activity/models.py:227 msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." @@ -118,40 +118,48 @@ msgstr "heure d'entrée" msgid "note" msgstr "note" -#: apps/activity/models.py:139 +#: apps/activity/models.py:133 templates/activity/activity_entry.html:38 +msgid "entry" +msgstr "entrée" + +#: apps/activity/models.py:134 templates/activity/activity_entry.html:38 +msgid "entries" +msgstr "entrées" + +#: apps/activity/models.py:141 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:139 apps/activity/tables.py:54 +#: apps/activity/models.py:141 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:147 +#: apps/activity/models.py:149 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:177 +#: apps/activity/models.py:179 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:182 templates/member/profile_info.html:14 +#: apps/activity/models.py:184 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:189 +#: apps/activity/models.py:191 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:230 +#: apps/activity/models.py:232 msgid "guest" msgstr "invité" -#: apps/activity/models.py:231 +#: apps/activity/models.py:233 msgid "guests" msgstr "invités" -#: apps/activity/models.py:243 +#: apps/activity/models.py:245 msgid "Invitation" msgstr "Invitation" @@ -163,17 +171,17 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:75 apps/treasury/models.py:126 +#: apps/activity/tables.py:75 apps/treasury/models.py:138 msgid "Type" msgstr "Type" #: apps/activity/tables.py:77 apps/member/forms.py:75 -#: apps/registration/forms.py:49 apps/treasury/forms.py:121 +#: apps/registration/forms.py:55 apps/treasury/forms.py:121 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:80 -#: apps/registration/forms.py:54 apps/treasury/forms.py:123 +#: apps/registration/forms.py:60 apps/treasury/forms.py:123 #: templates/note/transaction_form.html:97 msgid "First name" msgstr "Prénom" @@ -182,7 +190,7 @@ msgstr "Prénom" msgid "Note" msgstr "Note" -#: apps/activity/tables.py:83 apps/member/tables.py:35 +#: apps/activity/tables.py:83 apps/member/tables.py:41 msgid "Balance" msgstr "Solde du compte" @@ -247,23 +255,31 @@ msgstr "Date" msgid "Logs cannot be destroyed." msgstr "Les logs ne peuvent pas être détruits." +#: apps/logs/models.py:80 +msgid "changelog" +msgstr "" + +#: apps/logs/models.py:81 +msgid "changelogs" +msgstr "" + #: apps/member/apps.py:14 msgid "member" msgstr "adhérent" -#: apps/member/forms.py:54 apps/registration/forms.py:29 +#: apps/member/forms.py:54 apps/registration/forms.py:35 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:56 apps/registration/forms.py:31 +#: apps/member/forms.py:56 apps/registration/forms.py:37 msgid "Check this case is the Société Générale paid the inscription." msgstr "Cochez cette case si la Société Générale a payé l'inscription." -#: apps/member/forms.py:61 apps/registration/forms.py:36 +#: apps/member/forms.py:61 apps/registration/forms.py:42 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:62 apps/registration/forms.py:37 +#: apps/member/forms.py:62 apps/registration/forms.py:43 msgid "No credit" msgstr "Pas de rechargement" @@ -271,11 +287,11 @@ msgstr "Pas de rechargement" msgid "You can credit the note of the user." msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion." -#: apps/member/forms.py:68 apps/registration/forms.py:42 +#: apps/member/forms.py:68 apps/registration/forms.py:48 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:85 apps/registration/forms.py:59 +#: apps/member/forms.py:85 apps/registration/forms.py:65 #: apps/treasury/forms.py:125 templates/note/transaction_form.html:103 msgid "Bank" msgstr "Banque" @@ -392,7 +408,7 @@ msgstr "club" msgid "clubs" msgstr "clubs" -#: apps/member/models.py:209 apps/permission/models.py:288 +#: apps/member/models.py:209 apps/permission/models.py:294 msgid "role" msgstr "rôle" @@ -412,49 +428,49 @@ msgstr "l'adhésion finit le" msgid "fee" msgstr "cotisation" -#: apps/member/models.py:261 apps/member/views.py:447 +#: apps/member/models.py:267 apps/member/views.py:491 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:271 apps/member/views.py:456 +#: apps/member/models.py:277 apps/member/views.py:500 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:306 +#: apps/member/models.py:315 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:309 +#: apps/member/models.py:318 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:310 +#: apps/member/models.py:319 msgid "memberships" msgstr "adhésions" -#: apps/member/tables.py:93 +#: apps/member/tables.py:112 msgid "Renew" msgstr "Renouveler" -#: apps/member/views.py:56 apps/registration/forms.py:20 +#: apps/member/views.py:62 apps/registration/forms.py:23 msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:59 templates/member/profile_info.html:45 +#: apps/member/views.py:65 templates/member/profile_info.html:45 #: templates/registration/future_profile_detail.html:55 msgid "Update Profile" msgstr "Modifier le profil" -#: apps/member/views.py:69 +#: apps/member/views.py:75 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:164 +#: apps/member/views.py:175 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:442 +#: apps/member/views.py:486 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -462,17 +478,17 @@ msgstr "" "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas " "avoir un solde négatif." -#: apps/member/views.py:460 +#: apps/member/views.py:504 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:465 +#: apps/member/views.py:509 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:472 apps/member/views.py:474 apps/member/views.py:476 -#: apps/registration/views.py:237 apps/registration/views.py:239 -#: apps/registration/views.py:241 +#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523 +#: apps/registration/views.py:285 apps/registration/views.py:287 +#: apps/registration/views.py:289 msgid "This field is required." msgstr "Ce champ est requis." @@ -714,16 +730,16 @@ msgstr "Éditer" msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:107 templates/base.html:79 +#: apps/note/views.py:109 templates/base.html:79 msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:82 apps/permission/models.py:275 +#: apps/permission/models.py:82 apps/permission/models.py:281 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:84 apps/permission/models.py:277 +#: apps/permission/models.py:84 apps/permission/models.py:283 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" @@ -732,43 +748,67 @@ msgstr "" msgid "rank" msgstr "Rang" +#: apps/permission/models.py:110 +msgid "permission mask" +msgstr "masque de permissions" + +#: apps/permission/models.py:111 +msgid "permission masks" +msgstr "masques de permissions" + #: apps/permission/models.py:160 +msgid "permission" +msgstr "permission" + +#: apps/permission/models.py:161 +msgid "permissions" +msgstr "permissions" + +#: apps/permission/models.py:166 msgid "Specifying field applies only to view and change permission types." msgstr "" +#: apps/permission/models.py:304 apps/permission/models.py:305 +msgid "role permissions" +msgstr "Permissions par rôles" + #: apps/registration/apps.py:10 msgid "registration" msgstr "inscription" -#: apps/registration/forms.py:64 +#: apps/registration/forms.py:70 msgid "Join BDE Club" msgstr "Adhérer au club BDE" -#: apps/registration/forms.py:70 +#: apps/registration/forms.py:77 msgid "Join Kfet Club" msgstr "Adhérer au club Kfet" -#: apps/registration/views.py:70 +#: apps/registration/views.py:75 msgid "Email validation" msgstr "Validation de l'adresse mail" -#: apps/registration/views.py:114 +#: apps/registration/views.py:120 msgid "Email validation unsuccessful" msgstr " La validation de l'adresse mail a échoué" -#: apps/registration/views.py:122 +#: apps/registration/views.py:131 msgid "Email validation email sent" msgstr "L'email de vérification de l'adresse email a bien été envoyé." -#: apps/registration/views.py:154 +#: apps/registration/views.py:184 msgid "Unregistered users" msgstr "Utilisateurs en attente d'inscription" -#: apps/registration/views.py:226 +#: apps/registration/views.py:251 +msgid "You must join the BDE." +msgstr "Vous devez adhérer au BDE." + +#: apps/registration/views.py:273 msgid "You must join BDE club before joining Kfet club." msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet." -#: apps/registration/views.py:230 +#: apps/registration/views.py:278 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" @@ -838,40 +878,80 @@ msgstr "Lieu" msgid "Acquitted" msgstr "Acquittée" -#: apps/treasury/models.py:75 +#: apps/treasury/models.py:63 +msgid "invoice" +msgstr "facture" + +#: apps/treasury/models.py:64 +msgid "invoices" +msgstr "factures" + +#: apps/treasury/models.py:79 msgid "Designation" msgstr "Désignation" -#: apps/treasury/models.py:79 +#: apps/treasury/models.py:83 msgid "Quantity" msgstr "Quantité" -#: apps/treasury/models.py:83 +#: apps/treasury/models.py:87 msgid "Unit price" msgstr "Prix unitaire" -#: apps/treasury/models.py:120 +#: apps/treasury/models.py:103 +msgid "product" +msgstr "produit" + +#: apps/treasury/models.py:104 +msgid "products" +msgstr "produits" + +#: apps/treasury/models.py:121 +msgid "remittance type" +msgstr "type de remise" + +#: apps/treasury/models.py:122 +msgid "remittance types" +msgstr "types de remises" + +#: apps/treasury/models.py:132 msgid "Date" msgstr "Date" -#: apps/treasury/models.py:131 +#: apps/treasury/models.py:143 msgid "Comment" msgstr "Commentaire" -#: apps/treasury/models.py:136 +#: apps/treasury/models.py:148 msgid "Closed" msgstr "Fermée" -#: apps/treasury/models.py:169 +#: apps/treasury/models.py:152 +msgid "remittance" +msgstr "remise" + +#: apps/treasury/models.py:153 +msgid "remittances" +msgstr "remises" + +#: apps/treasury/models.py:185 msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:188 apps/treasury/tables.py:76 +#: apps/treasury/models.py:204 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/models.py:208 +msgid "special transaction proxy" +msgstr "Proxy de transaction spéciale" + +#: apps/treasury/models.py:209 +msgid "special transaction proxies" +msgstr "Proxys de transactions spéciales" + #: apps/treasury/tables.py:19 msgid "Invoice #{:d}" msgstr "Facture n°{:d}" @@ -957,14 +1037,6 @@ msgstr "Entrées" msgid "Return to activity page" msgstr "Retour à la page de l'activité" -#: templates/activity/activity_entry.html:38 -msgid "entries" -msgstr "entrées" - -#: templates/activity/activity_entry.html:38 -msgid "entry" -msgstr "entrée" - #: templates/activity/activity_list.html:5 msgid "Upcoming activities" msgstr "Activités à venir" @@ -1162,6 +1234,11 @@ msgstr "Voir mes adhésions" msgid "Save Changes" msgstr "Sauvegarder les changements" +#: templates/member/user_list.html:14 +#: templates/registration/future_user_list.html:17 +msgid "There is no pending user with this pattern." +msgstr "Il n'y a pas d'inscription en attente avec cette entrée." + #: templates/note/conso_form.html:28 templates/note/transaction_form.html:55 msgid "Select emitters" msgstr "Sélection des émetteurs" @@ -1236,11 +1313,11 @@ msgstr "Nouveau bouton" msgid "buttons listing " msgstr "Liste des boutons" -#: templates/note/transactiontemplate_list.html:71 +#: templates/note/transactiontemplate_list.html:70 msgid "button successfully deleted " msgstr "Le bouton a bien été supprimé" -#: templates/note/transactiontemplate_list.html:75 +#: templates/note/transactiontemplate_list.html:74 msgid "Unable to delete button " msgstr "Impossible de supprimer le bouton " @@ -1273,10 +1350,6 @@ msgstr "Valider l'inscription" msgid "New user" msgstr "Nouvel utilisateur" -#: templates/registration/future_user_list.html:17 -msgid "There is no pending user with this pattern." -msgstr "Il n'y a pas d'inscription en attente avec cette entrée." - #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" From 9fbfac7bdb71d861d167fb99cf0dfdbb1af10158 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 6 Apr 2020 11:43:17 +0200 Subject: [PATCH 62/66] distinct on field not supported by sqlite --- apps/activity/views.py | 2 +- apps/permission/backends.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 51e2ebf5..34670d36 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -139,7 +139,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): | Q(name__regex=pattern) | Q(normalized_name__regex=Alias.normalize(pattern)))) \ .filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\ - .distinct("username")[:20] + .distinct()[:20] for note in note_qs: note.type = "Adhérent" note.activity = activity diff --git a/apps/permission/backends.py b/apps/permission/backends.py index 4fb7b577..04d93528 100644 --- a/apps/permission/backends.py +++ b/apps/permission/backends.py @@ -43,7 +43,7 @@ class PermissionBackend(ModelBackend): rolepermissions__role__membership__date_end__gte=datetime.date.today(), type=t, mask__rank__lte=get_current_session().get("permission_mask", 0), - ).distinct('club', 'pk',) + ).distinct() @staticmethod def permissions(user, model, type): From 61b32f9aec5f007d7374ced073934d7ae933bb20 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 6 Apr 2020 12:13:12 +0200 Subject: [PATCH 63/66] explicit context is better than implicit ctx --- apps/activity/views.py | 32 ++++++++++++++++---------------- apps/treasury/views.py | 34 +++++++++++++++++----------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 51e2ebf5..1fe2d97a 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -40,15 +40,15 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView return super().get_queryset().reverse() def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx['title'] = _("Activities") + context['title'] = _("Activities") upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now()) - ctx['upcoming'] = ActivityTable(data=upcoming_activities + context['upcoming'] = ActivityTable(data=upcoming_activities .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))) - return ctx + return context class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): @@ -56,15 +56,15 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context_object_name = "activity" def get_context_data(self, **kwargs): - ctx = super().get_context_data() + context = 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 + context["guests"] = table - ctx["activity_started"] = datetime.now(timezone.utc) > self.object.date_start + context["activity_started"] = datetime.now(timezone.utc) > self.object.date_start - return ctx + return context class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -99,11 +99,11 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): template_name = "activity/activity_entry.html" def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ .get(pk=self.kwargs["pk"]) - ctx["activity"] = activity + context["activity"] = activity matched = [] @@ -146,12 +146,12 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): matched.append(note) table = EntryTable(data=matched) - ctx["table"] = table + context["table"] = table - ctx["entries"] = Entry.objects.filter(activity=activity) + context["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 + context["title"] = _('Entry for activity "{}"').format(activity.name) + context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk + context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk - return ctx + return context diff --git a/apps/treasury/views.py b/apps/treasury/views.py index f564ccb2..7361d1d2 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -201,14 +201,14 @@ class RemittanceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView) return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects + context["table"] = RemittanceTable(data=Remittance.objects .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view")) .all()) - ctx["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) + context["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none()) - return ctx + return context class RemittanceListView(LoginRequiredMixin, TemplateView): @@ -218,27 +218,27 @@ class RemittanceListView(LoginRequiredMixin, TemplateView): template_name = "treasury/remittance_list.html" def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["opened_remittances"] = RemittanceTable( + context["opened_remittances"] = RemittanceTable( data=Remittance.objects.filter(closed=False).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) - ctx["closed_remittances"] = RemittanceTable( + context["closed_remittances"] = RemittanceTable( data=Remittance.objects.filter(closed=True).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all()) - ctx["special_transactions_no_remittance"] = SpecialTransactionTable( + context["special_transactions_no_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), specialtransactionproxy__remittance=None).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_remove', )) - ctx["special_transactions_with_remittance"] = SpecialTransactionTable( + context["special_transactions_with_remittance"] = SpecialTransactionTable( data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)), specialtransactionproxy__remittance__closed=False).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), exclude=('remittance_add', )) - return ctx + return context class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -252,17 +252,17 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView) return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - ctx["table"] = RemittanceTable(data=Remittance.objects.filter( + context["table"] = RemittanceTable(data=Remittance.objects.filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() - ctx["special_transactions"] = SpecialTransactionTable( + context["special_transactions"] = SpecialTransactionTable( data=data, exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )) - return ctx + return context class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): @@ -277,9 +277,9 @@ class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, return reverse_lazy('treasury:remittance_list') def get_context_data(self, **kwargs): - ctx = super().get_context_data(**kwargs) + context = super().get_context_data(**kwargs) - form = ctx["form"] + form = context["form"] form.fields["last_name"].initial = self.object.transaction.last_name form.fields["first_name"].initial = self.object.transaction.first_name form.fields["bank"].initial = self.object.transaction.bank @@ -287,7 +287,7 @@ class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, form.fields["remittance"].queryset = form.fields["remittance"] \ .queryset.filter(remittance_type__note=self.object.transaction.source) - return ctx + return context class UnlinkTransactionToRemittanceView(LoginRequiredMixin, View): From 7e0aac0125239df717fb7a7c09bd92ea2d346b26 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 6 Apr 2020 12:32:44 +0200 Subject: [PATCH 64/66] add docstring for entry --- apps/activity/models.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/activity/models.py b/apps/activity/models.py index ed2d94c9..60653b3c 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -104,6 +104,12 @@ class Activity(models.Model): class Entry(models.Model): + """ + Register the entry of someone: + - a member with a :model:`note.NoteUser` + - or a :model:`activity.Guest` + In the case of a Guest Entry, the inviter note is also save. + """ activity = models.ForeignKey( Activity, on_delete=models.PROTECT, @@ -131,8 +137,7 @@ class Entry(models.Model): class Meta: unique_together = (('activity', 'note', 'guest', ), ) - def save(self, force_insert=False, force_update=False, using=None, - update_fields=None): + def save(self, *args,**kwargs): qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest) if qs.exists(): @@ -146,7 +151,7 @@ class Entry(models.Model): if self.note.balance < 0: raise ValidationError(_("The balance is negative.")) - ret = super().save(force_insert, force_update, using, update_fields) + ret = super().save(*args,**kwargs) if insert and self.guest: GuestTransaction.objects.create( From e067b19d413c538f09342c2e4cc431e193159922 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 6 Apr 2020 19:51:39 +0200 Subject: [PATCH 65/66] Paginate memberships and transactions --- apps/member/views.py | 17 +++++++--- templates/member/club_detail.html | 10 +++--- templates/member/club_info.html | 2 +- templates/member/club_tables.html | 46 ++++++++++++---------------- templates/member/profile_detail.html | 11 +++++++ templates/member/profile_info.html | 2 +- templates/member/profile_tables.html | 44 ++++++++++++-------------- 7 files changed, 70 insertions(+), 62 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index e03c5ff5..381314b2 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -130,10 +130,15 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): history_list = \ Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note)).order_by("-id")\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")) - context['history_list'] = HistoryTable(history_list) + history_table = HistoryTable(history_list, prefix='transaction-') + history_table.paginate(per_page=20, page=self.request.GET.get("transaction-page", 1)) + context['history_list'] = history_table + club_list = Membership.objects.filter(user=user, date_end__gte=datetime.today())\ .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) - context['club_list'] = MembershipTable(data=club_list) + membership_table = MembershipTable(data=club_list, prefix='membership-') + membership_table.paginate(per_page=10, page=self.request.GET.get("membership-page", 1)) + context['club_list'] = membership_table return context @@ -310,13 +315,17 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\ .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view")).order_by('-id') - context['history_list'] = HistoryTable(club_transactions) + history_table = HistoryTable(club_transactions, prefix="history-") + history_table.paginate(per_page=20, page=self.request.GET.get('history-page', 1)) + context['history_list'] = history_table club_member = Membership.objects.filter( club=club, date_end__gte=datetime.today(), ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")) - context['member_list'] = MembershipTable(data=club_member) + membership_table = MembershipTable(data=club_member, prefix="membership-") + membership_table.paginate(per_page=20, page=self.request.GET.get('membership-page', 1)) + context['member_list'] = membership_table # Check if the user has the right to create a membership, to display the button. empty_membership = Membership( diff --git a/templates/member/club_detail.html b/templates/member/club_detail.html index 3ad29901..fedd43fa 100644 --- a/templates/member/club_detail.html +++ b/templates/member/club_detail.html @@ -10,9 +10,11 @@ {% block extrajavascript %} {% endblock %} diff --git a/templates/member/club_info.html b/templates/member/club_info.html index de0192b4..93c76d59 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -55,7 +55,7 @@ {% trans "Edit" %} {% endif %} {% url 'member:club_detail' club.pk as club_detail_url %} - {%if request.get_full_path != club_detail_url %} + {%if request.path_info != club_detail_url %} {% trans 'View Profile' %} {% endif %}
          diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html index fbded9c3..32be9bd4 100644 --- a/templates/member/club_tables.html +++ b/templates/member/club_tables.html @@ -1,31 +1,23 @@ {% load render_table from django_tables2 %} {% load i18n %} -
          -
          - -
          - {% render_table member_list %} -
          -
          - -
          - -
          -
          - {% render_table history_list %} -
          -
          +
          + + {% render_table member_list %} +
          + +
          + +
          + +
          + {% render_table history_list %} +
          diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 42d03d8b..04b15d3b 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -7,3 +7,14 @@ {% block profile_content %} {% include "member/profile_tables.html" %} {% endblock %} + +{% block extrajavascript %} + +{% endblock %} diff --git a/templates/member/profile_info.html b/templates/member/profile_info.html index 9ff20385..74856355 100644 --- a/templates/member/profile_info.html +++ b/templates/member/profile_info.html @@ -44,7 +44,7 @@
          {% trans 'Update Profile' %} {% url 'member:user_detail' object.pk as user_profile_url %} - {%if request.get_full_path != user_profile_url %} + {%if request.path_info != user_profile_url %} {% trans 'View Profile' %} {% endif %}
          diff --git a/templates/member/profile_tables.html b/templates/member/profile_tables.html index 9016289a..9629ff14 100644 --- a/templates/member/profile_tables.html +++ b/templates/member/profile_tables.html @@ -9,32 +9,26 @@
          {% endif %} -
          -
          - -
          - {% render_table club_list %} -
          +
          + + {% render_table club_list %} +
          -
          - -
          -
          - {% render_table history_list %} -
          -
          +
          + +
          + +
          + {% render_table history_list %}
          From fc511689b0d98a3c83f9225b7917afc02675a98f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 9 Apr 2020 22:03:26 +0200 Subject: [PATCH 66/66] Update mail translation --- apps/member/models.py | 7 +- apps/registration/views.py | 1 + locale/de/LC_MESSAGES/django.po | 157 ++++++++++------- locale/fr/LC_MESSAGES/django.po | 162 +++++++++++------- .../email_validation_complete.html | 21 ++- .../registration/email_validation_email.html | 11 -- .../mails/email_validation_email.html | 15 ++ 7 files changed, 228 insertions(+), 146 deletions(-) delete mode 100644 templates/registration/email_validation_email.html create mode 100644 templates/registration/mails/email_validation_email.html diff --git a/apps/member/models.py b/apps/member/models.py index c51a95c8..3a022434 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later import datetime +import os from django.conf import settings from django.contrib.auth.models import User @@ -79,12 +80,10 @@ class Profile(models.Model): def send_email_validation_link(self): subject = "Activate your Note Kfet account" - message = loader.render_to_string('registration/email_validation_email.html', + message = loader.render_to_string('registration/mails/email_validation_email.html', { 'user': self.user, - 'domain': "nk20.ynerant.fr", - 'site_name': "La Note Kfet", - 'protocol': 'https', + 'domain': os.getenv("NOTE_URL", "note.example.com"), 'token': email_validation_token.make_token(self.user), 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)).decode('UTF-8'), }) diff --git a/apps/registration/views.py b/apps/registration/views.py index 575ada8f..35391b05 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -112,6 +112,7 @@ class UserValidateView(TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + context['user'] = self.get_user(self.kwargs["uidb64"]) context['login_url'] = resolve_url(settings.LOGIN_URL) if self.validlink: context['validlink'] = True diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index ff98db5b..f616ffd6 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-04-06 10:51+0200\n" +"POT-Creation-Date: 2020-04-09 21:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ 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:100 apps/member/models.py:203 +#: apps/member/models.py:99 apps/member/models.py:202 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -79,7 +79,7 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:223 #: apps/note/models/notes.py:117 msgid "user" msgstr "" @@ -300,152 +300,152 @@ msgstr "" msgid "Bank" msgstr "" -#: apps/member/models.py:32 +#: apps/member/models.py:33 #: templates/registration/future_profile_detail.html:47 msgid "phone number" msgstr "" -#: apps/member/models.py:38 templates/member/profile_info.html:27 +#: apps/member/models.py:39 templates/member/profile_info.html:27 #: templates/registration/future_profile_detail.html:41 msgid "section" msgstr "" -#: apps/member/models.py:39 +#: apps/member/models.py:40 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:45 templates/member/profile_info.html:30 +#: apps/member/models.py:46 templates/member/profile_info.html:30 #: templates/registration/future_profile_detail.html:44 msgid "address" msgstr "" -#: apps/member/models.py:51 +#: apps/member/models.py:52 #: templates/registration/future_profile_detail.html:50 msgid "paid" msgstr "" -#: apps/member/models.py:52 +#: apps/member/models.py:53 msgid "Tells if the user receive a salary." msgstr "" -#: apps/member/models.py:57 +#: apps/member/models.py:58 msgid "email confirmed" msgstr "" -#: apps/member/models.py:62 +#: apps/member/models.py:63 msgid "registration valid" msgstr "" -#: apps/member/models.py:67 +#: apps/member/models.py:68 msgid "Société générale" msgstr "" -#: apps/member/models.py:68 +#: apps/member/models.py:69 msgid "Has the user ever be paid by the Société générale?" msgstr "" -#: apps/member/models.py:73 apps/member/models.py:74 +#: apps/member/models.py:74 apps/member/models.py:75 msgid "user profile" msgstr "" -#: apps/member/models.py:105 templates/member/club_info.html:46 +#: apps/member/models.py:104 templates/member/club_info.html:46 #: templates/registration/future_profile_detail.html:22 msgid "email" msgstr "" -#: apps/member/models.py:112 +#: apps/member/models.py:111 msgid "parent club" msgstr "" -#: apps/member/models.py:121 +#: apps/member/models.py:120 msgid "require memberships" msgstr "" -#: apps/member/models.py:122 +#: apps/member/models.py:121 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:127 templates/member/club_info.html:35 +#: apps/member/models.py:126 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "" -#: apps/member/models.py:132 templates/member/club_info.html:38 +#: apps/member/models.py:131 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/models.py:138 templates/member/club_info.html:28 +#: apps/member/models.py:137 templates/member/club_info.html:28 msgid "membership duration" msgstr "" -#: apps/member/models.py:139 +#: apps/member/models.py:138 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:146 templates/member/club_info.html:22 +#: apps/member/models.py:145 templates/member/club_info.html:22 msgid "membership start" msgstr "" -#: apps/member/models.py:147 +#: apps/member/models.py:146 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:154 templates/member/club_info.html:25 +#: apps/member/models.py:153 templates/member/club_info.html:25 msgid "membership end" msgstr "" -#: apps/member/models.py:155 +#: apps/member/models.py:154 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:188 apps/member/models.py:230 +#: apps/member/models.py:187 apps/member/models.py:229 #: apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:189 +#: apps/member/models.py:188 msgid "clubs" msgstr "" -#: apps/member/models.py:209 apps/permission/models.py:294 +#: apps/member/models.py:208 apps/permission/models.py:294 msgid "role" msgstr "" -#: apps/member/models.py:210 apps/member/models.py:235 +#: apps/member/models.py:209 apps/member/models.py:234 msgid "roles" msgstr "" -#: apps/member/models.py:240 +#: apps/member/models.py:239 msgid "membership starts on" msgstr "" -#: apps/member/models.py:244 +#: apps/member/models.py:243 msgid "membership ends on" msgstr "" -#: apps/member/models.py:249 +#: apps/member/models.py:248 msgid "fee" msgstr "" -#: apps/member/models.py:267 apps/member/views.py:491 +#: apps/member/models.py:266 apps/member/views.py:500 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:277 apps/member/views.py:500 +#: apps/member/models.py:276 apps/member/views.py:509 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:315 +#: apps/member/models.py:314 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:318 +#: apps/member/models.py:317 msgid "membership" msgstr "" -#: apps/member/models.py:319 +#: apps/member/models.py:318 msgid "memberships" msgstr "" @@ -466,27 +466,27 @@ msgstr "" msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/views.py:175 +#: apps/member/views.py:180 msgid "Search user" msgstr "" -#: apps/member/views.py:486 +#: apps/member/views.py:495 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:504 +#: apps/member/views.py:513 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:509 +#: apps/member/views.py:518 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523 -#: apps/registration/views.py:285 apps/registration/views.py:287 -#: apps/registration/views.py:289 +#: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532 +#: apps/registration/views.py:286 apps/registration/views.py:288 +#: apps/registration/views.py:290 msgid "This field is required." msgstr "" @@ -785,27 +785,27 @@ msgstr "" msgid "Email validation" msgstr "" -#: apps/registration/views.py:120 +#: apps/registration/views.py:121 msgid "Email validation unsuccessful" msgstr "" -#: apps/registration/views.py:131 +#: apps/registration/views.py:132 msgid "Email validation email sent" msgstr "" -#: apps/registration/views.py:184 +#: apps/registration/views.py:185 msgid "Unregistered users" msgstr "" -#: apps/registration/views.py:251 +#: apps/registration/views.py:252 msgid "You must join the BDE." msgstr "" -#: apps/registration/views.py:273 +#: apps/registration/views.py:274 msgid "You must join BDE club before joining Kfet club." msgstr "" -#: apps/registration/views.py:278 +#: apps/registration/views.py:279 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" @@ -1161,11 +1161,11 @@ msgstr "" msgid "club listing " msgstr "" -#: templates/member/club_tables.html:9 +#: templates/member/club_tables.html:6 msgid "Member of the Club" msgstr "" -#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31 +#: templates/member/club_tables.html:17 templates/member/profile_tables.html:28 msgid "Transaction history" msgstr "" @@ -1219,7 +1219,7 @@ msgstr "" msgid "Click here to resend a validation link." msgstr "" -#: templates/member/profile_tables.html:18 +#: templates/member/profile_tables.html:15 msgid "View my memberships" msgstr "" @@ -1314,14 +1314,21 @@ msgstr "" msgid "Unable to delete button " msgstr "" -#: templates/registration/email_validation_complete.html:8 -#, python-format -msgid "" -"Your account have successfully been activated. You can now log in." +#: templates/registration/email_validation_complete.html:6 +msgid "Your email have successfully been validated." msgstr "" -#: templates/registration/email_validation_complete.html:12 +#: templates/registration/email_validation_complete.html:8 +#, python-format +msgid "You can now log in." +msgstr "" + +#: templates/registration/email_validation_complete.html:10 +msgid "" +"You must pay now your membership in the Kfet to complete your registration." +msgstr "" + +#: templates/registration/email_validation_complete.html:13 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." @@ -1376,6 +1383,36 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" +#: templates/registration/mails/email_validation_email.html:3 +msgid "Hi" +msgstr "" + +#: templates/registration/mails/email_validation_email.html:5 +msgid "" +"You recently registered on the Note Kfet. Please click on the link below to " +"confirm your registration." +msgstr "" + +#: templates/registration/mails/email_validation_email.html:9 +msgid "" +"This link is only valid for a couple of days, after that you will need to " +"contact us to validate your email." +msgstr "" + +#: templates/registration/mails/email_validation_email.html:11 +msgid "" +"After that, you'll have to wait that someone validates your account before " +"you can log in. You will need to pay your membership in the Kfet." +msgstr "" + +#: templates/registration/mails/email_validation_email.html:13 +msgid "Thanks" +msgstr "" + +#: templates/registration/mails/email_validation_email.html:15 +msgid "The Note Kfet team." +msgstr "" + #: templates/registration/password_change_done.html:8 msgid "Your password was changed." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index be518ebf..27636a65 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-04-06 10:51+0200\n" +"POT-Creation-Date: 2020-04-09 21:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ 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:100 apps/member/models.py:203 +#: apps/member/models.py:99 apps/member/models.py:202 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 #: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 @@ -75,7 +75,7 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224 +#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:223 #: apps/note/models/notes.py:117 msgid "user" msgstr "utilisateur" @@ -296,102 +296,102 @@ msgstr "Montant à créditer" msgid "Bank" msgstr "Banque" -#: apps/member/models.py:32 +#: apps/member/models.py:33 #: templates/registration/future_profile_detail.html:47 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:38 templates/member/profile_info.html:27 +#: apps/member/models.py:39 templates/member/profile_info.html:27 #: templates/registration/future_profile_detail.html:41 msgid "section" msgstr "section" -#: apps/member/models.py:39 +#: apps/member/models.py:40 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:45 templates/member/profile_info.html:30 +#: apps/member/models.py:46 templates/member/profile_info.html:30 #: templates/registration/future_profile_detail.html:44 msgid "address" msgstr "adresse" -#: apps/member/models.py:51 +#: apps/member/models.py:52 #: templates/registration/future_profile_detail.html:50 msgid "paid" msgstr "payé" -#: apps/member/models.py:52 +#: apps/member/models.py:53 msgid "Tells if the user receive a salary." msgstr "Indique si l'utilisateur perçoit un salaire." -#: apps/member/models.py:57 +#: apps/member/models.py:58 msgid "email confirmed" msgstr "adresse email confirmée" -#: apps/member/models.py:62 +#: apps/member/models.py:63 msgid "registration valid" msgstr "inscription valid" -#: apps/member/models.py:67 +#: apps/member/models.py:68 msgid "Société générale" msgstr "Société générale" -#: apps/member/models.py:68 +#: apps/member/models.py:69 msgid "Has the user ever be paid by the Société générale?" msgstr "Est-ce que l'utilisateur a déjà été payé par la Société Générale ?" -#: apps/member/models.py:73 apps/member/models.py:74 +#: apps/member/models.py:74 apps/member/models.py:75 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:105 templates/member/club_info.html:46 +#: apps/member/models.py:104 templates/member/club_info.html:46 #: templates/registration/future_profile_detail.html:22 msgid "email" msgstr "courriel" -#: apps/member/models.py:112 +#: apps/member/models.py:111 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:121 +#: apps/member/models.py:120 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:122 +#: apps/member/models.py:121 msgid "Uncheck if this club don't require memberships." msgstr "Décochez si ce club n'utilise pas d'adhésions." -#: apps/member/models.py:127 templates/member/club_info.html:35 +#: apps/member/models.py:126 templates/member/club_info.html:35 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/models.py:132 templates/member/club_info.html:38 +#: apps/member/models.py:131 templates/member/club_info.html:38 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/models.py:138 templates/member/club_info.html:28 +#: apps/member/models.py:137 templates/member/club_info.html:28 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:139 +#: apps/member/models.py:138 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)." -#: apps/member/models.py:146 templates/member/club_info.html:22 +#: apps/member/models.py:145 templates/member/club_info.html:22 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:147 +#: apps/member/models.py:146 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:154 templates/member/club_info.html:25 +#: apps/member/models.py:153 templates/member/club_info.html:25 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:155 +#: apps/member/models.py:154 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -399,53 +399,53 @@ 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:188 apps/member/models.py:230 +#: apps/member/models.py:187 apps/member/models.py:229 #: apps/note/models/notes.py:139 msgid "club" msgstr "club" -#: apps/member/models.py:189 +#: apps/member/models.py:188 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:209 apps/permission/models.py:294 +#: apps/member/models.py:208 apps/permission/models.py:294 msgid "role" msgstr "rôle" -#: apps/member/models.py:210 apps/member/models.py:235 +#: apps/member/models.py:209 apps/member/models.py:234 msgid "roles" msgstr "rôles" -#: apps/member/models.py:240 +#: apps/member/models.py:239 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:244 +#: apps/member/models.py:243 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:249 +#: apps/member/models.py:248 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:267 apps/member/views.py:491 +#: apps/member/models.py:266 apps/member/views.py:500 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:277 apps/member/views.py:500 +#: apps/member/models.py:276 apps/member/views.py:509 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:315 +#: apps/member/models.py:314 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:318 +#: apps/member/models.py:317 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:319 +#: apps/member/models.py:318 msgid "memberships" msgstr "adhésions" @@ -466,11 +466,11 @@ msgstr "Modifier le profil" msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/views.py:175 +#: apps/member/views.py:180 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:486 +#: apps/member/views.py:495 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -478,17 +478,17 @@ msgstr "" "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas " "avoir un solde négatif." -#: apps/member/views.py:504 +#: apps/member/views.py:513 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:509 +#: apps/member/views.py:518 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:519 apps/member/views.py:521 apps/member/views.py:523 -#: apps/registration/views.py:285 apps/registration/views.py:287 -#: apps/registration/views.py:289 +#: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532 +#: apps/registration/views.py:286 apps/registration/views.py:288 +#: apps/registration/views.py:290 msgid "This field is required." msgstr "Ce champ est requis." @@ -788,27 +788,27 @@ msgstr "Adhérer au club Kfet" msgid "Email validation" msgstr "Validation de l'adresse mail" -#: apps/registration/views.py:120 +#: apps/registration/views.py:121 msgid "Email validation unsuccessful" msgstr " La validation de l'adresse mail a échoué" -#: apps/registration/views.py:131 +#: apps/registration/views.py:132 msgid "Email validation email sent" msgstr "L'email de vérification de l'adresse email a bien été envoyé." -#: apps/registration/views.py:184 +#: apps/registration/views.py:185 msgid "Unregistered users" msgstr "Utilisateurs en attente d'inscription" -#: apps/registration/views.py:251 +#: apps/registration/views.py:252 msgid "You must join the BDE." msgstr "Vous devez adhérer au BDE." -#: apps/registration/views.py:273 +#: apps/registration/views.py:274 msgid "You must join BDE club before joining Kfet club." msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet." -#: apps/registration/views.py:278 +#: apps/registration/views.py:279 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" @@ -1168,11 +1168,11 @@ msgstr "Créer un club" msgid "club listing " msgstr "Liste des clubs" -#: templates/member/club_tables.html:9 +#: templates/member/club_tables.html:6 msgid "Member of the Club" msgstr "Membre du club" -#: templates/member/club_tables.html:22 templates/member/profile_tables.html:31 +#: templates/member/club_tables.html:17 templates/member/profile_tables.html:28 msgid "Transaction history" msgstr "Historique des transactions" @@ -1226,7 +1226,7 @@ msgstr "Cet utilisateur n'a pas encore confirmé son adresse e-mail." msgid "Click here to resend a validation link." msgstr "Cliquez ici pour renvoyer un lien de validation." -#: templates/member/profile_tables.html:18 +#: templates/member/profile_tables.html:15 msgid "View my memberships" msgstr "Voir mes adhésions" @@ -1321,18 +1321,28 @@ msgstr "Le bouton a bien été supprimé" msgid "Unable to delete button " msgstr "Impossible de supprimer le bouton " +#: templates/registration/email_validation_complete.html:6 +msgid "Your email have successfully been validated." +msgstr "Votre adresse e-mail a bien été validée." + #: templates/registration/email_validation_complete.html:8 #, python-format -msgid "" -"Your account have successfully been activated. You can now log in." -msgstr "" +msgid "You can now log in." +msgstr "Vous pouvez désormais vous connecter." -#: templates/registration/email_validation_complete.html:12 +#: templates/registration/email_validation_complete.html:10 +msgid "" +"You must pay now your membership in the Kfet to complete your registration." +msgstr "" +"Vous devez désormais payer votre adhésion à la Kfet pour compléter votre inscription." + +#: templates/registration/email_validation_complete.html:13 msgid "" "The link was invalid. The token may have expired. Please send us an email to " "activate your account." msgstr "" +"Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter pour " +"activer votre compte." #: templates/registration/future_profile_detail.html:56 msgid "Delete registration" @@ -1383,9 +1393,41 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" +#: templates/registration/mails/email_validation_email.html:3 +msgid "Hi" +msgstr "" + +#: templates/registration/mails/email_validation_email.html:5 +msgid "" +"You recently registered on the Note Kfet. Please click on the link below to " +"confirm your registration." +msgstr "" + +#: templates/registration/mails/email_validation_email.html:9 +msgid "" +"This link is only valid for a couple of days, after that you will need to " +"contact us to validate your email." +msgstr "" + +#: templates/registration/mails/email_validation_email.html:11 +msgid "" +"After that, you'll have to wait that someone validates your account before " +"you can log in. You will need to pay your membership in the Kfet." +msgstr "" +"Après cela, vous devrez attendre que quelqu'un valide votre compte avant " +"de pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet." + +#: templates/registration/mails/email_validation_email.html:13 +msgid "Thanks" +msgstr "Merci" + +#: templates/registration/mails/email_validation_email.html:15 +msgid "The Note Kfet team." +msgstr "L'équipe de la Note Kfet." + #: templates/registration/password_change_done.html:8 msgid "Your password was changed." -msgstr "" +msgstr "Votre mot de passe a bien été changé." #: templates/registration/password_change_form.html:9 msgid "" diff --git a/templates/registration/email_validation_complete.html b/templates/registration/email_validation_complete.html index 185fbfb0..4835cfa1 100644 --- a/templates/registration/email_validation_complete.html +++ b/templates/registration/email_validation_complete.html @@ -2,15 +2,14 @@ {% load i18n %} {% block content %} -

          {% trans Activation %}

          - -{% if validlink %} -{% blocktrans trimmed %} -Your account have successfully been activated. You can now log in. -{% endblocktrans %} -{% else %} -{% blocktrans trimmed %} -The link was invalid. The token may have expired. Please send us an email to activate your account. -{% endblocktrans %} -{% endif %} + {% if validlink %} + {% trans "Your email have successfully been validated." %} + {% if user.profile.registration_valid %} + {% blocktrans %}You can now log in.{% endblocktrans %} + {% else %} + {% trans "You must pay now your membership in the Kfet to complete your registration." %} + {% endif %} + {% else %} + {% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %} + {% endif %} {% endblock %} diff --git a/templates/registration/email_validation_email.html b/templates/registration/email_validation_email.html deleted file mode 100644 index feb46876..00000000 --- a/templates/registration/email_validation_email.html +++ /dev/null @@ -1,11 +0,0 @@ -Hi {{ user.username }}, - -Welcome to {{ site_name }}. Please click on the link below to confirm your registration. - -{{ protocol }}://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} - -This link is only valid for a couple of days, after that you will need to contact us to validate your email. - -Thanks, - -{{ site_name }} team. diff --git a/templates/registration/mails/email_validation_email.html b/templates/registration/mails/email_validation_email.html new file mode 100644 index 00000000..577c1220 --- /dev/null +++ b/templates/registration/mails/email_validation_email.html @@ -0,0 +1,15 @@ +{% load i18n %} + +{% trans "Hi" %} {{ user.username }}, + +{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %} + +https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} + +{% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} + +{% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %} + +{% trans "Thanks" %}, + +{% trans "The Note Kfet team." %}