@@ -17,6 +17,8 @@ export class Utils {
1717
1818 viewContainerCount = 0 ;
1919
20+ timezone = PCore . getEnvironmentInfo ( ) ?. getTimeZone ( ) ;
21+
2022 constructor ( private scService : ServerConfigService ) { }
2123
2224 getSDKStaticContentUrl ( ) {
@@ -271,61 +273,61 @@ export class Utils {
271273 switch ( dateFormat ) {
272274 case 'DateTime-Short' :
273275 // 1/1/01 1:00 AM
274- sReturnDate = dayjs ( dateTimeVal ) . format ( 'M/D/YY h:mm A' ) ;
276+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'M/D/YY h:mm A' ) ;
275277 break ;
276278 case 'DateTime-Short-Custom' :
277279 // 01/01/01 01:00 AM
278- sReturnDate = dayjs ( dateTimeVal ) . format ( 'MM/DD/YY hh:mm A' ) ;
280+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'MM/DD/YY hh:mm A' ) ;
279281 break ;
280282 case 'DateTime-Short-YYYY-Custom' :
281283 // 01/01/2001 01:00 AM
282- sReturnDate = dayjs ( dateTimeVal ) . format ( 'M/D/YYYY hh:mm A' ) ;
284+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'M/D/YYYY hh:mm A' ) ;
283285 break ;
284286 case 'DateTime-Long-YYYY-Custom' :
285287 // 01/01/01 01:00 AM
286- sReturnDate = dayjs ( dateTimeVal ) . format ( 'MM/DD/YYYY, hh:mm A' ) ;
288+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'MM/DD/YYYY, hh:mm A' ) ;
287289 break ;
288290 case 'DateTime-Short-YYYY' :
289291 // 1/1/2001 1:00 AM
290- sReturnDate = dayjs ( dateTimeVal ) . format ( 'M/D/YYYY h:mm A' ) ;
292+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'M/D/YYYY h:mm A' ) ;
291293 break ;
292294 case 'DateTime-Medium' :
293295 // Jan 1, 2001 1:00:00 AM
294- sReturnDate = dayjs ( dateTimeVal ) . format ( 'MMM D, YYYY h:mm:ss A' ) ;
296+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'MMM D, YYYY h:mm:ss A' ) ;
295297 break ;
296298 case 'DateTime-Long' :
297299 // January 1, 2001 1:00:00 AM
298- sReturnDate = dayjs ( dateTimeVal ) . format ( 'MMMM D, YYYY h:mm:ss A' ) ;
300+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'MMMM D, YYYY h:mm:ss A' ) ;
299301 break ;
300302 case 'DateTime-DayMonthYear-Custom' :
301303 // 01-Jan-2001 1:00:00 AM
302- sReturnDate = dayjs ( dateTimeVal ) . format ( 'DD-MMM-YYYY h:mm:ss A' ) ;
304+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'DD-MMM-YYYY h:mm:ss A' ) ;
303305 break ;
304306 case 'DateTime-Full' :
305307 // Monday, January 1, 2001 1:00 AM EDT
306- sReturnDate = dayjs ( dateTimeVal ) . format ( 'dddd, MMMM D, YYYY h:mm A z' ) ;
308+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'dddd, MMMM D, YYYY h:mm A z' ) ;
307309 break ;
308310 case 'DateTime-Frame' :
309311 case 'DateTime-Frame-Short' :
310312 case 'DateTime-Since' :
311313 // 2 days, 5 hours ago
312- sReturnDate = dayjs ( dateTimeVal ) . fromNow ( ) ;
314+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . fromNow ( ) ;
313315 break ;
314316 case 'DateTime-ISO-8601' :
315317 // 2001/01/01 1:00:00 AM y/m/d
316- sReturnDate = dayjs ( dateTimeVal ) . format ( 'YYYY/MM/DD h:mm:ss A' ) ;
318+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'YYYY/MM/DD h:mm:ss A' ) ;
317319 break ;
318320 case 'DateTime-Gregorian-1' :
319321 // 01 January, 2001 1:00:00 AM
320- sReturnDate = dayjs ( dateTimeVal ) . format ( 'DD MMMM, YYYY h:mm:ss A' ) ;
322+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'DD MMMM, YYYY h:mm:ss A' ) ;
321323 break ;
322324 case 'DateTime-Gregorian-2' :
323325 // January 01, 2001 1:00:00 AM
324- sReturnDate = dayjs ( dateTimeVal ) . format ( 'MMMM DD, YYYY h:mm:ss A' ) ;
326+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'MMMM DD, YYYY h:mm:ss A' ) ;
325327 break ;
326328 case 'DateTime-Gregorian-3' :
327329 // 2001, January 01 1:00:00 AM
328- sReturnDate = dayjs ( dateTimeVal ) . format ( 'YYYY, MMMM DD h:mm:ss A' ) ;
330+ sReturnDate = dayjs ( dateTimeVal ) . tz ( this . timezone ) . format ( 'YYYY, MMMM DD h:mm:ss A' ) ;
329331 break ;
330332 case 'DateTime-Custom' :
331333 break ;
0 commit comments