mirror of
https://gitlab.crans.org/bde/nk20
synced 2024-12-23 16:02:25 +00:00
Merge branch 'page_conso' into 'master'
Base conso page See merge request bde/nk20!53
This commit is contained in:
Pierre-antoine Comby
commit
77551162d5
@ -6,7 +6,7 @@ from django import forms
|
|||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from .models import Alias
|
from .models import Alias
|
||||||
from .models import Transaction, TransactionTemplate, TemplateTransaction
|
from .models import Transaction, TransactionTemplate
|
||||||
|
|
||||||
|
|
||||||
class AliasForm(forms.ModelForm):
|
class AliasForm(forms.ModelForm):
|
||||||
@ -99,33 +99,3 @@ class TransactionForm(forms.ModelForm):
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ConsoForm(forms.ModelForm):
|
|
||||||
def save(self, commit=True):
|
|
||||||
button: TransactionTemplate = TransactionTemplate.objects.filter(
|
|
||||||
name=self.data['button']).get()
|
|
||||||
self.instance.destination = button.destination
|
|
||||||
self.instance.amount = button.amount
|
|
||||||
self.instance.reason = '{} ({})'.format(button.name, button.category)
|
|
||||||
self.instance.template = button
|
|
||||||
self.instance.category = button.category
|
|
||||||
super().save(commit)
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = TemplateTransaction
|
|
||||||
fields = ('source',)
|
|
||||||
|
|
||||||
# Le champ d'utilisateur est remplacé par un champ d'auto-complétion.
|
|
||||||
# Quand des lettres sont tapées, une requête est envoyée sur l'API d'auto-complétion
|
|
||||||
# et récupère les aliases de note valides
|
|
||||||
widgets = {
|
|
||||||
'source':
|
|
||||||
autocomplete.ModelSelect2(
|
|
||||||
url='note:note_autocomplete',
|
|
||||||
attrs={
|
|
||||||
'data-placeholder': 'Note ...',
|
|
||||||
'data-minimum-input-length': 1,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
}
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@ from django.db.models import F
|
|||||||
from django_tables2.utils import A
|
from django_tables2.utils import A
|
||||||
|
|
||||||
from .models.notes import Alias
|
from .models.notes import Alias
|
||||||
from .models.transactions import Transaction, TransactionTemplate
|
from .models.transactions import Transaction
|
||||||
from .templatetags.pretty_money import pretty_money
|
from .templatetags.pretty_money import pretty_money
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -7,9 +7,11 @@ from django.db.models import Q
|
|||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.views.generic import CreateView, ListView, UpdateView
|
from django.views.generic import CreateView, ListView, UpdateView
|
||||||
|
from django_tables2 import SingleTableView
|
||||||
|
|
||||||
from .forms import TransactionForm, TransactionTemplateForm, ConsoForm
|
from .forms import TransactionForm, TransactionTemplateForm
|
||||||
from .models import Transaction, TransactionTemplate, Alias, TemplateTransaction
|
from .models import Transaction, TransactionTemplate, Alias
|
||||||
|
from .tables import HistoryTable
|
||||||
|
|
||||||
|
|
||||||
class TransactionCreate(LoginRequiredMixin, CreateView):
|
class TransactionCreate(LoginRequiredMixin, CreateView):
|
||||||
@ -121,13 +123,16 @@ class TransactionTemplateUpdateView(LoginRequiredMixin, UpdateView):
|
|||||||
form_class = TransactionTemplateForm
|
form_class = TransactionTemplateForm
|
||||||
|
|
||||||
|
|
||||||
class ConsoView(LoginRequiredMixin, CreateView):
|
class ConsoView(LoginRequiredMixin, SingleTableView):
|
||||||
"""
|
"""
|
||||||
Consume
|
Consume
|
||||||
"""
|
"""
|
||||||
model = TemplateTransaction
|
model = Transaction
|
||||||
template_name = "note/conso_form.html"
|
template_name = "note/conso_form.html"
|
||||||
form_class = ConsoForm
|
|
||||||
|
# Transaction history table
|
||||||
|
table_class = HistoryTable
|
||||||
|
table_pagination = {"per_page": 10}
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
"""
|
"""
|
||||||
@ -142,9 +147,3 @@ class ConsoView(LoginRequiredMixin, CreateView):
|
|||||||
context['no_cache'] = True
|
context['no_cache'] = True
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
def get_success_url(self):
|
|
||||||
"""
|
|
||||||
When clicking a button, reload the same page
|
|
||||||
"""
|
|
||||||
return reverse('note:consos')
|
|
||||||
|
|||||||
@ -75,9 +75,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="#"><i class="fa fa-calendar"></i> {% trans 'Activities' %}</a>
|
<a class="nav-link" href="#"><i class="fa fa-calendar"></i> {% trans 'Activities' %}</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item active">
|
|
||||||
<a class="nav-link" href="{% url 'note:template_list' %}"><i class="fa fa-coffee"></i> {% trans 'Button' %}</a>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a class="nav-link" href="{% url 'note:transfer' %}"><i class="fa fa-exchange"></i>{% trans 'Transfer' %} </a>
|
<a class="nav-link" href="{% url 'note:transfer' %}"><i class="fa fa-exchange"></i>{% trans 'Transfer' %} </a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@ -1,80 +1,134 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% load i18n static pretty_money %}
|
{% load i18n static pretty_money django_tables2 %}
|
||||||
|
|
||||||
{# Remove page title #}
|
{# Remove page title #}
|
||||||
{% block contenttitle %}{% endblock %}
|
{% block contenttitle %}{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{# Regroup buttons under categories #}
|
<div class="row mt-4">
|
||||||
{% regroup transaction_templates by category as categories %}
|
<div class="col-sm-5 col-md-4">
|
||||||
|
<div class="row">
|
||||||
<form method="post" onsubmit="window.onbeforeunload=null">
|
{# User details column #}
|
||||||
{% csrf_token %}
|
<div class="col-xl-5">
|
||||||
|
<div class="card border-success shadow mb-4">
|
||||||
<div class="row">
|
<img src="https://perso.crans.org/erdnaxe/site-crans/img/logo.svg"
|
||||||
<div class="col-sm-5 mb-4">
|
alt="" class="img-fluid rounded mx-auto d-block">
|
||||||
{% if form.non_field_errors %}
|
<div class="card-body text-center">
|
||||||
<p class="errornote">
|
Paquito (aka. PAC) : -230 €
|
||||||
{% for error in form.non_field_errors %}
|
|
||||||
{{ error }}
|
|
||||||
{% endfor %}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
{% for field in form %}
|
|
||||||
<div class="form-row{% if field.errors %} errors{% endif %}">
|
|
||||||
{{ field.errors }}
|
|
||||||
<div>
|
|
||||||
{{ field.label_tag }}
|
|
||||||
{% if field.is_readonly %}
|
|
||||||
<div class="readonly">{{ field.contents }}</div>
|
|
||||||
{% else %}
|
|
||||||
{{ field }}
|
|
||||||
{% endif %}
|
|
||||||
{% if field.field.help_text %}
|
|
||||||
<div class="help">{{ field.field.help_text|safe }}</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-sm-7">
|
{# User selection column #}
|
||||||
<div class="card text-center shadow">
|
<div class="col-xl-7">
|
||||||
{# Tabs for button categories #}
|
<div class="card border-success shadow mb-4">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<ul class="nav nav-tabs nav-fill card-header-tabs">
|
<p class="card-text font-weight-bold">
|
||||||
{% for category in categories %}
|
Sélection des émitteurs
|
||||||
<li class="nav-item">
|
</p>
|
||||||
<a class="nav-link" data-toggle="tab" href="#{{ category.grouper|slugify }}">
|
</div>
|
||||||
{{ category.grouper }}
|
<ul class="list-group list-group-flush">
|
||||||
</a>
|
<li class="list-group-item py-1 d-flex justify-content-between align-items-center">
|
||||||
</li>
|
Cras justo odio
|
||||||
{% endfor %}
|
<span class="badge badge-dark badge-pill">14</span>
|
||||||
|
</li>
|
||||||
|
<li class="list-group-item py-1 d-flex justify-content-between align-items-center">
|
||||||
|
Dapibus ac facilisis in
|
||||||
|
<span class="badge badge-dark badge-pill">1</span>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
<div class="card-body">
|
||||||
|
TODO: reimplement select2 here in JS
|
||||||
{# Tabs content #}
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="tab-content">
|
|
||||||
{% for category in categories %}
|
|
||||||
<div class="tab-pane" id="{{ category.grouper|slugify }}">
|
|
||||||
<div class="d-inline-flex flex-wrap justify-content-center">
|
|
||||||
{% for button in category.list %}
|
|
||||||
<button class="btn btn-outline-dark rounded-0 flex-fill"
|
|
||||||
name="button" value="{{ button.name }}">
|
|
||||||
{{ button.name }} ({{ button.amount | pretty_money }})
|
|
||||||
</button>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
|
||||||
|
{# Buttons column #}
|
||||||
|
<div class="col-sm-7 col-md-8">
|
||||||
|
{# Show last used buttons #}
|
||||||
|
<div class="card shadow mb-4">
|
||||||
|
<div class="card-body text-nowrap" style="overflow:auto hidden">
|
||||||
|
<p class="card-text text-muted font-weight-light font-italic">
|
||||||
|
Les boutons les plus utilisés s'afficheront ici.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Regroup buttons under categories #}
|
||||||
|
{% regroup transaction_templates by template_type as template_types %}
|
||||||
|
|
||||||
|
<div class="card border-primary text-center shadow mb-4">
|
||||||
|
{# Tabs for button categories #}
|
||||||
|
<div class="card-header">
|
||||||
|
<ul class="nav nav-tabs nav-fill card-header-tabs">
|
||||||
|
{% for template_type in template_types %}
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link font-weight-bold" data-toggle="tab" href="#{{ template_type.grouper|slugify }}">
|
||||||
|
{{ template_type.grouper }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Tabs content #}
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="tab-content">
|
||||||
|
{% for template_type in template_types %}
|
||||||
|
<div class="tab-pane" id="{{ template_type.grouper|slugify }}">
|
||||||
|
<div class="d-inline-flex flex-wrap justify-content-center">
|
||||||
|
{% for button in template_type.list %}
|
||||||
|
<button class="btn btn-outline-dark rounded-0 flex-fill"
|
||||||
|
name="button" value="{{ button.name }}">
|
||||||
|
{{ button.name }} ({{ button.amount | pretty_money }})
|
||||||
|
</button>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{# Mode switch #}
|
||||||
|
<div class="card-footer border-primary">
|
||||||
|
<a class="btn btn-sm btn-secondary float-left" href="{% url 'note:template_list' %}">
|
||||||
|
<i class="fa fa-edit"></i> Éditer
|
||||||
|
</a>
|
||||||
|
<div class="btn-group btn-group-toggle float-right" data-toggle="buttons">
|
||||||
|
<label class="btn btn-sm btn-outline-primary active">
|
||||||
|
<input type="radio" name="options" id="option1" checked>
|
||||||
|
Consomations simples
|
||||||
|
</label>
|
||||||
|
<label class="btn btn-sm btn-outline-primary">
|
||||||
|
<input type="radio" name="options" id="option2">
|
||||||
|
Consomations doubles
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card shadow mb-4">
|
||||||
|
<div class="card-header">
|
||||||
|
<p class="card-text font-weight-bold">
|
||||||
|
Historique des transactions récentes
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{% render_table table %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block extracss %}
|
||||||
|
<style>
|
||||||
|
.select2-container{
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block extrajavascript %}
|
{% block extrajavascript %}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user