Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Vladislav Rykov
THSO.server
Commits
aa74c771
Commit
aa74c771
authored
May 21, 2020
by
Vladislav Rykov
Browse files
dashboard last 12 hour chart integrated (need optimization)
parent
7cca2dc6
Changes
2
Show whitespace changes
Inline
Side-by-side
app/app/templates/new/public/.dashboard.html.swp
deleted
100644 → 0
View file @
7cca2dc6
File deleted
app/app/templates/new/public/dashboard.html
View file @
aa74c771
...
...
@@ -93,7 +93,7 @@
</div>
<div
class=
"col"
>
<ul
class=
"nav nav-pills justify-content-end"
>
<li
class=
"nav-item mr-2 mr-md-0"
data-toggle=
"chart"
data-target=
"#chart-sales"
data-
prefix=
"$"
data-suffix=
"k
"
>
<li
class=
"nav-item mr-2 mr-md-0"
data-toggle=
"chart"
data-target=
"#chart-sales"
data-
suffix=
"messages
"
>
<a
href=
"#"
class=
"nav-link py-2 px-3 active"
data-toggle=
"tab"
>
<span
class=
"d-none d-md-block"
>
Last 12 Hours
</span>
<span
class=
"d-md-none"
>
M
</span>
...
...
@@ -275,11 +275,11 @@
},
data
:
{
labels
:
[
'
12pm
'
,
'
1am
'
,
'
2ap
'
,
'
3am
'
,
'
4am
'
,
'
5am
'
,
'
6am
'
,
'
7am
'
,
'
8am
'
,
'
9am
'
,
'
10am
'
,
'
11am
'
,
'
12am
'
]
,
labels
:
{{
day_chart
.
keys
()
|
list
}}
,
datasets
:
[
{
label
:
"
Performance
"
,
data
:
[
0
,
20
,
10
,
60
,
15
,
40
,
20
,
60
,
80
,
100
,
50
,
10
,
30
]
data
:
{{
day_chart
.
values
()
|
list
}}
}]
}
}),
e
.
data
(
"
chart
"
,
a
))
...
...
Write
Preview
Supports
Markdown
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