diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index 809e7c44459e5a47655d6fcd48dda6b19cdad6a1..ed8619d6c77b43ec5805d471ff96144b80418d27 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -132,6 +132,7 @@ class Transaction(PolymorphicModel):
if self.source.pk == self.destination.pk:
# When source == destination, no money is transfered
+ super().save(*args, **kwargs)
return
created = self.pk is None
diff --git a/apps/note/tables.py b/apps/note/tables.py
index 08a4d2d94e01877f4306df627f89f4adde9ba527..3306cb3bb5f348537f5f063a84bf2b4696897ba6 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -18,7 +18,7 @@ class HistoryTable(tables.Table):
}
model = Transaction
exclude = ("polymorphic_ctype", )
- order_by = ('-created_at', )
+ order_by = ('-id', )
template_name = 'django_tables2/bootstrap4.html'
sequence = ('...', 'total', 'valid')
diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html
index 89adb264594198d5b4df1cbd0d0b1528a7601c4b..5072a1e78f87bb8f7c96534f663e36fcd630fc48 100644
--- a/templates/note/conso_form.html
+++ b/templates/note/conso_form.html
@@ -30,18 +30,15 @@
Sélection des émitteurs
</p>
</div>
- <ul class="list-group list-group-flush">
- <li class="list-group-item py-1 d-flex justify-content-between align-items-center">
- Cras justo odio
- <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 class="list-group list-group-flush" id="note_list">
</ul>
<div class="card-body">
- TODO: reimplement select2 here in JS
+ <select name="source" data-placeholder="Note ..." data-minimum-input-length="1"
+ required id="note" data-autocomplete-light-language="fr"
+ data-autocomplete-light-url="/note/note-autocomplete/"
+ data-autocomplete-light-function="select2">
+ <option value="" selected>---------</option>
+ </select>
</div>
</div>
</div>
@@ -83,10 +80,12 @@
<div class="tab-pane" id="{{ category.grouper|slugify }}">
<div class="d-inline-flex flex-wrap justify-content-center">
{% for button in category.list %}
+ {% if button.display %}
<button class="btn btn-outline-dark rounded-0 flex-fill"
id="button{{ button.id }}" name="button" value="{{ button.name }}">
{{ button.name }} ({{ button.amount | pretty_money }})
</button>
+ {% endif %}
{% endfor %}
</div>
</div>
@@ -131,10 +130,23 @@
min-width: 100%;
}
</style>
+
+ <link href="/static/vendor/select2/dist/css/select2.css" type="text/css" media="screen" rel="stylesheet">
+ <link href="/static/admin/css/autocomplete.css" type="text/css" media="screen" rel="stylesheet">
+ <link href="/static/autocomplete_light/select2.css" type="text/css" media="screen" rel="stylesheet">
+ <script type="text/javascript" src="/static/autocomplete_light/jquery.init.js"></script>
+ <script type="text/javascript" src="/static/vendor/select2/dist/js/select2.full.js"></script>
+ <script type="text/javascript" src="/static/vendor/select2/dist/js/i18n/fr.js"></script>
+ <script type="text/javascript" src="/static/autocomplete_light/autocomplete.init.js"></script>
+ <script type="text/javascript" src="/static/autocomplete_light/forward.js"></script>
+ <script type="text/javascript" src="/static/autocomplete_light/select2.js"></script>
+ <script type="text/javascript" src="/static/autocomplete_light/jquery.post-setup.js"></script>
{% endblock %}
{% block extrajavascript %}
<script type="text/javascript">
+ var consos = [];
+
$(document).ready(function() {
// If hash of a category in the URL, then select this category
// else select the first one
@@ -149,26 +161,45 @@
location.hash = this.getAttribute("href");
});
+ $("#note").change(function(obj) {
+ let name = $("#note option:selected").text();
+ note_obj = $("#note");
+ note = note_obj.val();
+ note_obj.val(0);
+ note_obj.text("");
+ consos = consos.concat([[name, note]]);
+ note_list = $("#note_list");
+ note_list.html(note_list.html() +
+ "<li class=\"list-group-item py-1 d-flex justify-content-between align-items-center\">\n" +
+ " " + name + "\n" +
+ " <span class=\"badge badge-dark badge-pill\">1</span>\n" +
+ " </li>");
+ });
+
{% for button in transaction_templates %}
+ {% if button.display %}
$("#button{{ button.id }}").click(function() {
- $.post("/api/note/transaction/transaction/",
- {
- "csrfmiddlewaretoken": "{{ csrf_token }}",
- "quantity": 1,
- "amount": {{ button.amount }},
- "reason": "{{ button.name }} ({{ button.category.name }})",
- "valid": true,
- "polymorphic_ctype": {{ polymorphic_ctype }},
- "resourcetype": "TemplateTransaction",
- "source": 6,
- "destination": 7,
- "category": {{ button.category.id }},
- "template": {{ button.id }}
- },
- function(data, status) {
- reloadWithTurbolinks();
+ consos.forEach(function(conso) {
+ console.log(conso);
+ $.post("/api/note/transaction/transaction/",
+ {
+ "csrfmiddlewaretoken": "{{ csrf_token }}",
+ "quantity": 1,
+ "amount": {{ button.amount }},
+ "reason": "{{ button.name }} ({{ button.category.name }})",
+ "valid": true,
+ "polymorphic_ctype": {{ polymorphic_ctype }},
+ "resourcetype": "TemplateTransaction",
+ "source": conso[1],
+ "destination": {{ button.destination.pk }},
+ "category": {{ button.category.id }},
+ "template": {{ button.id }}
+ }, reloadWithTurbolinks);
});
+
+ reloadWithTurbolinks();
});
+ {% endif %}
{% endfor %}
});