Отключил логику переключения категории дата-компания в сводном отчете

parent d2862678
...@@ -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();
}); });
......
...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment