Правки по оформлению табл.страниц

parent 3eeeb1b1
......@@ -163,9 +163,13 @@ input[type="checkbox"]
margin-top: 30px;
}
.table.table-striped.admin thead.metric.sortable tr b
.table.table-striped.admin
{
font-family: monospace;
}
.table.table-striped.admin thead.metric.sortable tr b
{
cursor: pointer;
}
......
......@@ -11,13 +11,19 @@ $(document).ready(function(){
function valueFormat(value)
{
var
currencyFields = ['admoney', 'salemoney', 'usdollarmoney', 'localmoney'],
currencyFields = ['admoney', 'salemoney', 'usdollarmoney', 'localmoney', 'AdMoney', 'OrderSum'],
isCurrencyValue = currencyFields.indexOf(currentActiveLine) > -1,
format = (isCurrencyValue) ? d3.format(',.2f') : d3.format(',.0f');
//format = (isCurrencyValue) ? d3.format(',.2f') : d3.format(',.0f');
format = (isCurrencyValue) ? d3.format(',.0f') : d3.format(',.0f');
if (isCurrencyValue) {
return format(value) + ' грн.';
} else {
return format(value);
}
}
function RenderInterval(dataLineChartStat)
{
var dataPeriod = dataLineChartStat['period'];
......@@ -122,7 +128,7 @@ $(document).ready(function(){
activeLines.push($(this).attr('id'));
});
//console.log('AAA TableStat render: ', dataLineChartStat);
console.log('AAA TableStat render: ', dataLineChartStat);
//console.log('AAA activeLines: ', activeLines);
dataTable = {};
......
......@@ -19,7 +19,7 @@ class Statistics
}
// Данные по метрикам
// Данные по отчетам фидов
public function getStatData($report_type, $feed_id_list, $dates)
{
$timeDiff = (strtotime($dates[1])-strtotime($dates[0]))/(24*60*60);
......@@ -37,8 +37,6 @@ class Statistics
$fields = ['Views','Clicks','Orders','OrderSum'];
$dates = array(
'group' => $dates_group,
//'start' => '2019-01-01',
//'end' => '2019-01-16',
'start' => $dates[0],
'end' => $dates[1],
);
......
<section class="b-content__counter">
<div class="row row-wrap wrapp">
<div class="b-content__counter-title">
<h1><?= _t("Статистика для клиентов по фидам") ?></h1>
<h1><?= _t("Рекламная сеть AddCPM") ?></h1>
<p class="lead"><?= _t("") ?></p>
</div>
</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