From 2b8e421cc4762a290739a68faa9e9a1f21425a7d Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 20:32:27 +0200
Subject: [PATCH 01/10] updated themes to better adjust fittings view to theme

---
 static/css/themes/dark.css                | 10 +++-------
 static/css/themes/dark_purple.css         | 10 +++-------
 static/css/themes/default.css             | 12 ++++--------
 themes/bootstrap/dark/_custom.scss        | 12 ++++--------
 themes/bootstrap/dark_purple/_custom.scss | 12 ++++--------
 themes/bootstrap/default/_custom.scss     | 12 ++++--------
 6 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/static/css/themes/dark.css b/static/css/themes/dark.css
index ca45403f..4ec73d62 100644
--- a/static/css/themes/dark.css
+++ b/static/css/themes/dark.css
@@ -8983,15 +8983,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }
 
 .eveui_title {
-  background: #212529;
+  background: #495057;
   color: #f8f9fa !important;
 }
-
-#wl_hover table {
-  background: #ced4da !important;
-}
diff --git a/static/css/themes/dark_purple.css b/static/css/themes/dark_purple.css
index f1da82f1..b7f31641 100644
--- a/static/css/themes/dark_purple.css
+++ b/static/css/themes/dark_purple.css
@@ -8983,15 +8983,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }
 
 .eveui_title {
-  background: #212529;
+  background: #495057;
   color: #f8f9fa !important;
 }
-
-#wl_hover table {
-  background: #ced4da !important;
-}
diff --git a/static/css/themes/default.css b/static/css/themes/default.css
index f607091d..a2ca5c71 100644
--- a/static/css/themes/default.css
+++ b/static/css/themes/default.css
@@ -8983,15 +8983,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #fff !important;
+  color: #212529 !important;
 }
 
 .eveui_title {
-  background: #212529;
-  color: #f8f9fa !important;
-}
-
-#wl_hover table {
-  background: #ced4da !important;
+  background: #fff;
+  color: #212529 !important;
 }
diff --git a/themes/bootstrap/dark/_custom.scss b/themes/bootstrap/dark/_custom.scss
index 85246604..18e5cd86 100644
--- a/themes/bootstrap/dark/_custom.scss
+++ b/themes/bootstrap/dark/_custom.scss
@@ -3,15 +3,11 @@
 }
 
 .eveui_window {
-  background: $gray-600 !important;
-  color: $gray-200 !important;
+  background: $body-bg !important;
+  color: $body-color !important;
 }
 
 .eveui_title {
-  background: $gray-900;
-  color: $gray-100 !important;
-}
-
-#wl_hover table {
-  background: $gray-400 !important;
+  background: $body-bg;
+  color: $body-color !important;
 }
diff --git a/themes/bootstrap/dark_purple/_custom.scss b/themes/bootstrap/dark_purple/_custom.scss
index 85246604..18e5cd86 100644
--- a/themes/bootstrap/dark_purple/_custom.scss
+++ b/themes/bootstrap/dark_purple/_custom.scss
@@ -3,15 +3,11 @@
 }
 
 .eveui_window {
-  background: $gray-600 !important;
-  color: $gray-200 !important;
+  background: $body-bg !important;
+  color: $body-color !important;
 }
 
 .eveui_title {
-  background: $gray-900;
-  color: $gray-100 !important;
-}
-
-#wl_hover table {
-  background: $gray-400 !important;
+  background: $body-bg;
+  color: $body-color !important;
 }
diff --git a/themes/bootstrap/default/_custom.scss b/themes/bootstrap/default/_custom.scss
index 85246604..18e5cd86 100644
--- a/themes/bootstrap/default/_custom.scss
+++ b/themes/bootstrap/default/_custom.scss
@@ -3,15 +3,11 @@
 }
 
 .eveui_window {
-  background: $gray-600 !important;
-  color: $gray-200 !important;
+  background: $body-bg !important;
+  color: $body-color !important;
 }
 
 .eveui_title {
-  background: $gray-900;
-  color: $gray-100 !important;
-}
-
-#wl_hover table {
-  background: $gray-400 !important;
+  background: $body-bg;
+  color: $body-color !important;
 }

From 61d639310e314705cbe90faf5effcd3f97f6f590 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 20:32:49 +0200
Subject: [PATCH 02/10] moved brand to say when menu collapses also moves menu
 button to right side,

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

diff --git a/templates/base.html b/templates/base.html
index c7125777..869250e1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -33,11 +33,11 @@
 <body>
 	<nav class="navbar navbar-expand-md">
 	{% block menu %}
+		<a class="navbar-brand" href="/#">{{ title }}</a>
 		<button class="navbar-toggler navbar-toggler-right my-1" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-label="Toggle navigation">
 			&#9776;
 		</button>
 		<div class="collapse navbar-collapse" id="mainNavbar">
-			<a class="navbar-brand" href="/#">{{ title }}</a>
 			<ul class="navbar-nav justify-content-start mr-auto">
 				<li class="nav-item">
 					<a class="nav-link" href="{{url_for('index')}}">Home</a>

