diff --git a/apps/note/views.py b/apps/note/views.py index 07fd03f82b6588180acdaae97f07dcaa5ffdd76f..23326e5fb3387c4ab7321fe3c17f384ca2e3757b 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -28,8 +28,7 @@ class TransactionCreate(LoginRequiredMixin, TemplateView): Add some context variables in template such as page title """ context = super().get_context_data(**kwargs) - context['title'] = _('Transfer money from your account ' - 'to one or others') + context['title'] = _('Transfer money') 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/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 6c60a9fe82dc6e00d72296ef06f2b60e71708b86..489e64cd7fea7fbf5d4da051ff3eee9e44864d6f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -443,7 +443,7 @@ msgid "membership transactions" msgstr "" #: apps/note/views.py:29 -msgid "Transfer money from your account to one or others" +msgid "Transfer money" msgstr "" #: apps/note/views.py:139 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6fb317ad1161de48e4bd531c9e016c9a1a3194b3..695a789b738f2d49ef4f6cedc6de9f331ca7cd66 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -456,8 +456,8 @@ msgid "membership transactions" msgstr "transactions d'adhésion" #: apps/note/views.py:29 -msgid "Transfer money from your account to one or others" -msgstr "Transfert d'argent de ton compte vers un ou plusieurs autres" +msgid "Transfer money" +msgstr "Transferts d'argent" #: note_kfet/settings/__init__.py:63 msgid "" diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index 0543f2d6d489c5cbd9634477c3e40a66fdaa70b8..c6f3cd9bc884421498b11ce5e4cd0a3bbcb82d2b 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later <div class="row"> <div class="col-xl-12"> - <div class="btn-group btn-group-toggle" style="width: 100%" data-toggle="buttons"> + <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0" data-toggle="buttons"> <label class="btn btn-sm btn-outline-primary active"> <input type="radio" name="transaction_type" id="type_gift" checked> Virement @@ -93,7 +93,7 @@ SPDX-License-Identifier: GPL-2.0-or-later <div class="col-md-12" id="dests_div"> <div class="card border-info shadow mb-4"> <div class="card-header"> - <p class="card-text font-weight-bold"> + <p class="card-text font-weight-bold" id="dest_title"> Sélection des destinataires </p> </div> @@ -153,34 +153,51 @@ SPDX-License-Identifier: GPL-2.0-or-later } $(document).ready(function() { - autoCompleteNote("source_note", "source_alias_matched", "source_note_list", sources, sources_notes_display, + autoCompleteNote("source_note", "source_alias_matched", "source_note_list", sources, sources_notes_display, "source_alias", "source_note"); - autoCompleteNote("dest_note", "dest_alias_matched", "dest_note_list", dests, dests_notes_display, - "dest_alias", "dest_note"); + autoCompleteNote("dest_note", "dest_alias_matched", "dest_note_list", dests, dests_notes_display, + "dest_alias", "dest_note", null, null, function() { + let last = dests_notes_display[dests_notes_display.length - 1]; + dests_notes_display.length = 0; + dests_notes_display.push(last); + + last[3] = 1; + + $.getJSON("/api/user/" + last[2].user + "/", function(user) { + $("#last_name").val(user.last_name); + $("#first_name").val(user.first_name); + }); + + return true; + }); }); $("#type_gift").click(function() { $("#emitters_div").hide(); $("#external_div").hide(); $("#dests_div").attr('class', 'col-md-12'); + $("#dest_title").text("Sélection des destinataires"); }); $("#type_transfer").click(function() { $("#emitters_div").show(); $("#external_div").hide(); $("#dests_div").attr('class', 'col-md-6'); + $("#dest_title").text("Sélection des destinataires"); }); $("#type_credit").click(function() { $("#emitters_div").hide(); $("#external_div").show(); $("#dests_div").attr('class', 'col-md-6'); + $("#dest_title").text("Note à créditer"); }); $("#type_debit").click(function() { $("#emitters_div").hide(); $("#external_div").show(); $("#dests_div").attr('class', 'col-md-6'); + $("#dest_title").text("Note à prélever"); }); $("#transfer").click(function() {