Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
91926971
Commit
91926971
authored
4 years ago
by
kevalbhatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3986: UI Allow user to update the date format from JAVA property file #1
parent
2f766f5c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
8 deletions
+10
-8
main.js
dashboardv2/public/js/main.js
+2
-2
Globals.js
dashboardv2/public/js/utils/Globals.js
+2
-1
Utils.js
dashboardv2/public/js/utils/Utils.js
+1
-1
main.js
dashboardv3/public/js/main.js
+2
-2
Globals.js
dashboardv3/public/js/utils/Globals.js
+2
-1
Utils.js
dashboardv3/public/js/utils/Utils.js
+1
-1
No files found.
dashboardv2/public/js/main.js
View file @
91926971
...
@@ -279,8 +279,8 @@ require(['App',
...
@@ -279,8 +279,8 @@ require(['App',
Globals
.
dateFormat
=
dateFormatSeperated
[
0
];
//date
Globals
.
dateFormat
=
dateFormatSeperated
[
0
];
//date
}
}
}
}
if
(
response
[
'atlas.ui.date.timezone'
]
!==
undefined
)
{
if
(
response
[
'atlas.ui.date.timezone
.format.enabled
'
]
!==
undefined
)
{
Globals
.
is
DateTimeZone
=
response
[
'atlas.ui.date.timezone
'
];
Globals
.
is
TimezoneFormatEnabled
=
response
[
'atlas.ui.date.timezone.format.enabled
'
];
}
}
}
}
--
that
.
asyncFetchCounter
;
--
that
.
asyncFetchCounter
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/Globals.js
View file @
91926971
...
@@ -44,7 +44,7 @@ define(["require"], function(require) {
...
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
// Date Format
Globals
.
dateTimeFormat
=
"MM/DD/YYYY hh:mm:ss A"
;
Globals
.
dateTimeFormat
=
"MM/DD/YYYY hh:mm:ss A"
;
Globals
.
dateFormat
=
"MM/DD/YYYY"
;
Globals
.
dateFormat
=
"MM/DD/YYYY"
;
Globals
.
is
DateTimeZone
=
true
;
Globals
.
is
TimezoneFormatEnabled
=
true
;
return
Globals
;
return
Globals
;
});
});
\ No newline at end of file
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/Utils.js
View file @
91926971
...
@@ -935,7 +935,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
...
@@ -935,7 +935,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
if
(
isValidDate
===
false
&&
options
&&
options
.
defaultDate
!==
false
)
{
if
(
isValidDate
===
false
&&
options
&&
options
.
defaultDate
!==
false
)
{
dateValue
=
moment
().
format
(
dateFormat
);
dateValue
=
moment
().
format
(
dateFormat
);
}
}
if
(
Globals
.
is
DateTimeZone
)
{
if
(
Globals
.
is
TimezoneFormatEnabled
)
{
if
(
!
options
||
options
&&
options
.
zone
!==
false
)
{
if
(
!
options
||
options
&&
options
.
zone
!==
false
)
{
dateValue
+=
" ("
+
moment
.
tz
(
moment
.
tz
.
guess
()).
zoneAbbr
()
+
")"
;
dateValue
+=
" ("
+
moment
.
tz
(
moment
.
tz
.
guess
()).
zoneAbbr
()
+
")"
;
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/main.js
View file @
91926971
...
@@ -308,8 +308,8 @@ require(['App',
...
@@ -308,8 +308,8 @@ require(['App',
Globals
.
dateFormat
=
dateFormatSeperated
[
0
];
//date
Globals
.
dateFormat
=
dateFormatSeperated
[
0
];
//date
}
}
}
}
if
(
response
[
'atlas.ui.date.timezone'
]
!==
undefined
)
{
if
(
response
[
'atlas.ui.date.timezone
.format.enabled
'
]
!==
undefined
)
{
Globals
.
is
DateTimeZone
=
response
[
'atlas.ui.date.timezone
'
];
Globals
.
is
TimezoneFormatEnabled
=
response
[
'atlas.ui.date.timezone.format.enabled
'
];
}
}
}
}
--
that
.
asyncFetchCounter
;
--
that
.
asyncFetchCounter
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/Globals.js
View file @
91926971
...
@@ -44,7 +44,7 @@ define(["require"], function(require) {
...
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
// Date Format
Globals
.
dateTimeFormat
=
"MM/DD/YYYY hh:mm:ss A"
;
Globals
.
dateTimeFormat
=
"MM/DD/YYYY hh:mm:ss A"
;
Globals
.
dateFormat
=
"MM/DD/YYYY"
;
Globals
.
dateFormat
=
"MM/DD/YYYY"
;
Globals
.
is
DateTimeZone
=
true
;
Globals
.
is
TimezoneFormatEnabled
=
true
;
return
Globals
;
return
Globals
;
});
});
\ No newline at end of file
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/Utils.js
View file @
91926971
...
@@ -940,7 +940,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
...
@@ -940,7 +940,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
if
(
isValidDate
===
false
&&
options
&&
options
.
defaultDate
!==
false
)
{
if
(
isValidDate
===
false
&&
options
&&
options
.
defaultDate
!==
false
)
{
dateValue
=
moment
().
format
(
dateFormat
);
dateValue
=
moment
().
format
(
dateFormat
);
}
}
if
(
Globals
.
is
DateTimeZone
)
{
if
(
Globals
.
is
TimezoneFormatEnabled
)
{
if
(
!
options
||
options
&&
options
.
zone
!==
false
)
{
if
(
!
options
||
options
&&
options
.
zone
!==
false
)
{
dateValue
+=
" ("
+
moment
.
tz
(
moment
.
tz
.
guess
()).
zoneAbbr
()
+
")"
;
dateValue
+=
" ("
+
moment
.
tz
(
moment
.
tz
.
guess
()).
zoneAbbr
()
+
")"
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment