File tree 1 file changed +9
-2
lines changed
1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -43,9 +43,16 @@ Vue.filter('formatDate', (value) => {
43
43
const now = moment ( ) ;
44
44
45
45
if ( now . isSame ( date , 'day' ) ) {
46
- return `${ date . fromNow ( ) } (${ date . format ( 'HH:mm' ) } )` ; // Display only time if today
46
+ // Display only time if today
47
+ return `${ date . fromNow ( ) } (${ date . format ( 'HH:mm' ) } )` ;
47
48
}
48
- return date . format ( 'L HH:mm' ) ; // Display only date otherwise
49
+
50
+ const dateOptions = { year : 'numeric' , month : '2-digit' , day : '2-digit' } ;
51
+ const timeOptions = { hour12 : false , hour : '2-digit' , minute : '2-digit' } ;
52
+ const jsDate = date . toDate ( ) ;
53
+
54
+ // Display only date otherwise
55
+ return `${ jsDate . toLocaleDateString ( undefined , dateOptions ) } ${ jsDate . toLocaleTimeString ( undefined , timeOptions ) } ` ;
49
56
} ) ;
50
57
Vue . filter ( 'formatTime' , ( value ) => ( value ? moment ( String ( value ) ) . format ( 'LTS' ) : '—' ) ) ;
51
58
Vue . filter ( 'formatLog' , ( value ) => ( value ? convert . ansi_to_html ( String ( value ) ) : value ) ) ;
You can’t perform that action at this time.
0 commit comments