Убрал легенду под графиком, по-умолчанию у всех колонок checked, когда все…

Убрал легенду под графиком, по-умолчанию у всех колонок checked, когда все галочки сняты- графики не отображаем
parent a084a6d0
...@@ -92,6 +92,10 @@ ...@@ -92,6 +92,10 @@
border-bottom: none; border-bottom: none;
} }
.form-wrapp.login .input-checkbox input[type='checkbox'] {
margin-top: 0;
}
.b-content__scheme { .b-content__scheme {
} }
......
...@@ -127,7 +127,7 @@ $(document).ready(function(){ ...@@ -127,7 +127,7 @@ $(document).ready(function(){
//console.log('AAA selectedCategoriesId = ', selectedCategoriesId); //console.log('AAA selectedCategoriesId = ', selectedCategoriesId);
for (var i = 1; i <= activeLines.length; i++) { for (var i = 1; i <= activeLines.length; i++) {
var currentActiveLine = activeLines[i-1]; var currentActiveLine = activeLines[i-1];
if (!selectedCategoriesId || selectedCategoriesId.length == 0 || selectedCategoriesId.indexOf(currentActiveLine) > -1) { if (selectedCategoriesId.indexOf(currentActiveLine) > -1) {
dataColumnsTemp.push(['data'+i].concat(dataLineChartStat[currentActiveLine])); dataColumnsTemp.push(['data'+i].concat(dataLineChartStat[currentActiveLine]));
names['data'+i] = currentActiveLine, names['data'+i] = currentActiveLine,
types['data'+i] = 'area-spline'; types['data'+i] = 'area-spline';
...@@ -179,7 +179,7 @@ $(document).ready(function(){ ...@@ -179,7 +179,7 @@ $(document).ready(function(){
} }
}, },
legend: { legend: {
show: true, show: false,
item: { item: {
onclick: function (id) { onclick: function (id) {
//toggleData(chart, id); //toggleData(chart, id);
......
...@@ -145,7 +145,7 @@ $(document).ready(function(){ ...@@ -145,7 +145,7 @@ $(document).ready(function(){
listCats.push($(this).data('field')); listCats.push($(this).data('field'));
} }
}) })
return (listCats.length == 0) ? false : listCats; return listCats;
}, },
} }
......
...@@ -175,13 +175,13 @@ $system_link = $this->url('adm.system.actions'); ...@@ -175,13 +175,13 @@ $system_link = $this->url('adm.system.actions');
<thead class="metric sortable"> <thead class="metric sortable">
<tr> <tr>
<th> <th>
<b class="main-cat date selected"><?= _t('Дата')?></b> / <b class="main-cat company"><?= _t(омпания')?></b> <b class="main-cat date selected"><?= _t('Дата')?></b> / <b class="main-cat company"><?= _t(ампания')?></b>
</th> </th>
<?php foreach($cats as $name): ?> <?php foreach($cats as $name): ?>
<th> <th>
<?php if ($report == 'common'): ?> <?php if ($report == 'common'): ?>
<span style="border-color: <?= $colors_active_lines[$name] ?>;"> <span style="border-color: <?= $colors_active_lines[$name] ?>;">
<input type="checkbox" data-field="<?= $name ?>" /> <input type="checkbox" data-field="<?= $name ?>" checked />
</span> </span>
<?php endif; ?> <?php endif; ?>
<b id="<?= $name ?>"><?= _t($name)?><!--<b class="arrow asc">&and;</b><b class="arrow desc">&or;</b>--></b> <b id="<?= $name ?>"><?= _t($name)?><!--<b class="arrow asc">&and;</b><b class="arrow desc">&or;</b>--></b>
......
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