From e81ed71cdc94bdbab6b6e01be5fd9da61de7ea82 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 20:50:49 +0200
Subject: [PATCH 03/10] fixed fit warnings hover themeing

---
 static/css/themes/dark.css                | 7 ++++++-
 static/css/themes/dark_purple.css         | 7 ++++++-
 static/css/themes/default.css             | 7 ++++++-
 themes/bootstrap/dark/_custom.scss        | 7 ++++++-
 themes/bootstrap/dark_purple/_custom.scss | 7 ++++++-
 themes/bootstrap/default/_custom.scss     | 7 ++++++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/static/css/themes/dark.css b/static/css/themes/dark.css
index 4ec73d62..629ff375 100644
--- a/static/css/themes/dark.css
+++ b/static/css/themes/dark.css
@@ -8988,6 +8988,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_title {
-  background: #495057;
+  background: #495057 !important;
+  color: #f8f9fa !important;
+}
+
+#wl_hover table {
+  background: #495057 !important;
   color: #f8f9fa !important;
 }
diff --git a/static/css/themes/dark_purple.css b/static/css/themes/dark_purple.css
index b7f31641..09884011 100644
--- a/static/css/themes/dark_purple.css
+++ b/static/css/themes/dark_purple.css
@@ -8988,6 +8988,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_title {
-  background: #495057;
+  background: #495057 !important;
+  color: #f8f9fa !important;
+}
+
+#wl_hover table {
+  background: #495057 !important;
   color: #f8f9fa !important;
 }
diff --git a/static/css/themes/default.css b/static/css/themes/default.css
index a2ca5c71..864f1e2e 100644
--- a/static/css/themes/default.css
+++ b/static/css/themes/default.css
@@ -8988,6 +8988,11 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_title {
-  background: #fff;
+  background: #fff !important;
+  color: #212529 !important;
+}
+
+#wl_hover table {
+  background: #fff !important;
   color: #212529 !important;
 }
diff --git a/themes/bootstrap/dark/_custom.scss b/themes/bootstrap/dark/_custom.scss
index 18e5cd86..bcb9bdc7 100644
--- a/themes/bootstrap/dark/_custom.scss
+++ b/themes/bootstrap/dark/_custom.scss
@@ -8,6 +8,11 @@
 }
 
 .eveui_title {
-  background: $body-bg;
+  background: $body-bg !important;
   color: $body-color !important;
 }
+
+#wl_hover table {
+	background: $body-bg !important;
+	color: $body-color !important;
+	}
\ No newline at end of file
diff --git a/themes/bootstrap/dark_purple/_custom.scss b/themes/bootstrap/dark_purple/_custom.scss
index 18e5cd86..bcb9bdc7 100644
--- a/themes/bootstrap/dark_purple/_custom.scss
+++ b/themes/bootstrap/dark_purple/_custom.scss
@@ -8,6 +8,11 @@
 }
 
 .eveui_title {
-  background: $body-bg;
+  background: $body-bg !important;
   color: $body-color !important;
 }
+
+#wl_hover table {
+	background: $body-bg !important;
+	color: $body-color !important;
+	}
\ No newline at end of file
diff --git a/themes/bootstrap/default/_custom.scss b/themes/bootstrap/default/_custom.scss
index 18e5cd86..bcb9bdc7 100644
--- a/themes/bootstrap/default/_custom.scss
+++ b/themes/bootstrap/default/_custom.scss
@@ -8,6 +8,11 @@
 }
 
 .eveui_title {
-  background: $body-bg;
+  background: $body-bg !important;
   color: $body-color !important;
 }
+
+#wl_hover table {
+	background: $body-bg !important;
+	color: $body-color !important;
+	}
\ No newline at end of file

From a1849071b258567edac23c4ecf03c7c10f912703 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 21:37:48 +0200
Subject: [PATCH 04/10] actually apply the template to Swagger generator

---
 waitlist/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waitlist/__init__.py b/waitlist/__init__.py
index 88e74d5a..2bfb6346 100644
--- a/waitlist/__init__.py
+++ b/waitlist/__init__.py
@@ -145,4 +145,4 @@ def default(self, obj):
     "schemes": [LazyString(lambda: request.scheme)]
 }
 
-swag = Swagger(app)
+swag = Swagger(app, template=template)

From 949216f42d0bef7d2445539e3c8641dc5e5bb780 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 21:38:05 +0200
Subject: [PATCH 05/10] upgrade missed bootstrap stuff

---
 templates/base.html                  | 3 ++-
 templates/settings/fleetspy/spy.html | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 869250e1..f42f71c0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,7 +16,8 @@
 {% endassets %}
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
+	
 <title>{% block title %}{% endblock %}</title>
 {% endblock %}
 {% if header_insert is not none %}
