Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
b8ea7962
Commit
b8ea7962
authored
Nov 20, 2018
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Переброс конфига цветов категорий графика в js-скрипт
parent
689e62f7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
script-feeds-stat-charts.js
src/public/js/script-feeds-stat-charts.js
+2
-7
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+1
-1
No files found.
src/public/js/script-feeds-stat-charts.js
View file @
b8ea7962
...
...
@@ -12,13 +12,8 @@ $(document).ready(function(){
toggelDates
=
[],
//selectedCategoriesId = [],
weekDatesDataStart
,
colorsActiveLines
=
{
'shows'
:
'#2CA02C'
,
'clicks'
:
'#D62728'
,
'transactions'
:
'#1F77B4'
,
'salemoney'
:
'#FF7F0E'
,
'admoney'
:
'#9467BD'
};
colorsActiveLines
=
$
(
selectorGraphChartStat
).
data
(
'colors'
);
// Добавление впереди 0 у однозначных значений
function
pad
(
number
)
{
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
b8ea7962
...
...
@@ -149,7 +149,7 @@ $system_link = $this->url('adm.system.actions');
<?php
/* График */
?>
<?php
if
(
$report
==
'common'
)
:
?>
<div
id=
"chart-graph-stat"
style=
"height: 370px;"
></div>
<div
id=
"chart-graph-stat"
style=
"height: 370px;"
data-colors=
<?=
(
$colors_active_lines
?
json_encode
(
$colors_active_lines
)
:
''
)
?>
>
</div
>
<?php
endif
?>
<?php
/* Таблица */
?>
...
...
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