From fe288cad3414eab177d135ac839a1317cbb9bdce Mon Sep 17 00:00:00 2001
From: Leon Fedotov <LeonFedotov@users.noreply.github.com>
Date: Sun, 28 May 2017 12:18:51 +0300
Subject: [PATCH] Gate system (#449) (#450)

* Gate system (#449)

* Update package.json

* Update drupal_ticket_sync.js

* version bump v2.8.6

* Allow exit

* V2.8.8

* fix lint

* Update package.json

* Gate Web UI fixes

* v2.9.0
---
 package.json          |  2 +-
 routes/gate_routes.js |  2 +-
 views/pages/gate.jade | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1daad70ea..220d77a62 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "this is part of the deployment proess, so it is important to update the version number",
     "version name corresponds to the github release name / tag name - https://github.com/Midburn/Spark/releases"
   ],
-  "version": "2.8.9",
+  "version": "2.9.0",
   "private": true,
   "scripts": {
     "postinstall": "bower install",
diff --git a/routes/gate_routes.js b/routes/gate_routes.js
index e60b133bd..e7c8fcf59 100644
--- a/routes/gate_routes.js
+++ b/routes/gate_routes.js
@@ -33,7 +33,7 @@ router.get('/ajax/tickets', [security.protectJwt, userRole.isGateManager()], asy
 
         let searchRegex = req.query.search.trim().replace(' ', '|');
 
-        knex.select('*')
+        knex.select('tickets.*', 'users.*', 'users_groups.name')
             .from('tickets')
             .leftJoin('users', 'tickets.holder_id', 'users.user_id')
             .leftJoin('users_groups', 'tickets.entrance_group_id', 'users_groups.group_id')
diff --git a/views/pages/gate.jade b/views/pages/gate.jade
index 280dc86f6..df803fb19 100644
--- a/views/pages/gate.jade
+++ b/views/pages/gate.jade
@@ -234,4 +234,14 @@ block scripts
                         $("#alerts")[0].innerHTML = "<div class='alert alert-danger'>" + JSON.parse(xhr.responseText).message + "</div>";
                     });
             }
+
+            $("#myModal").on('hide.bs.modal', function() {
+                $("#modal_mode")[0].innerHTML = "";
+                $("#modal_barcode")[0].innerHTML = "";
+                $("#modal_ticket_number")[0].innerHTML = "";
+                $("#modal_name")[0].innerHTML = "";
+                $("#modal_email")[0].innerHTML = "";
+                $("#modal_type")[0].innerHTML = "";
+                $("#modal_israeli_id")[0].innerHTML = "";
+            });
         });