ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix emitter button

This commit is contained in:
Yohann D'ANELLO 2020-07-30 15:14:13 +02:00
parent 9361f3f2f0
commit 484560fe4b
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/base.js
View File

@ -130,7 +130,6 @@ function displayNote(note, alias, user_note_field = null, profile_pic_field = nu
if (profile_pic_field != null) { if (profile_pic_field != null) {
$("#" + profile_pic_field).attr('src', img); $("#" + profile_pic_field).attr('src', img);
$("#" + profile_pic_field).click(function () { $("#" + profile_pic_field).click(function () {
console.log(note);
if (note.resourcetype === "NoteUser") { if (note.resourcetype === "NoteUser") {
document.location.href = "/accounts/user/" + note.user; document.location.href = "/accounts/user/" + note.user;
} else if (note.resourcetype === "NoteClub") { } else if (note.resourcetype === "NoteClub") {
@ -223,9 +222,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
// When the user type "Enter", the first alias is clicked // When the user type "Enter", the first alias is clicked
field.keypress(function (event) { field.keypress(function (event) {
console.log(notes);
if (event.originalEvent.charCode === 13 && notes.length > 0) { if (event.originalEvent.charCode === 13 && notes.length > 0) {
console.log(42);
let li_obj = field.parent().find("ul li").first(); let li_obj = field.parent().find("ul li").first();
displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field); displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field);
li_obj.trigger("click"); li_obj.trigger("click");

15
static/js/transfer.js
View File

@ -7,7 +7,7 @@ function refreshHistory() {
$("#history").load("/note/transfer/ #history"); $("#history").load("/note/transfer/ #history");
} }
function reset() { function reset(refresh=true) {
sources_notes_display.length = 0; sources_notes_display.length = 0;
sources.length = 0; sources.length = 0;
dests_notes_display.length = 0; dests_notes_display.length = 0;
@ -21,8 +21,10 @@ function reset() {
$("#bank").val(""); $("#bank").val("");
$("#user_note").val(""); $("#user_note").val("");
$("#profile_pic").attr("src", "/media/pic/default.png"); $("#profile_pic").attr("src", "/media/pic/default.png");
if (refresh) {
refreshBalance(); refreshBalance();
refreshHistory(); refreshHistory();
}
} }
$(document).ready(function() { $(document).ready(function() {
@ -138,15 +140,18 @@ $(document).ready(function() {
$("#source_me").click(function() { $("#source_me").click(function() {
// Shortcut to set the current user as the only emitter // Shortcut to set the current user as the only emitter
reset(); reset(false);
let source_note = $("#source_note"); let source_note = $("#source_note");
source_note.focus(); source_note.focus();
source_note.val(username); source_note.val("");
let event = jQuery.Event("keyup"); let event = jQuery.Event("keyup");
event.originalEvent = {charCode: 0}; event.originalEvent = {charCode: 97};
source_note.trigger(event);
source_note.val(username);
event = jQuery.Event("keyup");
event.originalEvent = {charCode: 97};
source_note.trigger(event); source_note.trigger(event);
console.log(sources.length);
let fill_note = function() { let fill_note = function() {
if (sources.length === 0) { if (sources.length === 0) {
setTimeout(fill_note, 100); setTimeout(fill_note, 100);

4
templates/note/transaction_form.html
View File

@ -56,9 +56,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
<div class="card-body"> <div class="card-body">
<input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" /> <input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" />
<hr> <hr>
<button class="form-control mx-auto d-block btn btn-secondary" id="source_me"> <span class="form-control mx-auto d-block btn btn-secondary" id="source_me">
{% trans "I am the emitter" %} {% trans "I am the emitter" %}
</button> </span>
</div> </div>
</div> </div>
</div> </div>