datatables.net-datetime 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datatables.net-datetime",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "DateTime picker for DataTables.net",
   "main": "dist/dataTables.dateTime.js",
   "module": "dist/dataTables.dateTime.mjs",

package/test/api/dateTime.val().js

@@ -12,7 +12,7 @@ describe('dateTime - api - val()', function () {
 
 	// TK COLIN make this a generic function somewhere as repeated
 	function format(d) {
-		return d.getFullYear() + '-' + pad(1 + d.getMonth()) + '-' + pad(d.getDate());
+		return d.getUTCFullYear() + '-' + pad(1 + d.getUTCMonth()) + '-' + pad(d.getUTCDate());
 	}
 
 	let today = format(new Date());
@@ -21,7 +21,7 @@ describe('dateTime - api - val()', function () {
 		dt.html('input');
 		it('Ensure its a function', function () {
 			el = new DateTime(document.getElementById('test'));
-			expect(typeof el.min).toBe('function');
+			expect(typeof el.val).toBe('function');
 		});
 		it('Getter returns null if no date set', function () {
 			expect(el.val()).toBe(null);
@@ -53,14 +53,14 @@ describe('dateTime - api - val()', function () {
 		it('Set time element', function () {
 			el = new DateTime(document.getElementById('test'), {format: 'HH:mm'});
 			el.val('11:22');
-			expect(el.val().getHours()).toBe(11);
-			expect(el.val().getMinutes()).toBe(22);
+			expect(el.val().getUTCHours()).toBe(11);
+			expect(el.val().getUTCMinutes()).toBe(22);
 		});
 		it('... set when opened', function () {
 			$('#test').click();
 			el.val('10:33');
-			expect(el.val().getHours()).toBe(10);
-			expect(el.val().getMinutes()).toBe(33);
+			expect(el.val().getUTCHours()).toBe(10);
+			expect(el.val().getUTCMinutes()).toBe(33);
 		});
 		it('... updates display', function () {
 			expect($('.dt-datetime-hours .selected').text()).toBe('10');

package/test/api/dateTime.valFormat()-luxon.js

@@ -0,0 +1,83 @@
+describe('dateTime - api - valFormat() Luxon', function () {
+	dt.libs({
+		js: ['jquery', 'datatables', 'luxon', 'datetime'],
+		css: ['datatables', 'datetime']
+	});
+
+	let el;
+
+	function pad(num) {
+		return num < 10 ? '0' + num : num;
+	}
+
+	// TK COLIN make this a generic function somewhere as repeated
+	function format(d) {
+		return d.getUTCFullYear() + '-' + pad(1 + d.getUTCMonth()) + '-' + pad(d.getUTCDate());
+	}
+
+	let today = format(new Date());
+
+	describe('Check the defaults', function () {
+		dt.html('input');
+		it('Ensure its a function', function () {
+			DateTime.use(window.luxon);
+			el = new DateTime(document.getElementById('test'));
+			expect(typeof el.valFormat).toBe('function');
+		});
+		it('Getter returns null if no date set', function () {
+			expect(el.valFormat('yyyy-MM-dd')).toBe(null);
+		});
+		it('Setter returns an API instance', function () {
+			expect(el.valFormat('yyyy-MM-dd', today) instanceof DateTime).toBe(true);
+		});
+		it('Getter returns a string when date set', function () {
+			expect(el.valFormat('yyyy-MM-dd')).toBe(today);
+		});
+	});
+
+	describe('Functional tests', function () {
+		dt.html('input');
+		it('Write a formatted value', function () {
+			el = new DateTime(document.getElementById('value'));
+			el.valFormat('MM-dd-yyyy', '01-18-2023');
+			expect(format(el.val())).toBe('2023-01-18');
+		});
+
+		it('Write a complicated formatted value', function () {
+			el.valFormat('EEEE d MMMM yyyy', 'Friday 14 October 2011');
+			expect(format(el.val())).toBe('2011-10-14');
+		});
+
+		it('Read to a format', function () {
+			let res = el.valFormat('M-d-yy');
+			expect(res).toBe('10-14-11');
+		});
+
+		it('Read to a complicated format', function () {
+			let res = el.valFormat('EEE d MMM yy');
+			expect(res).toBe('Fri 14 Oct 11');
+		});
+	});
+
+	describe('With a format', function () {
+		dt.html('input');
+
+		it('Write a standard value', function () {
+			el = new DateTime(document.getElementById('value'), {
+				format: 'EEEE d MMMM yyyy'
+			});
+			el.val('Friday 14 October 2011');
+			expect(document.getElementById('value').value).toBe('Friday 14 October 2011');
+		});
+
+		it('Write a formatted value', function () {
+			el.valFormat('yy-MM-dd', '23-01-19');
+			expect(document.getElementById('value').value).toBe('Thursday 19 January 2023');
+		});
+
+		it('Read to a format', function () {
+			let res = el.valFormat('M-d-yy');
+			expect(res).toBe('1-19-23');
+		});
+	});
+});

package/test/api/dateTime.valFormat().js

@@ -0,0 +1,83 @@
+describe('dateTime - api - valFormat() Moment', function () {
+	dt.libs({
+		js: ['jquery', 'datatables', 'moment', 'datetime'],
+		css: ['datatables', 'datetime']
+	});
+
+	let el;
+
+	function pad(num) {
+		return num < 10 ? '0' + num : num;
+	}
+
+	// TK COLIN make this a generic function somewhere as repeated
+	function format(d) {
+		return d.getUTCFullYear() + '-' + pad(1 + d.getUTCMonth()) + '-' + pad(d.getUTCDate());
+	}
+
+	let today = format(new Date());
+
+	describe('Check the defaults', function () {
+		dt.html('input');
+		it('Ensure its a function', function () {
+			DateTime.use(window.moment);
+			el = new DateTime(document.getElementById('test'));
+			expect(typeof el.valFormat).toBe('function');
+		});
+		it('Getter returns null if no date set', function () {
+			expect(el.valFormat('YYYY-MM-DD')).toBe(null);
+		});
+		it('Setter returns an API instance', function () {
+			expect(el.valFormat('YYYY-MM-DD', today) instanceof DateTime).toBe(true);
+		});
+		it('Getter returns a string when date set', function () {
+			expect(el.valFormat('YYYY-MM-DD')).toBe(today);
+		});
+	});
+
+	describe('Functional tests', function () {
+		dt.html('input');
+		it('Write a formatted value', function () {
+			el = new DateTime(document.getElementById('value'));
+			el.valFormat('MM-DD-YYYY', '01-18-2023');
+			expect(format(el.val())).toBe('2023-01-18');
+		});
+
+		it('Write a complicated formatted value', function () {
+			el.valFormat('dddd D MMMM YYYY', 'Friday 14 October 2011');
+			expect(format(el.val())).toBe('2011-10-14');
+		});
+
+		it('Read to a format', function () {
+			let res = el.valFormat('M-D-YY');
+			expect(res).toBe('10-14-11');
+		});
+
+		it('Read to a complicated format', function () {
+			let res = el.valFormat('ddd D MMM YY');
+			expect(res).toBe('Fri 14 Oct 11');
+		});
+	});
+
+	describe('With a format', function () {
+		dt.html('input');
+
+		it('Write a standard value', function () {
+			el = new DateTime(document.getElementById('value'), {
+				format: 'dddd D MMMM YYYY'
+			});
+			el.val('Friday 14 October 2011');
+			expect(document.getElementById('value').value).toBe('Friday 14 October 2011');
+		});
+
+		it('Write a formatted value', function () {
+			el.valFormat('YY-MM-DD', '23-01-19');
+			expect(document.getElementById('value').value).toBe('Thursday 19 January 2023');
+		});
+
+		it('Read to a format', function () {
+			let res = el.valFormat('M-D-YY');
+			expect(res).toBe('1-19-23');
+		});
+	});
+});

package/test/options/dateTime.disableDays.js

@@ -35,7 +35,7 @@ describe('dateTime - options - disableDays', function () {
 		it('Function', function () {
 			new DateTime(document.getElementById('value'), {
 				disableDays: function (day) {
-					return day.toString().includes('Oct 0')? true : false;
+					return day.toUTCString().match(/0\d Oct/)? true : false;
 				}
 			});
 			$('#value').click();

package/test/options/dateTime.format.js

@@ -11,8 +11,8 @@ describe('dateTime - options - format', function () {
 	function getToday(rev = false) {
 		let d = new Date();
 		return rev
-			? pad(d.getDate()) + '-' + pad(1 + d.getMonth()) + '-' + d.getFullYear()
-			: d.getFullYear() + '-' + pad(1 + d.getMonth()) + '-' + pad(d.getDate());
+			? pad(d.getUTCDate()) + '-' + pad(1 + d.getUTCMonth()) + '-' + d.getUTCFullYear()
+			: d.getUTCFullYear() + '-' + pad(1 + d.getUTCMonth()) + '-' + pad(d.getUTCDate());
 	}
 
 	function getNow() {
@@ -24,11 +24,11 @@ describe('dateTime - options - format', function () {
 			'-' +
 			pad(d.getDate()) +
 			' ' +
-			pad(d.getUTCHours()) +
+			pad(d.getHours()) +
 			':' +
-			pad(d.getUTCMinutes()) +
+			pad(d.getMinutes()) +
 			':' +
-			pad(d.getUTCSeconds())
+			pad(d.getSeconds())
 		);
 	}
 
@@ -75,10 +75,6 @@ describe('dateTime - options - format', function () {
 			time2 = getNow();
 			let val = $('#test').val();
 
-			console.log(time1);
-			console.log(time2);
-			console.log(val);
-
 			expect(val == time1 || val == time2).toBe(true);
 		});
 	});