From 5a1bcba38921a2777154bbec30e4396b9e1a7422 Mon Sep 17 00:00:00 2001
From: Dmitry Sergienko <sergienko.d@luxoptica.com.ua>
Date: Sat, 18 Nov 2023 15:04:17 +0200
Subject: [PATCH 1/4] fix logout button

---
 qpanel/themes/qpanel/templates/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qpanel/themes/qpanel/templates/header.html b/qpanel/themes/qpanel/templates/header.html
index 4346809..df8982f 100644
--- a/qpanel/themes/qpanel/templates/header.html
+++ b/qpanel/themes/qpanel/templates/header.html
@@ -38,6 +38,7 @@
                   </p>
                 </a>
               </li>
+              {% endif %}
               {% if has_users() %}
                <li class="nav-item">
                 <a class="nav-link" href="{{url_for('.logout')}}">
@@ -48,7 +49,6 @@
                  </a>
               </li>
               {% endif %}
-              {% endif %}
               <li class="nav-item dropdown">
                 <a class="nav-link" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <i class="material-icons">language</i>

From 54b7cc79f5a4c67f7df3da83760ab3b30b51d3aa Mon Sep 17 00:00:00 2001
From: d-sergienko <d-sergienko@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:58:56 +0200
Subject: [PATCH 2/4] fix user_queues filter (#1)

Co-authored-by: Dmitry Sergienko <sergienko.d@luxoptica.com.ua>
---
 qpanel/backend.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qpanel/backend.py b/qpanel/backend.py
index 589e8dd..49adaea 100644
--- a/qpanel/backend.py
+++ b/qpanel/backend.py
@@ -97,8 +97,10 @@ def filter_data_for_user(self, data, user):
             user -- username
         """
         enables = self.config.queue_enables_for_username(user)
-        not_enable = list(set(data.keys()) - set(enables))
-        map(data.pop, not_enable)
+        if len(enables):
+            for q in list(data.keys()):
+                if q not in enables:
+                    data.pop(q)
         return data
 
     def parse_fs(self, data):

From 8f4ff1cafd1c02971ead267eb4314ef02c978f9b Mon Sep 17 00:00:00 2001
From: Dmitry Sergienko <sergienko.d@luxoptica.com.ua>
Date: Sun, 26 Nov 2023 11:50:44 +0200
Subject: [PATCH 3/4] sort queues by name

---
 qpanel/themes/qpanel/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qpanel/themes/qpanel/templates/index.html b/qpanel/themes/qpanel/templates/index.html
index d77d6c2..0c677ed 100644
--- a/qpanel/themes/qpanel/templates/index.html
+++ b/qpanel/themes/qpanel/templates/index.html
@@ -32,7 +32,7 @@
       <div class="content">
         <div class="row">
         {% include theme('row_general_data.html') %}
-        {% for queue_name, queue in queues.items() %}
+        {% for queue_name, queue in queues.items() | sort %}
           <div class="col-md-4">
             <div class="card card-chart">
               <div class="card-header card-header-success queue-card">

From 5cb22a09f502ee6f7026649c06f24fd3025b0ac9 Mon Sep 17 00:00:00 2001
From: d-sergienko <d-sergienko@users.noreply.github.com>
Date: Mon, 11 Dec 2023 14:00:18 +0200
Subject: [PATCH 4/4] add queue name to the card title

---
 qpanel/themes/qpanel/templates/queue.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qpanel/themes/qpanel/templates/queue.html b/qpanel/themes/qpanel/templates/queue.html
index bc1e1ec..43d3304 100644
--- a/qpanel/themes/qpanel/templates/queue.html
+++ b/qpanel/themes/qpanel/templates/queue.html
@@ -40,7 +40,7 @@
             <div class="card">
               <div class="card-header card-header-primary">
                 <h4 class="card-title">
-                    {{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
+                    [{{ name }}] {{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
                 </h4>
               </div>
               <div class="card-body">
@@ -102,7 +102,7 @@ <h4 class="card-title">
             <div class="card">
               <div class="card-header card-header-primary">
                 <h4 class="card-title">
-                    {{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
+                    [{{ name }}] {{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
                 </h4>
               </div>
               <div class="card-body">