mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-23 11:53:12 +00:00
Add Mandate model
This commit is contained in:
parent
9c82a84c5f
commit
75bb3658ac
7 changed files with 233 additions and 3 deletions
|
@ -45,7 +45,8 @@ from .models import (
|
||||||
RadiusOption,
|
RadiusOption,
|
||||||
CotisationsOption,
|
CotisationsOption,
|
||||||
DocumentTemplate,
|
DocumentTemplate,
|
||||||
RadiusAttribute
|
RadiusAttribute,
|
||||||
|
Mandate
|
||||||
)
|
)
|
||||||
from topologie.models import Switch
|
from topologie.models import Switch
|
||||||
|
|
||||||
|
@ -261,6 +262,17 @@ class EditCotisationsOptionForm(ModelForm):
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class MandateForm(ModelForm):
|
||||||
|
"""Edit Mandates"""
|
||||||
|
class Meta:
|
||||||
|
model = Mandate
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
||||||
|
super(MandateForm, self).__init__(*args, prefix=prefix, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class ServiceForm(ModelForm):
|
class ServiceForm(ModelForm):
|
||||||
"""Edition, ajout de services sur la page d'accueil"""
|
"""Edition, ajout de services sur la page d'accueil"""
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
54
preferences/migrations/0063_mandate.py
Normal file
54
preferences/migrations/0063_mandate.py
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.23 on 2019-09-21 18:23
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.utils import timezone
|
||||||
|
import re2o.mixins
|
||||||
|
|
||||||
|
|
||||||
|
def create_current_mandate(apps, schema_editor):
|
||||||
|
AssoOption = apps.get_model('preferences', 'AssoOption')
|
||||||
|
Mandate = apps.get_model('preferences', 'Mandate')
|
||||||
|
Adherent = apps.get_model('users', 'Adherent')
|
||||||
|
pres_name = AssoOption.objects.get_or_create()[0].pres_name
|
||||||
|
l = pres_name.split(' ')
|
||||||
|
try:
|
||||||
|
name, surname = l[0], l[1]
|
||||||
|
president = Adherent.objects.get(name__icontains=name, surname__icontains=surname)
|
||||||
|
Mandate.objects.create(
|
||||||
|
president=president,
|
||||||
|
start_date=timezone.now(),
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
print("Warning : I was unable to find an adherent corresponding to %s. You might want to edit your preferences afterward." % pres_name)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
('preferences', '0062_auto_20190910_1909'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Mandate',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('start_date', models.DateTimeField(verbose_name='start date')),
|
||||||
|
('end_date', models.DateTimeField(blank=True, null=True, verbose_name='end date')),
|
||||||
|
('president', models.ForeignKey(blank=True, help_text='Displayed on subscription vouchers', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='President of the association')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Mandate',
|
||||||
|
'verbose_name_plural': 'Mandates',
|
||||||
|
'permissions': (('view_mandate', 'Can view a mandate'),),
|
||||||
|
},
|
||||||
|
bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model),
|
||||||
|
),
|
||||||
|
migrations.RunPython(create_current_mandate),
|
||||||
|
]
|
|
@ -501,6 +501,41 @@ class MailContact(AclMixin, models.Model):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return(self.address)
|
return(self.address)
|
||||||
|
|
||||||
|
class Mandate(RevMixin, AclMixin, models.Model):
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _("Mandate")
|
||||||
|
verbose_name_plural = _("Mandates")
|
||||||
|
permissions = (
|
||||||
|
("view_mandate", _("Can view a mandate")),
|
||||||
|
)
|
||||||
|
|
||||||
|
president = models.ForeignKey(
|
||||||
|
'users.User',
|
||||||
|
on_delete=models.SET_NULL,
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
verbose_name=_("President of the association"),
|
||||||
|
help_text=_("Displayed on subscription vouchers")
|
||||||
|
)
|
||||||
|
start_date = models.DateTimeField(
|
||||||
|
verbose_name=_("start date")
|
||||||
|
)
|
||||||
|
end_date = models.DateTimeField(
|
||||||
|
verbose_name=_("end date"),
|
||||||
|
blank=True,
|
||||||
|
null=True
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_mandate(cls, date=timezone.now):
|
||||||
|
if callable(date):
|
||||||
|
date = date()
|
||||||
|
return cls.objects.get(
|
||||||
|
start_date__gte=date, end_date__lte=date
|
||||||
|
)
|
||||||
|
|
||||||
|
def is_over(self):
|
||||||
|
return self.end_date is None
|
||||||
|
|
||||||
class AssoOption(AclMixin, PreferencesModel):
|
class AssoOption(AclMixin, PreferencesModel):
|
||||||
"""Options générales de l'asso : siret, addresse, nom, etc"""
|
"""Options générales de l'asso : siret, addresse, nom, etc"""
|
||||||
|
|
52
preferences/templates/preferences/aff_mandate.html
Normal file
52
preferences/templates/preferences/aff_mandate.html
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
{% comment %}
|
||||||
|
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
quelques clics.
|
||||||
|
|
||||||
|
Copyright © 2018 Hugo Levy-Falk
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
{% endcomment %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% load acl %}
|
||||||
|
{% load logs_extra %}
|
||||||
|
|
||||||
|
<table class="table table-striped">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>{% trans "Start date" %}</th>
|
||||||
|
<th>{% trans "End date" %}</th>
|
||||||
|
<th>{% trans "President" %}</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
{% for mandate in mandate_list %}
|
||||||
|
<tr>
|
||||||
|
<td>{{mandate.start_date|date:"d/m/Y"}}</td>
|
||||||
|
<td>{% if mandate.end_date %}{{mandate.end_date|date:"d/m/Y"}}{% else %}{% trans "In progress." %}{% endif %}</td>
|
||||||
|
<td><a href="{% url 'users:profil' userid=mandate.president.id %}">{{mandate.president.name}} {{mandate.president.surname}}</a></td>
|
||||||
|
<td class="text-right">
|
||||||
|
{% can_edit mandate%}
|
||||||
|
{% include 'buttons/edit.html' with href='preferences:edit-mandate' id=mandate.id %}
|
||||||
|
{% acl_end %}
|
||||||
|
{% can_delete mandate %}
|
||||||
|
{% include 'buttons/suppr.html' with href='preferences:del-mandate' id=mandate.id %}
|
||||||
|
{% acl_end %}
|
||||||
|
{% history_button mandate %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
|
|
|
@ -330,6 +330,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<td>{{ assooptions.pres_name }}</td>
|
<td>{{ assooptions.pres_name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<h5>{% trans "Mandates" %}</h5>
|
||||||
|
{% can_create Mandate %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mandate' %}">
|
||||||
|
<i class="fa fa-plus"></i> {% trans "Add a mandate" %}
|
||||||
|
</a>
|
||||||
|
{% acl_end %}
|
||||||
|
{% include 'preferences/aff_mandate.html' with mandate_list=mandate_list %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel panel-default" id="templates">
|
<div class="panel panel-default" id="templates">
|
||||||
|
|
|
@ -126,6 +126,21 @@ urlpatterns = [
|
||||||
views.del_document_template,
|
views.del_document_template,
|
||||||
name='del-document-template'
|
name='del-document-template'
|
||||||
),
|
),
|
||||||
|
url(
|
||||||
|
r'^add_mandate/$',
|
||||||
|
views.add_mandate,
|
||||||
|
name='add-mandate'
|
||||||
|
),
|
||||||
|
url(
|
||||||
|
r'^edit_mandate/(?P<mandateid>[0-9]+)$',
|
||||||
|
views.edit_mandate,
|
||||||
|
name='edit-mandate'
|
||||||
|
),
|
||||||
|
url(
|
||||||
|
r'^del_mandate/(?P<mandateid>[0-9]+)$',
|
||||||
|
views.del_mandate,
|
||||||
|
name='del-mandate'
|
||||||
|
),
|
||||||
url(r'^add_radiusattribute/$', views.add_radiusattribute, name='add-radiusattribute'),
|
url(r'^add_radiusattribute/$', views.add_radiusattribute, name='add-radiusattribute'),
|
||||||
url(
|
url(
|
||||||
r'^edit_radiusattribute/(?P<radiusattributeid>[0-9]+)$',
|
r'^edit_radiusattribute/(?P<radiusattributeid>[0-9]+)$',
|
||||||
|
|
|
@ -54,7 +54,8 @@ from .forms import (
|
||||||
DocumentTemplateForm,
|
DocumentTemplateForm,
|
||||||
DelDocumentTemplateForm,
|
DelDocumentTemplateForm,
|
||||||
RadiusAttributeForm,
|
RadiusAttributeForm,
|
||||||
DelRadiusAttributeForm
|
DelRadiusAttributeForm,
|
||||||
|
MandateForm
|
||||||
)
|
)
|
||||||
from .models import (
|
from .models import (
|
||||||
Service,
|
Service,
|
||||||
|
@ -72,7 +73,8 @@ from .models import (
|
||||||
RadiusOption,
|
RadiusOption,
|
||||||
CotisationsOption,
|
CotisationsOption,
|
||||||
DocumentTemplate,
|
DocumentTemplate,
|
||||||
RadiusAttribute
|
RadiusAttribute,
|
||||||
|
Mandate
|
||||||
)
|
)
|
||||||
from . import models
|
from . import models
|
||||||
from . import forms
|
from . import forms
|
||||||
|
@ -89,6 +91,7 @@ def display_options(request):
|
||||||
topologieoptions, _created = OptionalTopologie.objects.get_or_create()
|
topologieoptions, _created = OptionalTopologie.objects.get_or_create()
|
||||||
generaloptions, _created = GeneralOption.objects.get_or_create()
|
generaloptions, _created = GeneralOption.objects.get_or_create()
|
||||||
assooptions, _created = AssoOption.objects.get_or_create()
|
assooptions, _created = AssoOption.objects.get_or_create()
|
||||||
|
mandate_list = Mandate.objects.order_by('start_date')
|
||||||
homeoptions, _created = HomeOption.objects.get_or_create()
|
homeoptions, _created = HomeOption.objects.get_or_create()
|
||||||
mailmessageoptions, _created = MailMessageOption.objects.get_or_create()
|
mailmessageoptions, _created = MailMessageOption.objects.get_or_create()
|
||||||
service_list = Service.objects.all()
|
service_list = Service.objects.all()
|
||||||
|
@ -110,6 +113,7 @@ def display_options(request):
|
||||||
'topologieoptions': topologieoptions,
|
'topologieoptions': topologieoptions,
|
||||||
'generaloptions': generaloptions,
|
'generaloptions': generaloptions,
|
||||||
'assooptions': assooptions,
|
'assooptions': assooptions,
|
||||||
|
'mandate_list': mandate_list,
|
||||||
'homeoptions': homeoptions,
|
'homeoptions': homeoptions,
|
||||||
'mailmessageoptions': mailmessageoptions,
|
'mailmessageoptions': mailmessageoptions,
|
||||||
'service_list': service_list,
|
'service_list': service_list,
|
||||||
|
@ -558,3 +562,54 @@ def del_radiusattribute(request, radiusattribute_instance, **_kwargs):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@can_create(Mandate)
|
||||||
|
def add_mandate(request):
|
||||||
|
"""Create a mandate."""
|
||||||
|
mandate = MandateForm(request.POST or None)
|
||||||
|
if mandate.is_valid():
|
||||||
|
mandate.save()
|
||||||
|
messages.success(request, _("The mandate was added."))
|
||||||
|
return redirect(reverse('preferences:display-options'))
|
||||||
|
return form(
|
||||||
|
{'preferenceform': mandate, 'action_name': _("Add a mandate")},
|
||||||
|
'preferences/preferences.html',
|
||||||
|
request
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@can_edit(Mandate)
|
||||||
|
def edit_mandate(request, mandate_instance, **_kwargs):
|
||||||
|
"""Edit a mandate."""
|
||||||
|
mandate = MandateForm(
|
||||||
|
request.POST or None,
|
||||||
|
instance=mandate_instance
|
||||||
|
)
|
||||||
|
if mandate.is_valid():
|
||||||
|
mandate.save()
|
||||||
|
messages.success(request, _("The mandate was edited."))
|
||||||
|
return redirect(reverse('preferences:display-options'))
|
||||||
|
return form(
|
||||||
|
{'preferenceform': mandate, 'action_name': _("Edit")},
|
||||||
|
'preferences/preferences.html',
|
||||||
|
request
|
||||||
|
)
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@can_delete(Mandate)
|
||||||
|
def del_mandate(request, mandate_instance, **_kwargs):
|
||||||
|
"""Delete a mandate."""
|
||||||
|
if request.method == "POST":
|
||||||
|
mandate_instance.delete()
|
||||||
|
messages.success(request, _("The mandate was deleted."))
|
||||||
|
return redirect(reverse('preferences:display-options'))
|
||||||
|
return form(
|
||||||
|
{'objet': mandate_instance, 'objet_name': 'attribute'},
|
||||||
|
'preferences/delete.html',
|
||||||
|
request
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue