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
17c75ec6
Commit
17c75ec6
authored
Feb 05, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Отключил логику переключения категории дата-компания в сводном отчете
parent
d2862678
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+3
-2
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+8
-0
No files found.
src/public/js/script-feeds-stat.js
View file @
17c75ec6
...
@@ -154,11 +154,12 @@ $(document).ready(function(){
...
@@ -154,11 +154,12 @@ $(document).ready(function(){
$tableHeadCols
.
removeClass
(
'selected'
);
$tableHeadCols
.
removeClass
(
'selected'
);
$this
.
addClass
(
'selected'
).
toggleClass
(
'desc'
);
$this
.
addClass
(
'selected'
).
toggleClass
(
'desc'
);
/*
if ($this.hasClass('main-cat')) {
if ($this.hasClass('main-cat')) {
//dataLineChartStat = ($this.hasClass('date')) ? periodStatsData : campaignStatsData;
dataLineChartStat = ($this.hasClass('date')) ? periodStatsData : campaignStatsData;
dataLineChartStat
=
periodStatsData
;
$tableHeadColsChecks.attr("disabled", $this.hasClass('campaign'));
$tableHeadColsChecks.attr("disabled", $this.hasClass('campaign'));
}
}
*/
renderHourTable
();
renderHourTable
();
});
});
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
17c75ec6
...
@@ -36,6 +36,7 @@ $this->headScript()
...
@@ -36,6 +36,7 @@ $this->headScript()
->
appendFile
(
'/js/script-feeds-stat-table.js'
)
->
appendFile
(
'/js/script-feeds-stat-table.js'
)
->
appendFile
(
'/js/script-feeds-stat.js'
)
->
appendFile
(
'/js/script-feeds-stat.js'
)
->
appendFile
(
'/js/adm/service-actions.js'
)
->
appendFile
(
'/js/adm/service-actions.js'
)
//->appendFile('/js/script-canvas.js')
;
;
$this
->
headLink
()
$this
->
headLink
()
...
@@ -156,6 +157,13 @@ if (!$error) {
...
@@ -156,6 +157,13 @@ if (!$error) {
<div
class=
"message"
></div>
<div
class=
"message"
></div>
</div>
</div>
<?php
/* ?>
<div>
<img id="scream" src="/img/canvas/image-test5.jpg" alt="The Scream" width="200" height="200">
<canvas id="myCanvas" width="200" height="100" style="border:1px solid #000000;"></canvas>
</div>
<?php */
?>
<?php
/* График */
?>
<?php
/* График */
?>
<?php
if
(
$current_report
==
'common'
)
:
?>
<?php
if
(
$current_report
==
'common'
)
:
?>
<div
id=
"chart-graph-stat"
style=
"height: 370px;"
data-colors=
<?=
(
$colors_active_lines
?
json_encode
(
$colors_active_lines
)
:
''
)
?>
>
</div
>
<div
id=
"chart-graph-stat"
style=
"height: 370px;"
data-colors=
<?=
(
$colors_active_lines
?
json_encode
(
$colors_active_lines
)
:
''
)
?>
>
</div
>
...
...
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