From 31e4a94d595d7fcac67f01be894003e0c82d53b3 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sat, 4 May 2019 15:01:37 -0700
Subject: [PATCH 1/7] Fix data in financial sample

---
 samples/scales/time/financial.html | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index d5b5ac8d59b..2d73df16cd8 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -37,6 +37,20 @@
 	<button id="update">update</button>
 	<script>
 		function generateData() {
+			/**
+			 * Returns true if outside 9:30am-4pm on a weekday
+			 */
+			function outsideMarketHours(date) {
+				if (date.isoWeekday() > 5) {
+					return true;
+				}
+				if ((unit == 'second' || unit == 'minute' || unit == 'hour')
+						&& ((date.hour() < 9 && date.minute() < 30) || date.hour() > 16)) {
+					return true;
+				}
+				return false;
+			}
+
 			function randomNumber(min, max) {
 				return Math.random() * (max - min) + min;
 			}
@@ -54,10 +68,14 @@
 			var now = moment();
 			var data = [];
 			var unit = document.getElementById('unit').value;
-			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit)) {
-				if (date.isoWeekday() <= 5) {
-					data.push(randomBar(date, data.length > 0 ? data[data.length - 1].y : 30));
+			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
+				if (outsideMarketHours(date)) {
+					date = date.clone().add(8 - date.isoWeekday(), 'day');
+					if ((unit == 'second' || unit == 'minute' || unit == 'hour')) {
+						date = date.hour(9).minute(30).second(0);
+					}
 				}
+				data.push(randomBar(date, data.length > 0 ? data[data.length - 1].y : 30));
 			}
 
 			return data;

From cd0b4f611c07b0e94988a0d4124b1375862d0833 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sat, 4 May 2019 18:43:25 -0700
Subject: [PATCH 2/7] Fix lint errors

---
 samples/scales/time/financial.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index 2d73df16cd8..d7abb2cbd2d 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -37,14 +37,14 @@
 	<button id="update">update</button>
 	<script>
 		function generateData() {
-			/**
-			 * Returns true if outside 9:30am-4pm on a weekday
-			 */
+			var unit = document.getElementById('unit').value;
+
+			// Returns true if outside 9:30am-4pm on a weekday
 			function outsideMarketHours(date) {
 				if (date.isoWeekday() > 5) {
 					return true;
 				}
-				if ((unit == 'second' || unit == 'minute' || unit == 'hour')
+				if ((unit === 'second' || unit === 'minute' || unit === 'hour')
 						&& ((date.hour() < 9 && date.minute() < 30) || date.hour() > 16)) {
 					return true;
 				}
@@ -67,11 +67,10 @@
 			var date = moment('Jan 01 1990', 'MMM DD YYYY');
 			var now = moment();
 			var data = [];
-			var unit = document.getElementById('unit').value;
 			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
 				if (outsideMarketHours(date)) {
 					date = date.clone().add(8 - date.isoWeekday(), 'day');
-					if ((unit == 'second' || unit == 'minute' || unit == 'hour')) {
+					if ((unit === 'second' || unit === 'minute' || unit === 'hour')) {
 						date = date.hour(9).minute(30).second(0);
 					}
 				}

From 809b3d8f425b3857d273a585adbdd3d694df7059 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 6 May 2019 11:07:26 -0700
Subject: [PATCH 3/7] Fix skipping too many days for smaller units

---
 samples/scales/time/financial.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index d7abb2cbd2d..72ac0351856 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -69,7 +69,7 @@
 			var data = [];
 			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
 				if (outsideMarketHours(date)) {
-					date = date.clone().add(8 - date.isoWeekday(), 'day');
+					date = date.clone().add(date.isoWeekday() > 5 ? 8 - date.isoWeekday() : 1, 'day');
 					if ((unit === 'second' || unit === 'minute' || unit === 'hour')) {
 						date = date.hour(9).minute(30).second(0);
 					}

From 0b072aabffe1498ff613b381e518b4c756913a18 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 6 May 2019 11:54:04 -0700
Subject: [PATCH 4/7] Start on Jan 1 for hour

---
 samples/scales/time/financial.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index 72ac0351856..87d0633be7a 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -39,13 +39,20 @@
 		function generateData() {
 			var unit = document.getElementById('unit').value;
 
+			function unitLessThanDay() {
+				return unit === 'second' || unit === 'minute' || unit === 'hour';
+			}
+
+			function beforeNineThirty(date) {
+				return date.hour() < 9 || (date.hour() === 9 && date.minute() < 30);
+			}
+
 			// Returns true if outside 9:30am-4pm on a weekday
 			function outsideMarketHours(date) {
 				if (date.isoWeekday() > 5) {
 					return true;
 				}
-				if ((unit === 'second' || unit === 'minute' || unit === 'hour')
-						&& ((date.hour() < 9 && date.minute() < 30) || date.hour() > 16)) {
+				if (unitLessThanDay() && (beforeNineThirty(date) || date.hour() > 16)) {
 					return true;
 				}
 				return false;
@@ -69,8 +76,10 @@
 			var data = [];
 			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
 				if (outsideMarketHours(date)) {
-					date = date.clone().add(date.isoWeekday() > 5 ? 8 - date.isoWeekday() : 1, 'day');
-					if ((unit === 'second' || unit === 'minute' || unit === 'hour')) {
+					if (unitLessThanDay() && !beforeNineThirty(date)) {
+						date = date.clone().add(date.isoWeekday() > 5 ? 8 - date.isoWeekday() : 1, 'day');
+					}
+					if (unitLessThanDay()) {
 						date = date.hour(9).minute(30).second(0);
 					}
 				}

From a18eaf2d7fc966119f70d38cf7ec883a28c23397 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 7 May 2019 10:28:07 -0700
Subject: [PATCH 5/7] Fix day unit

---
 samples/scales/time/financial.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index 87d0633be7a..5cd97e569ef 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -74,12 +74,13 @@
 			var date = moment('Jan 01 1990', 'MMM DD YYYY');
 			var now = moment();
 			var data = [];
+			var lessThanDay = unitLessThanDay();
 			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
 				if (outsideMarketHours(date)) {
-					if (unitLessThanDay() && !beforeNineThirty(date)) {
+					if (!lessThanDay || !beforeNineThirty(date)) {
 						date = date.clone().add(date.isoWeekday() > 5 ? 8 - date.isoWeekday() : 1, 'day');
 					}
-					if (unitLessThanDay()) {
+					if (lessThanDay) {
 						date = date.hour(9).minute(30).second(0);
 					}
 				}

From 2762805992432e838041a6f736f28a08cf37cca6 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 8 May 2019 15:00:29 -0700
Subject: [PATCH 6/7] Change > to >=

---
 samples/scales/time/financial.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index 5cd97e569ef..338c08899b1 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -78,7 +78,7 @@
 			for (; data.length < 60 && date.isBefore(now); date = date.clone().add(1, unit).startOf(unit)) {
 				if (outsideMarketHours(date)) {
 					if (!lessThanDay || !beforeNineThirty(date)) {
-						date = date.clone().add(date.isoWeekday() > 5 ? 8 - date.isoWeekday() : 1, 'day');
+						date = date.clone().add(date.isoWeekday() >= 5 ? 8 - date.isoWeekday() : 1, 'day');
 					}
 					if (lessThanDay) {
 						date = date.hour(9).minute(30).second(0);

From 8a971d27b742a6923dc07890a03dbb7ddb43295a Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 9 May 2019 07:33:21 -0700
Subject: [PATCH 7/7] Add note

---
 samples/scales/time/financial.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index 338c08899b1..084bacc3622 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -17,6 +17,7 @@
 
 <body>
 	<div style="width:1000px">
+		<p>This example demonstrates a time series scale by drawing a financial line chart using just the core library. For more specific functionality for financial charts, please see <a href="https://github.com/chartjs/chartjs-chart-financial">chartjs-chart-financial</a></p>
 		<canvas id="chart1"></canvas>
 	</div>
 	<br>