datatables.net-datetime 1.1.1 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,167 +5,207 @@ div.dt-datetime {
5
5
  border: 1px solid #ccc;
6
6
  box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.5);
7
7
  padding: 0 20px 6px 20px;
8
- width: 275px; }
9
- div.dt-datetime.inline {
10
- position: relative;
11
- box-shadow: none; }
12
- div.dt-datetime div.dt-datetime-title {
13
- text-align: center;
14
- padding: 5px 0px 3px; }
15
- div.dt-datetime div.dt-datetime-buttons {
16
- text-align: center; }
17
- div.dt-datetime div.dt-datetime-buttons a {
18
- display: inline-block;
19
- padding: 0 0.5em 0.5em 0.5em;
20
- margin: 0;
21
- font-size: 0.9em; }
22
- div.dt-datetime div.dt-datetime-buttons a:hover {
23
- text-decoration: underline; }
24
- div.dt-datetime table {
25
- border-spacing: 0;
26
- margin: 12px 0;
27
- width: 100%; }
28
- div.dt-datetime table.dt-datetime-table-nospace {
29
- margin-top: -12px; }
30
- div.dt-datetime table th {
31
- font-size: 0.8em;
32
- color: #777;
33
- font-weight: normal;
34
- width: 14.285714286%;
35
- padding: 0 0 4px 0;
36
- text-align: center; }
37
- div.dt-datetime table td {
38
- font-size: 0.9em;
39
- color: #444;
40
- padding: 0; }
41
- div.dt-datetime table td.selectable {
42
- text-align: center;
43
- background: #f5f5f5; }
44
- div.dt-datetime table td.selectable.disabled {
45
- color: #aaa;
46
- background: white; }
47
- div.dt-datetime table td.selectable.disabled button:hover {
48
- color: #aaa;
49
- background: white; }
50
- div.dt-datetime table td.selectable.now {
51
- background-color: #ddd; }
52
- div.dt-datetime table td.selectable.now button {
53
- font-weight: bold; }
54
- div.dt-datetime table td.selectable.selected button {
55
- background: #4E6CA3;
56
- color: white;
57
- border-radius: 2px; }
58
- div.dt-datetime table td.selectable button:hover {
59
- background: #ff8000;
60
- color: white;
61
- border-radius: 2px; }
62
- div.dt-datetime table td.dt-datetime-week {
63
- font-size: 0.7em; }
64
- div.dt-datetime table button {
65
- width: 100%;
66
- box-sizing: border-box;
67
- border: none;
68
- background: transparent;
69
- font-size: inherit;
70
- color: inherit;
71
- text-align: center;
72
- padding: 4px 0;
73
- cursor: pointer;
74
- margin: 0; }
75
- div.dt-datetime table button span {
76
- display: inline-block;
77
- min-width: 14px;
78
- text-align: right; }
79
- div.dt-datetime table.weekNumber th {
80
- width: 12.5%; }
81
- div.dt-datetime div.dt-datetime-calendar table {
82
- margin-top: 0; }
83
- div.dt-datetime div.dt-datetime-label {
84
- position: relative;
85
- display: inline-block;
86
- height: 30px;
87
- padding: 5px 6px;
88
- border: 1px solid transparent;
89
- box-sizing: border-box;
90
- cursor: pointer; }
91
- div.dt-datetime div.dt-datetime-label:hover {
92
- border: 1px solid #ddd;
93
- border-radius: 2px;
94
- background-color: #f5f5f5; }
95
- div.dt-datetime div.dt-datetime-label select {
96
- position: absolute;
97
- top: 6px;
98
- left: 0;
99
- cursor: pointer;
100
- opacity: 0; }
101
- div.dt-datetime.horizontal {
102
- width: 550px; }
103
- div.dt-datetime.horizontal div.dt-datetime-date,
104
- div.dt-datetime.horizontal div.dt-datetime-time {
105
- width: 48%; }
106
- div.dt-datetime.horizontal div.dt-datetime-time {
107
- margin-left: 4%; }
108
- div.dt-datetime div.dt-datetime-date {
109
- position: relative;
110
- float: left;
111
- width: 100%; }
112
- div.dt-datetime div.dt-datetime-time {
113
- position: relative;
114
- float: left;
115
- width: 100%;
116
- text-align: center; }
117
- div.dt-datetime div.dt-datetime-time > span {
118
- vertical-align: middle; }
119
- div.dt-datetime div.dt-datetime-time th {
120
- text-align: left; }
121
- div.dt-datetime div.dt-datetime-time div.dt-datetime-timeblock {
122
- display: inline-block;
123
- vertical-align: middle; }
124
- div.dt-datetime div.dt-datetime-iconLeft,
125
- div.dt-datetime div.dt-datetime-iconRight,
126
- div.dt-datetime div.dt-datetime-iconUp,
127
- div.dt-datetime div.dt-datetime-iconDown {
128
- width: 30px;
129
- height: 30px;
130
- background-position: center;
131
- background-repeat: no-repeat;
132
- opacity: 0.3;
133
- overflow: hidden;
134
- box-sizing: border-box; }
135
- div.dt-datetime div.dt-datetime-iconLeft:hover,
136
- div.dt-datetime div.dt-datetime-iconRight:hover,
137
- div.dt-datetime div.dt-datetime-iconUp:hover,
138
- div.dt-datetime div.dt-datetime-iconDown:hover {
139
- border: 1px solid #ccc;
140
- border-radius: 2px;
141
- background-color: #f0f0f0;
142
- opacity: 0.6; }
143
- div.dt-datetime div.dt-datetime-iconLeft button,
144
- div.dt-datetime div.dt-datetime-iconRight button,
145
- div.dt-datetime div.dt-datetime-iconUp button,
146
- div.dt-datetime div.dt-datetime-iconDown button {
147
- border: none;
148
- background: transparent;
149
- text-indent: 30px;
150
- height: 100%;
151
- width: 100%;
152
- cursor: pointer; }
153
- div.dt-datetime div.dt-datetime-iconLeft {
154
- position: absolute;
155
- top: 5px;
156
- left: 5px;
157
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg=="); }
158
- div.dt-datetime div.dt-datetime-iconRight {
159
- position: absolute;
160
- top: 5px;
161
- right: 5px;
162
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII="); }
163
- div.dt-datetime div.dt-datetime-iconUp {
164
- height: 20px;
165
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAALCAMAAABf9c24AAAAFVBMVEX///99fX1+fn57e3t6enoAAAAAAAC73bqPAAAABnRSTlMAYmJkZt92bnysAAAAL0lEQVR4AWOgJmBhxCvLyopHnpmVjY2VCadeoCxIHrcsWJ4RlyxCHlMWCTBRJxwAjrIBDMWSiM0AAAAASUVORK5CYII="); }
166
- div.dt-datetime div.dt-datetime-iconDown {
167
- height: 20px;
168
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAALCAMAAABf9c24AAAAFVBMVEX///99fX1+fn57e3t6enoAAAAAAAC73bqPAAAABnRSTlMAYmJkZt92bnysAAAAMElEQVR4AWOgDmBiRQIsmPKMrGxQgJDFlEfIYpoPk8Utz8qM232MYFfhkQfKUg8AANefAQxecJ58AAAAAElFTkSuQmCC"); }
8
+ width: 275px;
9
+ }
10
+ div.dt-datetime.inline {
11
+ position: relative;
12
+ box-shadow: none;
13
+ }
14
+ div.dt-datetime div.dt-datetime-title {
15
+ text-align: center;
16
+ padding: 5px 0px 3px;
17
+ }
18
+ div.dt-datetime div.dt-datetime-buttons {
19
+ text-align: center;
20
+ }
21
+ div.dt-datetime div.dt-datetime-buttons a {
22
+ display: inline-block;
23
+ padding: 0 0.5em 0.5em 0.5em;
24
+ margin: 0;
25
+ font-size: 0.9em;
26
+ }
27
+ div.dt-datetime div.dt-datetime-buttons a:hover {
28
+ text-decoration: underline;
29
+ }
30
+ div.dt-datetime table {
31
+ border-spacing: 0;
32
+ margin: 12px 0;
33
+ width: 100%;
34
+ }
35
+ div.dt-datetime table.dt-datetime-table-nospace {
36
+ margin-top: -12px;
37
+ }
38
+ div.dt-datetime table th {
39
+ font-size: 0.8em;
40
+ color: #777;
41
+ font-weight: normal;
42
+ width: 14.285714286%;
43
+ padding: 0 0 4px 0;
44
+ text-align: center;
45
+ }
46
+ div.dt-datetime table td {
47
+ font-size: 0.9em;
48
+ color: #444;
49
+ padding: 0;
50
+ }
51
+ div.dt-datetime table td.selectable {
52
+ text-align: center;
53
+ background: #f5f5f5;
54
+ }
55
+ div.dt-datetime table td.selectable.disabled {
56
+ color: #aaa;
57
+ background: white;
58
+ }
59
+ div.dt-datetime table td.selectable.disabled button:hover {
60
+ color: #aaa;
61
+ background: white;
62
+ }
63
+ div.dt-datetime table td.selectable.now {
64
+ background-color: #ddd;
65
+ }
66
+ div.dt-datetime table td.selectable.now button {
67
+ font-weight: bold;
68
+ }
69
+ div.dt-datetime table td.selectable.selected button {
70
+ background: #4E6CA3;
71
+ color: white;
72
+ border-radius: 2px;
73
+ }
74
+ div.dt-datetime table td.selectable button:hover {
75
+ background: #ff8000;
76
+ color: white;
77
+ border-radius: 2px;
78
+ }
79
+ div.dt-datetime table td.dt-datetime-week {
80
+ font-size: 0.7em;
81
+ }
82
+ div.dt-datetime table button {
83
+ width: 100%;
84
+ box-sizing: border-box;
85
+ border: none;
86
+ background: transparent;
87
+ font-size: inherit;
88
+ color: inherit;
89
+ text-align: center;
90
+ padding: 4px 0;
91
+ cursor: pointer;
92
+ margin: 0;
93
+ }
94
+ div.dt-datetime table button span {
95
+ display: inline-block;
96
+ min-width: 14px;
97
+ text-align: right;
98
+ }
99
+ div.dt-datetime table.weekNumber th {
100
+ width: 12.5%;
101
+ }
102
+ div.dt-datetime div.dt-datetime-calendar table {
103
+ margin-top: 0;
104
+ }
105
+ div.dt-datetime div.dt-datetime-label {
106
+ position: relative;
107
+ display: inline-block;
108
+ height: 30px;
109
+ padding: 5px 6px;
110
+ border: 1px solid transparent;
111
+ box-sizing: border-box;
112
+ cursor: pointer;
113
+ }
114
+ div.dt-datetime div.dt-datetime-label:hover {
115
+ border: 1px solid #ddd;
116
+ border-radius: 2px;
117
+ background-color: #f5f5f5;
118
+ }
119
+ div.dt-datetime div.dt-datetime-label select {
120
+ position: absolute;
121
+ top: 6px;
122
+ left: 0;
123
+ cursor: pointer;
124
+ opacity: 0;
125
+ }
126
+ div.dt-datetime.horizontal {
127
+ width: 550px;
128
+ }
129
+ div.dt-datetime.horizontal div.dt-datetime-date,
130
+ div.dt-datetime.horizontal div.dt-datetime-time {
131
+ width: 48%;
132
+ }
133
+ div.dt-datetime.horizontal div.dt-datetime-time {
134
+ margin-left: 4%;
135
+ }
136
+ div.dt-datetime div.dt-datetime-date {
137
+ position: relative;
138
+ float: left;
139
+ width: 100%;
140
+ }
141
+ div.dt-datetime div.dt-datetime-time {
142
+ position: relative;
143
+ float: left;
144
+ width: 100%;
145
+ text-align: center;
146
+ }
147
+ div.dt-datetime div.dt-datetime-time > span {
148
+ vertical-align: middle;
149
+ }
150
+ div.dt-datetime div.dt-datetime-time th {
151
+ text-align: left;
152
+ }
153
+ div.dt-datetime div.dt-datetime-time div.dt-datetime-timeblock {
154
+ display: inline-block;
155
+ vertical-align: middle;
156
+ }
157
+ div.dt-datetime div.dt-datetime-iconLeft,
158
+ div.dt-datetime div.dt-datetime-iconRight,
159
+ div.dt-datetime div.dt-datetime-iconUp,
160
+ div.dt-datetime div.dt-datetime-iconDown {
161
+ width: 30px;
162
+ height: 30px;
163
+ background-position: center;
164
+ background-repeat: no-repeat;
165
+ opacity: 0.3;
166
+ overflow: hidden;
167
+ box-sizing: border-box;
168
+ }
169
+ div.dt-datetime div.dt-datetime-iconLeft:hover,
170
+ div.dt-datetime div.dt-datetime-iconRight:hover,
171
+ div.dt-datetime div.dt-datetime-iconUp:hover,
172
+ div.dt-datetime div.dt-datetime-iconDown:hover {
173
+ border: 1px solid #ccc;
174
+ border-radius: 2px;
175
+ background-color: #f0f0f0;
176
+ opacity: 0.6;
177
+ }
178
+ div.dt-datetime div.dt-datetime-iconLeft button,
179
+ div.dt-datetime div.dt-datetime-iconRight button,
180
+ div.dt-datetime div.dt-datetime-iconUp button,
181
+ div.dt-datetime div.dt-datetime-iconDown button {
182
+ border: none;
183
+ background: transparent;
184
+ text-indent: 30px;
185
+ height: 100%;
186
+ width: 100%;
187
+ cursor: pointer;
188
+ }
189
+ div.dt-datetime div.dt-datetime-iconLeft {
190
+ position: absolute;
191
+ top: 5px;
192
+ left: 5px;
193
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg==");
194
+ }
195
+ div.dt-datetime div.dt-datetime-iconRight {
196
+ position: absolute;
197
+ top: 5px;
198
+ right: 5px;
199
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII=");
200
+ }
201
+ div.dt-datetime div.dt-datetime-iconUp {
202
+ height: 20px;
203
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAALCAMAAABf9c24AAAAFVBMVEX///99fX1+fn57e3t6enoAAAAAAAC73bqPAAAABnRSTlMAYmJkZt92bnysAAAAL0lEQVR4AWOgJmBhxCvLyopHnpmVjY2VCadeoCxIHrcsWJ4RlyxCHlMWCTBRJxwAjrIBDMWSiM0AAAAASUVORK5CYII=");
204
+ }
205
+ div.dt-datetime div.dt-datetime-iconDown {
206
+ height: 20px;
207
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAALCAMAAABf9c24AAAAFVBMVEX///99fX1+fn57e3t6enoAAAAAAAC73bqPAAAABnRSTlMAYmJkZt92bnysAAAAMElEQVR4AWOgDmBiRQIsmPKMrGxQgJDFlEfIYpoPk8Utz8qM232MYFfhkQfKUg8AANefAQxecJ58AAAAAElFTkSuQmCC");
208
+ }
169
209
 
170
210
  div.dt-datetime-error {
171
211
  clear: both;
@@ -174,4 +214,5 @@ div.dt-datetime-error {
174
214
  font-size: 11px;
175
215
  line-height: 1.25em;
176
216
  text-align: center;
177
- color: #b11f1f; }
217
+ color: #b11f1f;
218
+ }
@@ -1,16 +1,9 @@
1
- /*! DateTime picker for DataTables.net v1.1.1
1
+ /*! DateTime picker for DataTables.net v1.2.0
2
2
  *
3
3
  * © SpryMedia Ltd, all rights reserved.
4
4
  * License: MIT datatables.net/license/mit
5
5
  */
6
6
 
7
- /**
8
- * @summary DateTime picker for DataTables.net
9
- * @version 1.1.1
10
- * @file dataTables.dateTime.js
11
- * @author SpryMedia Ltd
12
- * @contact www.datatables.net/contact
13
- */
14
7
  (function( factory ){
15
8
  if ( typeof define === 'function' && define.amd ) {
16
9
  // AMD
@@ -22,9 +15,18 @@
22
15
  // CommonJS
23
16
  module.exports = function (root, $) {
24
17
  if ( ! root ) {
18
+ // CommonJS environments without a window global must pass a
19
+ // root. This will give an error otherwise
25
20
  root = window;
26
21
  }
27
22
 
23
+ if ( ! $ ) {
24
+ $ = typeof window !== 'undefined' ? // jQuery's factory checks for a global window
25
+ require('jquery') :
26
+ require('jquery')( root );
27
+ }
28
+
29
+
28
30
  return factory( $, root, root.document );
29
31
  };
30
32
  }
@@ -35,6 +37,16 @@
35
37
  }(function( $, window, document, undefined ) {
36
38
  'use strict';
37
39
 
40
+
41
+
42
+ /**
43
+ * @summary DateTime picker for DataTables.net
44
+ * @version 1.2.0
45
+ * @file dataTables.dateTime.js
46
+ * @author SpryMedia Ltd
47
+ * @contact www.datatables.net/contact
48
+ */
49
+
38
50
  // Supported formatting and parsing libraries:
39
51
  // * Moment
40
52
  // * Luxon
@@ -102,10 +114,10 @@ var DateTime = function ( input, opts ) {
102
114
  '<div class="'+classPrefix+'-date">'+
103
115
  '<div class="'+classPrefix+'-title">'+
104
116
  '<div class="'+classPrefix+'-iconLeft">'+
105
- '<button title="'+i18n.previous+'">'+i18n.previous+'</button>'+
117
+ '<button type="button" title="'+i18n.previous+'">'+i18n.previous+'</button>'+
106
118
  '</div>'+
107
119
  '<div class="'+classPrefix+'-iconRight">'+
108
- '<button title="'+i18n.next+'">'+i18n.next+'</button>'+
120
+ '<button type="button" title="'+i18n.next+'">'+i18n.next+'</button>'+
109
121
  '</div>'+
110
122
  '<div class="'+classPrefix+'-label">'+
111
123
  '<span></span>'+
@@ -268,7 +280,7 @@ $.extend( DateTime.prototype, {
268
280
  this.s.d = null;
269
281
  }
270
282
  else if ( set === '--now' ) {
271
- this.s.d = new Date();
283
+ this.s.d = this._dateToUtc(new Date());
272
284
  }
273
285
  else if ( typeof set === 'string' ) {
274
286
  // luxon uses different method names so need to be able to call them
@@ -586,6 +598,7 @@ $.extend( DateTime.prototype, {
586
598
  'setSeconds';
587
599
 
588
600
  d[set]( val );
601
+ that._setCalander();
589
602
  that._setTime();
590
603
  that._writeOutput( true );
591
604
  onChange();
@@ -619,6 +632,7 @@ $.extend( DateTime.prototype, {
619
632
  }
620
633
  else {
621
634
  that._setCalander();
635
+ that._setTime();
622
636
  }
623
637
 
624
638
  onChange();
@@ -740,6 +754,7 @@ $.extend( DateTime.prototype, {
740
754
  $('div.dataTables_scrollBody').off( 'scroll.'+namespace );
741
755
  $('div.DTE_Body_Content').off( 'scroll.'+namespace );
742
756
  $('body').off( 'click.'+namespace );
757
+ $(this.dom.input[0].offsetParent).off('.'+namespace);
743
758
  },
744
759
 
745
760
  /**
@@ -982,6 +997,13 @@ $.extend( DateTime.prototype, {
982
997
  _needValue: function () {
983
998
  if ( ! this.s.d ) {
984
999
  this.s.d = this._dateToUtc( new Date() );
1000
+
1001
+ if (! this.s.parts.time) {
1002
+ this.s.d.setUTCHours(0);
1003
+ this.s.d.setUTCMinutes(0);
1004
+ this.s.d.setSeconds(0);
1005
+ this.s.d.setMilliseconds(0);
1006
+ }
985
1007
  }
986
1008
 
987
1009
  return this.s.d;
@@ -1076,7 +1098,7 @@ $.extend( DateTime.prototype, {
1076
1098
  'selected' :
1077
1099
  '';
1078
1100
 
1079
- if (allowed && $.inArray(value, allowed) === -1) {
1101
+ if (typeof value === 'number' && allowed && $.inArray(value, allowed) === -1) {
1080
1102
  selected += ' disabled';
1081
1103
  }
1082
1104
 
@@ -1136,9 +1158,11 @@ $.extend( DateTime.prototype, {
1136
1158
  // Slight hack to allow for the different number of columns
1137
1159
  a += '</tbody></thead><table class="'+className+' '+className+'-nospace"><tbody>';
1138
1160
 
1139
- var start = range !== null ?
1140
- range :
1141
- Math.floor( val / 10 )*10;
1161
+ var start = range !== null
1162
+ ? range
1163
+ : val === -1
1164
+ ? 0
1165
+ : Math.floor( val / 10 )*10;
1142
1166
 
1143
1167
  a += '<tr>';
1144
1168
  for (j=start+1 ; j<start+10 ; j++ ) {
@@ -1326,7 +1350,7 @@ $.extend( DateTime.prototype, {
1326
1350
  ? luxDT.hour
1327
1351
  : d
1328
1352
  ? d.getUTCHours()
1329
- : 0;
1353
+ : -1;
1330
1354
 
1331
1355
  var allowed = function ( prop ) { // Backwards compt with `Increment` option
1332
1356
  return that.c[prop+'Available'] ?
@@ -1342,7 +1366,8 @@ $.extend( DateTime.prototype, {
1342
1366
  ? luxDT.minute
1343
1367
  : d
1344
1368
  ? d.getUTCMinutes()
1345
- : 0, allowed('minutes'),
1369
+ : -1,
1370
+ allowed('minutes'),
1346
1371
  this.s.minutesRange
1347
1372
  );
1348
1373
  this._optionsTime(
@@ -1352,7 +1377,7 @@ $.extend( DateTime.prototype, {
1352
1377
  ? luxDT.second
1353
1378
  : d
1354
1379
  ? d.getSeconds()
1355
- : 0,
1380
+ : -1,
1356
1381
  allowed('seconds'),
1357
1382
  this.s.secondsRange
1358
1383
  );
@@ -1534,7 +1559,7 @@ DateTime.defaults = {
1534
1559
  yearRange: 25
1535
1560
  };
1536
1561
 
1537
- DateTime.version = '1.1.1';
1562
+ DateTime.version = '1.2.0';
1538
1563
 
1539
1564
  // Global export - if no conflicts
1540
1565
  if (! window.DateTime) {
@@ -1558,6 +1583,6 @@ if ($.fn.dataTable) {
1558
1583
  }
1559
1584
  }
1560
1585
 
1561
- return DateTime;
1562
1586
 
1587
+ return DateTime;
1563
1588
  }));