diff --git a/templates/settings/fleetspy/spy.html b/templates/settings/fleetspy/spy.html
index 921d6faf..aa7fcce2 100644
--- a/templates/settings/fleetspy/spy.html
+++ b/templates/settings/fleetspy/spy.html
@@ -3,10 +3,10 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
-<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
 {% assets filters="babili", output="gen/fleetview.%(version)s.js", "js/base.js", "js/swagger-client.min.js", "js/fleetview/fleetview.js" %}
 <script type="text/javascript" src="{{ ASSET_URL }}"></script>
 {% endassets %}

From 2a80d9e8f145e7cbf5303ac17c9d0864c7d482cb Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Sun, 17 Jun 2018 22:34:48 +0200
Subject: [PATCH 06/10] date time picker improvements

---
 static/js/history-search.js                  | 77 +++++++-------------
 templates/waitlist/tools/history_search.html | 36 +++++----
 waitlist/blueprints/api/history.py           | 27 +++++--
 waitlist/blueprints/calendar/settings.py     |  2 +-
 4 files changed, 67 insertions(+), 75 deletions(-)

diff --git a/static/js/history-search.js b/static/js/history-search.js
index 1e0dc257..68fa4d97 100644
--- a/static/js/history-search.js
+++ b/static/js/history-search.js
@@ -9,7 +9,7 @@ waitlist.history.historysearch = (function() {
 	var getMetaData = waitlist.base.getMetaData;
 	var createHistoryEntryDOM = waitlist.history.base.createHistoryEntryDOM;
 
-	function loadData(sources, targets, actions, startdate, enddate) {
+	function loadData(sources, targets, actions, startdate, starttime, enddate, endtime) {
 		var data = {};
 		if (sources !== null) {
 			data.accs = sources;
@@ -20,14 +20,16 @@ waitlist.history.historysearch = (function() {
 		if (actions !== null) {
 			data.actions = actions;
 		}
-		data.start = startdate;
-		data.end = enddate;
+		data.startdate = startdate;
+		data.starttime = starttime;
+		data.enddate = enddate;
+		data.endtime = endtime;
 		$.getJSON(getMetaData('api-history-search'), data, function(data) {
 			var hbody = $('#historybody');
 			hbody.empty();
 			if (data.history.length <= 0) {
-				 hbody.append('<td cospan="5">No Results Found</td>');
-				 return;
+				hbody.append('<td cospan="5">No Results Found</td>');
+				return;
 			}
 			for (var i = 0; i < data.history.length; i++) {
 				var hEntryDOM = createHistoryEntryDOM(data.history[i]);
@@ -37,8 +39,8 @@ waitlist.history.historysearch = (function() {
 			}
 			if (data.history.length > 0) {
 				data.laststamp = (new Date(Date
-					.parse(data.history[data.history.length - 1].time)))
-					.getTime();
+				    .parse(data.history[data.history.length - 1].time)))
+				    .getTime();
 			}
 		});
 	}
@@ -50,8 +52,10 @@ waitlist.history.historysearch = (function() {
 		if (actions !== null) {
 			actions = actions.join('|');
 		}
-		var start = $('#startpicker > input').val();
-		var end = $('#endpicker > input').val();
+		let startDate = $('#startDate').val();
+		let startTime = $('#startTime').val();
+		let endDate = $('#endDate').val();
+		let endTime = $('#endTime').val();
 
 		if (sources === "") {
 			sources = null;
@@ -62,55 +66,28 @@ waitlist.history.historysearch = (function() {
 		if (actions === "") {
 			actions = null;
 		}
-		if (start === "") {
-			start = moment().subtract(1, 'day').format("YYYY/MM/DD HH:mm");
+		if (startDate === "" || startTime === "") {
+			return;
 		}
-		if (end === "") {
-			end = moment().format("YYYY/MM/DD HH:mm");
+		if (endDate === "" || endTime === "") {
+			return;
 		}
 
-		loadData(sources, targets, actions, start, end);
+		loadData(sources, targets, actions, startDate, startTime, endDate, endTime);
 	}
 
 	function init() {
 		$('#search').on('click', search_click_handler);
-		$('#startpicker').datetimepicker({
-			icons: {
-				time: "fa fa-clock-o",
-				date: "fa fa-calendar",
-				up: "fa fa-arrow-up",
-				down: "fa fa-arrow-down",
-				previous: 'fa fa-chevron-left',
-				next: 'fa fa-chevron-right',
-				today: 'fa fa-calendar-o',
-				clear: 'fa fa-trash',
-				close: 'fa fa-times'
-			},
-			format: "YYYY/MM/DD HH:mm",
-			sideBySide: true
-		});
-		$('#endpicker').datetimepicker({
-			useCurrent: false,
-			icons: {
-				time: "fa fa-clock-o",
-				date: "fa fa-calendar",
-				up: "fa fa-arrow-up",
-				down: "fa fa-arrow-down",
-				previous: 'fa fa-chevron-left',
-				next: 'fa fa-chevron-right',
-				today: 'fa fa-calendar-o',
-				clear: 'fa fa-trash',
-				close: 'fa fa-times'
-			},
-			format: "YYYY/MM/DD HH:mm",
-			sideBySide: true
-		});
-		$("#startpicker").on("dp.change", function(e) {
-			$('#endpicker').data("DateTimePicker").minDate(e.date);
-		});
-		$("#endpicker").on("dp.change", function(e) {
-			$('#startpicker').data("DateTimePicker").maxDate(e.date);
+		Date.prototype.toDateInputValue = (function() {
+			var local = new Date(this);
+			local.setMinutes(this.getMinutes() - this.getTimezoneOffset());
+			return local.toJSON().slice(0,10);
 		});
+		let nowValue = new Date();
+		document.getElementById('startDate').valueAsDate = nowValue;
+		document.getElementById('startTime').valueAsDate = nowValue;
+		document.getElementById('endDate').valueAsDate = nowValue;
+		document.getElementById('endTime').valueAsDate = nowValue;
 	}
 
 	$(document).ready(init);
diff --git a/templates/waitlist/tools/history_search.html b/templates/waitlist/tools/history_search.html
index 7583541b..c419f16f 100644
--- a/templates/waitlist/tools/history_search.html
+++ b/templates/waitlist/tools/history_search.html
@@ -12,9 +12,6 @@
 {% endassets %}
 {% endif %}
 <meta name="api-history-search" content="{{url_for('api_history.get_comp_history')}}">
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment.min.js" integrity="sha256-4PIvl58L9q7iwjT654TQJM+C/acEyoG738iL8B8nhXg=" crossorigin="anonymous"></script>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/css/bootstrap-datetimepicker.min.css" integrity="sha256-IihK1cRp3mOP+uJ2NIWC4NK60QT0nPwLDHyh1ekT5/w=" crossorigin="anonymous" />
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.42/js/bootstrap-datetimepicker.min.js" integrity="sha256-I8vGZkA2jL0PptxyJBvewDVqNXcgIhcgeqi+GD/aw34=" crossorigin="anonymous"></script>
 <style type="text/css" id="history-css">
 .hidden-el {
 	display: none;
@@ -66,21 +63,28 @@
 			</select>
 		</div>
 		<div class="form-group mr-2">
-			<div class='input-group date' id='startpicker'>
-				<input type='text' class="form-control" />
-				<div class="input-group-prepend">
-					<span class="input-group-text">
-						<i class="fa fa-calendar"></i>
-					</span>
+			<div class="input-group form-group date" id="starttimepicker">
+				<label for="eventTime">From</label>
+				<div class="input-group date" id="startdatetimepicker">
+					<input id="startDate" placeholder="YYYY-mm-dd" type="date" class="form-control" name="startdate" />
+					<input id="startTime" placeholder="HH:MM" type="time" class="form-control" name="starttime" />
+					<div class="input-group-append">
+						<span class="input-group-text">
+							<i class="fa fa-calendar">UTC</i>
+						</span>
+					</div>
 				</div>
 			</div>
-			<span class="mx-1">to</span>
-			<div class='input-group date' id='endpicker'>
-				<input type='text' class="form-control" />
-				<div class="input-group-prepend">
-					<span class="input-group-text">
-						<span class="fa fa-calendar"></span>
-					</span>
+			<div class="input-group form-group date" id="endtimepicker">
+				<label for="eventTime">To</label>
+				<div class="input-group date" id="enddatetimepicker">
+					<input id="endDate" placeholder="YYYY-mm-dd" type="date" class="form-control" name="enddate" />
+					<input id="endTime" placeholder="HH:MM" type="time" class="form-control" name="endtime" />
+					<div class="input-group-append">
+						<span class="input-group-text">
+							<i class="fa fa-calendar">UTC</i>
+						</span>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/waitlist/blueprints/api/history.py b/waitlist/blueprints/api/history.py
index d5ac09ef..922811f1 100644
--- a/waitlist/blueprints/api/history.py
+++ b/waitlist/blueprints/api/history.py
@@ -22,9 +22,20 @@
 def get_comp_history():
     f_acc_names = request.args.get('accs')
     f_char_names = request.args.get('chars')
-    f_time_start = request.args.get('start')
-    f_time_end = request.args.get('end')
+    f_start_date = request.args.get('startdate')
+    f_start_time = request.args.get('starttime')
+    f_end_date = request.args.get('enddate')
+    f_end_time = request.args.get('endtime')
     f_actions = request.args.get('actions')
+
+    f_start = None
+    f_end = None
+    if f_start_date is not None and f_start_time is not None:
+        f_start = f_start_date + ' ' + f_start_time
+
+    if f_end_date is not None and f_end_time is not None:
+        f_end = f_end_date + ' ' + f_end_time
+
     query = db.session.query(HistoryEntry)
     if f_acc_names is not None:
         a_names = f_acc_names.split('|')
@@ -36,7 +47,7 @@ def get_comp_history():
                 condition = (condition | (Account.username.contains(a)))
         if condition is not None:
             query = query.join(HistoryEntry.source).filter(condition)
-    
+
     if f_char_names is not None:
         a_names = f_char_names.split('|')
         condition = None
@@ -47,12 +58,12 @@ def get_comp_history():
                 condition = (condition | (Character.eve_name.contains(a)))
         if condition is not None:
             query = query.join(HistoryEntry.target).filter(condition)
-    
-    if f_time_start is not None and f_time_end is not None:
-        times = datetime.strptime(f_time_start, "%Y/%m/%d %H:%M")
-        timee = datetime.strptime(f_time_end, "%Y/%m/%d %H:%M")
+
+    if f_start is not None and f_end is not None:
+        times = datetime.strptime(f_start[0:16], "%Y-%m-%d %H:%M")
+        timee = datetime.strptime(f_end[0:16], "%Y-%m-%d %H:%M")
         query = query.filter((HistoryEntry.time >= times) & (HistoryEntry.time <= timee))
-    
+
     if f_actions is not None:
         a_actions = f_actions.split('|')
         condition = None
diff --git a/waitlist/blueprints/calendar/settings.py b/waitlist/blueprints/calendar/settings.py
index 6ddb014e..b93b3d49 100644
--- a/waitlist/blueprints/calendar/settings.py
+++ b/waitlist/blueprints/calendar/settings.py
@@ -67,7 +67,7 @@ def post_index():
     for backseat_string in backseats_string:
         backseat_ids.append(int(backseat_string))
 
-    event_datetime: datetime = datetime.strptime(event_date+' '+event_time, "%Y-%m-%d %H:%M")
+    event_datetime: datetime = datetime.strptime((event_date+' '+event_time)[0:16], "%Y-%m-%d %H:%M")
 
     category: CalendarEventCategory = db.session.query(CalendarEventCategory).get(category_id)
 

From cf5eb909d7a9b54ab72e7f4138614961e127c2e9 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Mon, 18 Jun 2018 11:11:31 +0200
Subject: [PATCH 07/10] fixed a typo on reform page

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

diff --git a/templates/fleet/reform/index.html b/templates/fleet/reform/index.html
index b95c6233..eb95871f 100644
--- a/templates/fleet/reform/index.html
+++ b/templates/fleet/reform/index.html
@@ -12,7 +12,7 @@
 <fieldset class="form-group">
 <p>You can just copy and paste the ingame fleet channel member list into the field below.
 Then press Send Invites to start sending out the invites.
-People that are still in the old fleet will not get an invite of cause.</p>
+People that are still in the old fleet will not get an invite of course.</p>
 <p>This will not trigger, notifications or pokes.</p>
 <label for="char-list">Character List</label>
 <textarea class="form-control" id="char-list" name="chars" rows="10" cols="50" placeholder="Post character list here" required></textarea>

From d59b86f30ae9f81d27b40f07b6bb92fe198c4035 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Mon, 18 Jun 2018 11:13:05 +0200
Subject: [PATCH 08/10] added assets versioning support for themes, like it is
 for other static assets too, so cache can be better utilized

---
 templates/partials/themes.js            | 263 ++++++++++++------------
 templates/partials/themes_selector.html |   6 +-
 waitlist/__init__.py                    |   2 +
 waitlist/utility/assets.py              |  20 ++
 4 files changed, 162 insertions(+), 129 deletions(-)
 create mode 100644 waitlist/utility/assets.py

diff --git a/templates/partials/themes.js b/templates/partials/themes.js
index 87f52b52..7f8c9a59 100644
--- a/templates/partials/themes.js
+++ b/templates/partials/themes.js
@@ -1,146 +1,157 @@
 'use strict';
-// this code is directly included into the base.html because the css element needs to be included during the first pass
+// this code is directly included into the base.html because the css element
+// needs to be included during the first pass
 // otherwise people will see a unstyled page flash
 if (!waitlist) {
-    var waitlist = {};
+	var waitlist = {};
 }
 
 waitlist.themes = (function() {
-    let settings = {
-        'id': 'theme-css',
-        'base_path': "/static/css/",
-        'setting_key_prefix': 'themes-',
-        'def_type': 'local',
-        'def_file': 'themes/default.css',
-    };
-    // file_name = null == standard file
-    function setTheme(file_name, type, integrity, crossorigin) {
-        localStorage.setItem(settings.setting_key_prefix+"file", file_name);
-        localStorage.setItem(settings.setting_key_prefix+"type", type);
-        if (integrity === null) {
-            localStorage.removeItem(settings.setting_key_prefix+"integrity");
-        } else {
-            localStorage.setItem(settings.setting_key_prefix+"integrity", integrity);
-        }
-        if (crossorigin === null) {
-            localStorage.removeItem(settings.setting_key_prefix+"crossorigin");
-        } else {
-            localStorage.setItem(settings.setting_key_prefix+"crossorigin", crossorigin);
-        }
+	let settings = {
+		'css_element_id': 'theme-css',
+		'select_id': 'theme-selector',
+		'setting_key_prefix': 'themes-',
+		'default_theme_id': 'default',
+		'themes': {
+			'default': {
+				id: 'default',
+				path: {% assets "themes.default" %}'{{ ASSET_URL }}'{% endassets %},
+				type: 'local',
+				integrity: null,
+				crossorigin: null,
+			},
+			'dark': {
+				id: 'dark',
+				path: {% assets "themes.dark" %}'{{ ASSET_URL }}'{% endassets %},
+				type: 'local',
+				integrity: null,
+				crossorigin: null,
+			},
+			'dark_purple': {
+				id: 'dark_purple',
+				path: {% assets "themes.dark_purple" %}'{{ ASSET_URL }}'{% endassets %},
+				type: 'local',
+				integrity: null,
+				crossorigin: null,
+			}
+		},
+	};
 
-        let new_element = false;
-        let theme_element = document.getElementById(settings.id);
-        // we got none yet
-        if (theme_element === null) {
-            // add one
-            let parser = new DOMParser();
-            let htmlPart = parser.parseFromString('<html><body><link rel="stylesheet" href="" id="'+settings.id+'"></body></html>', "text/html");
-            theme_element = htmlPart.getElementById(settings.id);
-            new_element = true;
-        }
+	// file_name = null == standard file
+	function setTheme(theme_id) {
+		localStorage.setItem(settings.setting_key_prefix + "id", theme_id);
 
-        let pure_element = theme_element;
+		let new_element = false;
+		let theme_element = document.getElementById(settings.css_element_id);
+		// we got none yet
+		if (theme_element === null) {
+			// add one
+			let parser = new DOMParser();
+			let htmlPart = parser.parseFromString(
+			    '<html><body><link rel="stylesheet" href="" id="' + settings.css_element_id
+			        + '"></body></html>', "text/html");
+			theme_element = htmlPart.getElementById(settings.css_element_id);
+			new_element = true;
+		}
 
-        // lets check if we have a local or remote theme
-        if (type === 'remote' && integrity !== null && (!pure_element.hasAttribute('integrity')
-            || !pure_element.getAttribute('integrity') !== integrity)) {
-            pure_element.setAttribute('integrity', integrity);
-        }
-        if (type === 'remote' && crossorigin !== null && (!pure_element.hasAttribute('crossorigin')
-            || !pure_element.getAttribute('crossorigin') !== crossorigin)) {
-            pure_element.setAttribute('crossorigin', crossorigin);
-        }
+		let pure_element = theme_element;
+		let theme = settings.themes[theme_id];
+		// lets check if we have a local or remote theme
+		if (theme.type === 'remote'
+		    && theme.integrity !== null
+		    && (!pure_element.hasAttribute('integrity') || !pure_element
+		        .getAttribute('integrity') !== theme.integrity)) {
+			pure_element.setAttribute('integrity', theme.integrity);
+		}
+		if (theme.type === 'remote'
+		    && theme.crossorigin !== null
+		    && (!pure_element.hasAttribute('crossorigin') || !pure_element
+		        .getAttribute('crossorigin') !== theme.crossorigin)) {
+			pure_element.setAttribute('crossorigin', theme.crossorigin);
+		}
 
-        if ((type === 'local' || integrity === null) && pure_element.hasAttribute('integrity')) {
-            pure_element.removeAttribute('integrity')
-        }
-        if ((type === 'local' || crossorigin === null) && pure_element.hasAttribute('crossorigin')) {
-            pure_element.removeAttribute('crossorigin');
-        }
-        // lets set the href
-        let href = type === "remote" ? file_name : settings.base_path+file_name;
-        pure_element.setAttribute('href', href);
-        if (new_element) {
+		if ((theme.type === 'local' || theme.integrity === null)
+		    && pure_element.hasAttribute('integrity')) {
+			pure_element.removeAttribute('integrity')
+		}
+		if ((theme.type === 'local' || theme.crossorigin === null)
+		    && pure_element.hasAttribute('crossorigin')) {
+			pure_element.removeAttribute('crossorigin');
+		}
+		// lets set the href
+		let href = theme.path;
+		pure_element.setAttribute('href', href);
+		if (new_element) {
 
-            document.write(pure_element.outerHTML);
-            //let headElement = document.getElementsByTagName("head")[0];
-            //let themLoaderElement = document.getElementById("themeloader");
-            //themLoaderElement.insertAdjacentHTML("afterend", pure_element.outerHTML)
-            //headElement.insertAfter(pure_element, themLoaderElement);
-        }
-    }
+			document.write(pure_element.outerHTML);
+			// let headElement = document.getElementsByTagName("head")[0];
+			// let themLoaderElement = document.getElementById("themeloader");
+			// themLoaderElement.insertAdjacentHTML("afterend",
+			// pure_element.outerHTML)
+			// headElement.insertAfter(pure_element, themLoaderElement);
+		}
+	}
 
-    function selectionChangeHandler(event) {
-        let url = event.target.value;
-        let target_option = event.target.options[event.target.options.selectedIndex];
-        let type = target_option.getAttribute('data-type');
-        let integrity = target_option.hasAttribute('data-integrity') ? target_option.getAttribute('data-integrity') : null;
-        let crossorigin = target_option.hasAttribute('data-crossorigin') ? target_option.getAttribute('data-crossorigin') : null;
-        setTheme(this.value, type, integrity, crossorigin); //
-    }
+	function selectionChangeHandler(event) {
+		let theme_id = event.target.value;
+		setTheme(theme_id);
+	}
 
-    function setCurrentTheme() {
-        let file = localStorage.getItem(settings.setting_key_prefix+"file");
-        let type = localStorage.getItem(settings.setting_key_prefix+"type");
-        let integrity = localStorage.getItem(settings.setting_key_prefix+"integrity");
-        let crossorigin = localStorage.getItem(settings.setting_key_prefix+"crossorigin");
-        if (file === null || file === "null") {
-            // set the default theme
-      document.addEventListener('DOMContentLoaded', function () {
-              setSelectionAfterPageReady(settings.def_file);
-          });
-            setTheme(settings.def_file, settings.def_type, settings.def_integrity, settings.def_crossorigin)
-        } else {
-          document.addEventListener('DOMContentLoaded', function () {
-              setSelectionAfterPageReady(file);
-          });
-            setTheme(file, type, integrity, crossorigin);
-        }
-    }
+	function setUpTheme() {
+		let theme_id = localStorage.getItem(settings.setting_key_prefix + "id");
+		
+		if (theme_id === null || theme_id === "null" || !(theme_id in settings.themes) ) {
+			// set the default theme
+			theme_id = settings.default_theme_id;
+		}
 
-    function initThemeAfterPageReady() {
-        let selector = $('#theme-selector')[0];
-        let firstOption = selector[selector.selectedIndex];
-        let file = firstOption.getAttribute('value');
-        let type = firstOption.getAttribute('data-type');
-        let integrity = firstOption.hasAttribute('data-integrity') ? firstOption.getAttribute('data-integrity') : null;
-        let crossorigin = firstOption.hasAttribute('data-crossorigin') ? firstOption.getAttribute('data-crossorigin') : null;
-        setTheme(file, type, integrity, crossorigin);
-    }
+		let theme = settings.themes[theme_id];
 
-    function setSelectionAfterPageReady(file) {
-        let selector = document.getElementById('theme-selector');
-        let foundTheme = false;
-        for(let idx=0; idx < selector.length; idx++) {
-            if (selector[idx].getAttribute('value') === file) {
-                selector[idx].selected = true;
-                foundTheme = true;
-                break;
-            }
-        }
+		setTheme(theme_id);
+		
+		// set selection after dome is done
+		// and then setup a handler for theme selection
+		document.addEventListener('DOMContentLoaded', function() {
+			setSelectionAfterPageReady(theme_id);
+			let selector = document.getElementById(settings.select_id);
+			selector.addEventListener('change', selectionChangeHandler);
+		});
+	}
 
+	function initThemeAfterPageReady() {
+		let selector = $('#theme-selector')[0];
+		let firstOption = selector[selector.selectedIndex];
+		let file = firstOption.getAttribute('value');
+		let type = firstOption.getAttribute('data-type');
+		let integrity = firstOption.hasAttribute('data-integrity') ? firstOption
+		    .getAttribute('data-integrity')
+		    : null;
+		let crossorigin = firstOption.hasAttribute('data-crossorigin') ? firstOption
+		    .getAttribute('data-crossorigin')
+		    : null;
+		setTheme(file, type, integrity, crossorigin);
+	}
 
-        if (!foundTheme) {
-            if (selector.options.length > 0) {
-                selector[0].selected = true;
-                let target_option = selector[0];
-                let url = target_option.value;
-                let type = target_option.getAttribute('data-type');
-                let integrity = target_option.hasAttribute('data-integrity') ? target_option.getAttribute('data-integrity') : null;
-                let crossorigin = target_option.hasAttribute('data-crossorigin') ? target_option.getAttribute('data-crossorigin') : null;
-                setTheme(url, type, integrity, crossorigin); //
-            }
-        }
+	function setSelectionAfterPageReady(theme_id) {
+		let selector = document.getElementById(settings.select_id);
+		let foundTheme = false;
+		for (let idx = 0; idx < selector.length; idx++) {
+			if (selector[idx].getAttribute('value') === theme_id) {
+				selector[idx].selected = true;
+				foundTheme = true;
+				break;
+			}
+		}
 
-    }
+		if (!foundTheme) {
+			console.error('No theme with value ' + theme_id + ' was found in selector, this should never happen.');
+				
+		}
 
-    // apply our current theme and set handlers
-    function init() {
-        let selector = $('#theme-selector');
-        selector.on("change", selectionChangeHandler);
-    }
-    setCurrentTheme();
-    document.addEventListener('DOMContentLoaded', init);
-    // nothing to export
-    return {};
+	}
+
+	// this
+	setUpTheme();
+	// nothing to export
+	return {};
 })();
\ No newline at end of file
diff --git a/templates/partials/themes_selector.html b/templates/partials/themes_selector.html
index 5822da3c..8f86d981 100644
--- a/templates/partials/themes_selector.html
+++ b/templates/partials/themes_selector.html
@@ -1,5 +1,5 @@
 <select id="theme-selector" class="col-2 h-25 custom-select">
-	<option value="themes/default.css" data-type="local">Default</option>
-	<option value="themes/dark.css" data-type="local">Dark</option>
-	<option value="themes/dark_purple.css" data-type="local">Dark Purple</option>
+	<option value="default">Default</option>
+	<option value="dark">Dark</option>
+	<option value="dark_purple">Dark Purple</option>
 </select>
\ No newline at end of file
diff --git a/waitlist/__init__.py b/waitlist/__init__.py
index 2bfb6346..0a38311d 100644
--- a/waitlist/__init__.py
+++ b/waitlist/__init__.py
@@ -23,6 +23,7 @@
 from flask_limiter.extension import Limiter
 from flask_limiter.util import get_ipaddr
 from flask.globals import request
+from waitlist.utility.assets import register_asset_bundles
 
 app = Flask(import_name=__name__, static_url_path="/static",
             static_folder="../static", template_folder=path.join("..", "templates"))
@@ -94,6 +95,7 @@
 # init assets environment
 assets = Environment(app)
 register_filter(BabiliFilter)
+register_asset_bundles(assets)
 
 
 class MiniJSONEncoder(JSONEncoder):
diff --git a/waitlist/utility/assets.py b/waitlist/utility/assets.py
new file mode 100644
index 00000000..b65092a3
--- /dev/null
+++ b/waitlist/utility/assets.py
@@ -0,0 +1,20 @@
+from webassets.bundle import Bundle
+from flask_assets import Environment
+
+
+def register_asset_bundles(assets: Environment):
+    themes_dark = Bundle('css/themes/dark.css',
+                         filters='cssmin',
+                         output='gen/themes/dark.%(version)s.css')
+    themes_darkpurple = Bundle('css/themes/dark_purple.css',
+                               filters='cssmin',
+                               output='gen/themes/dark_purple.%(version)s.css')
+    themes_default = Bundle('css/themes/default.css',
+                            filters='cssmin',
+                            output='gen/themes/default.%(version)s.css')
+    bundles = {
+        'themes.dark': themes_dark,
+        'themes.dark_purple': themes_darkpurple,
+        'themes.default': themes_default
+    }
+    assets.register(bundles)

From 3e3d3557fc8b8d50a645ae81a4a4de20b0fb0251 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Mon, 18 Jun 2018 11:37:22 +0200
Subject: [PATCH 09/10] switched quies fitting stats to .min version and
 removed sri hash from default config

---
 waitlist/utility/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/waitlist/utility/config.py b/waitlist/utility/config.py
index b0e0d54e..c9e926d0 100644
--- a/waitlist/utility/config.py
+++ b/waitlist/utility/config.py
@@ -93,8 +93,8 @@ def set_if_not_exists(self, section, option, value):
 if not config.has_section("fittools"):
     config.add_section("fittools")
 config.set_if_not_exists("fittools", "stats_enabled", "True")
-config.set_if_not_exists("fittools", "stats_uri", "https://quiescens.duckdns.org/wl/ext/wl_external.js")
-config.set_if_not_exists("fittools", "stats_sri", "sha384-VonGhMELp1YLVgnJJMq2NqUOpRjhV7nUpiATMsrK5TIMrYQuGUaUPUZlQIInhGc5")
+config.set_if_not_exists("fittools", "stats_uri", "https://quiescens.duckdns.org/wl/ext/wl_external.min.js")
+config.set_if_not_exists("fittools", "stats_sri", "")
 
 if not config.has_section("overview"):
     config.add_section("overview")

From cda321d7810334a35d135be78cad409060878eb5 Mon Sep 17 00:00:00 2001
From: SpeedProg <speedprogde@googlemail.com>
Date: Mon, 18 Jun 2018 11:44:55 +0200
Subject: [PATCH 10/10] v1.4.2 release info updated

---
 CHANGELOG.md             | 10 ++++++++++
 waitlist/data/version.py |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f348d89..b3c50af0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
 #Changelog
+* 1.4.2:
+  * Improvements
+    * Community name is no longer hidden when menu collapses, also moved menu button to right side
+    * Using minfied version of the fitting stats tool script now
+    * Theme are now versioned like other assets allowing for easier cache control
+  * Fixes:
+    * Converted the date-time picker fields on comp history search to date and time native browser fields
+    * Properly apply scheme to swagger spec
+    * Fixed some bootstrap includes using the wrong version
+    * Fixed a typo on reform page
 * 1.4.1:
   * Fixes
     * Swagger spec not containing the scheme
diff --git a/waitlist/data/version.py b/waitlist/data/version.py
index b7680f7c..72856cba 100644
--- a/waitlist/data/version.py
+++ b/waitlist/data/version.py
@@ -1 +1 @@
-version = "1.4.1-$Format:%h$"
+version = "1.4.2-$Format:%h$"