From d62a8d61de6e8ccca3e14ce737a956d4e731e7ac Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Mon, 27 Jul 2020 01:32:05 +0200
Subject: [PATCH] Search fix and CSS update

---
 kfet/static/kfet/css/index.css | 12 ++++++++++++
 kfet/static/kfet/js/kpsul.js   |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index f0eaedf0..94a89a74 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -194,6 +194,18 @@
 
 /* Account autocomplete window */
 
+.jconfirm #search_autocomplete {
+    margin-bottom: 0;
+}
+
+#account_results {
+    left:0 !important;
+}
+
+#account_results ul li.autocomplete-header {
+    display:none;
+}
+
 #account_results ul {
     list-style-type:none;
     background:rgba(255,255,255,0.9);
diff --git a/kfet/static/kfet/js/kpsul.js b/kfet/static/kfet/js/kpsul.js
index cb0b9fe8..a1ac8d37 100644
--- a/kfet/static/kfet/js/kpsul.js
+++ b/kfet/static/kfet/js/kpsul.js
@@ -119,7 +119,7 @@ class AccountSearch {
             url: django_urls['kfet.account.search.autocomplete'](),
             minimumCharacters: 2,
             id: 'search_autocomplete',
-            choiceSelector: '.choice',
+            choiceSelector: '.autocomplete-value',
             placeholder: "Chercher un utilisateur K-Fêt",
             container: that._$results_container,
             box: that._$results_container,
@@ -137,7 +137,12 @@ class AccountSearch {
     }
 
     _on_select(e, choice, autocomplete) {
-        this.manager.set(choice.find('.trigramme').text());
+        // Une option est de la forme "<User> (<trigramme>)"
+        var choice_text = choice.text().trim();
+        var trigramme_regex = /\((.{3})\)$/;
+        // le match est de la forme [<global match>, <group match>]
+        trigramme = choice_text.match(trigramme_regex)[1]
+        this.manager.set(trigramme);
         this.close();
     }