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
7be35c3f
Commit
7be35c3f
authored
5 years ago
by
kevalbhatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3582: UI: Show comma formatted numbers in System Details "memory panel" of Statistics popup
parent
6d94f39c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
2 deletions
+24
-2
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+11
-1
Statistics.js
dashboardv2/public/js/views/site/Statistics.js
+1
-0
CommonViewFunction.js
dashboardv3/public/js/utils/CommonViewFunction.js
+11
-1
Statistics.js
dashboardv3/public/js/views/site/Statistics.js
+1
-0
No files found.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
7be35c3f
...
...
@@ -81,6 +81,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
formatIntVal
=
options
.
formatIntVal
,
showListCount
=
options
.
showListCount
||
true
,
highlightString
=
options
.
highlightString
,
formatStringVal
=
options
.
formatStringVal
,
numberFormat
=
options
.
numberFormat
||
_
.
numberFormatWithComa
;
var
table
=
""
,
...
...
@@ -102,7 +103,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if
((
_
.
isNumber
(
val
)
||
!
_
.
isNaN
(
parseInt
(
val
)))
&&
formatIntVal
)
{
return
numberFormat
(
val
);
}
else
{
return
getHighlightedString
(
val
);
var
newVal
=
val
;
if
(
formatStringVal
)
{
newVal
=
parseInt
(
val
);
if
(
newVal
===
NaN
)
{
newVal
=
val
;
}
else
{
newVal
=
numberFormat
(
newVal
);
}
}
return
getHighlightedString
(
newVal
);
}
}
else
{
return
"N/A"
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/site/Statistics.js
View file @
7be35c3f
...
...
@@ -382,6 +382,7 @@ define(['require',
if
(
!
_
.
isEmpty
(
systemMemoryData
))
{
var
memoryTable
=
CommonViewFunction
.
propertyTable
({
scope
:
this
,
formatStringVal
:
true
,
valueObject
:
systemMemoryData
});
that
.
ui
.
memoryCard
.
html
(
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/CommonViewFunction.js
View file @
7be35c3f
...
...
@@ -81,6 +81,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
formatIntVal
=
options
.
formatIntVal
,
showListCount
=
options
.
showListCount
||
true
,
highlightString
=
options
.
highlightString
,
formatStringVal
=
options
.
formatStringVal
,
numberFormat
=
options
.
numberFormat
||
_
.
numberFormatWithComa
;
var
table
=
""
,
...
...
@@ -102,7 +103,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if
((
_
.
isNumber
(
val
)
||
!
_
.
isNaN
(
parseInt
(
val
)))
&&
formatIntVal
)
{
return
numberFormat
(
val
);
}
else
{
return
getHighlightedString
(
val
);
var
newVal
=
val
;
if
(
formatStringVal
)
{
newVal
=
parseInt
(
val
);
if
(
newVal
===
NaN
)
{
newVal
=
val
;
}
else
{
newVal
=
numberFormat
(
newVal
);
}
}
return
getHighlightedString
(
newVal
);
}
}
else
{
return
"N/A"
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/site/Statistics.js
View file @
7be35c3f
...
...
@@ -382,6 +382,7 @@ define(['require',
if
(
!
_
.
isEmpty
(
systemMemoryData
))
{
var
memoryTable
=
CommonViewFunction
.
propertyTable
({
scope
:
this
,
formatStringVal
:
true
,
valueObject
:
systemMemoryData
});
that
.
ui
.
memoryCard
.
html
(
...
...
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