Skip to content

A
addcpm-json
Commit b17f41b8 authored by Александр Чаплыгин's avatar Александр Чаплыгин
Browse files
Options

Правки по стр. кампаний

parent 50933286
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 46 deletions
src/config/autoload/amsystem.global.php
View file @ b17f41b8
...@@ -3008,7 +3008,7 @@ return [ ...@@ -3008,7 +3008,7 @@ return [
array( array(
339 => 339 =>
array( array(
'name' => 'Автономная Республика Крым', 'name' => 'АР Крым',
'codes' => 'codes' =>
array( array(
0 => 703883, 0 => 703883,
......
src/public/css/styles-amsystem.css
View file @ b17f41b8
...@@ -101,9 +101,14 @@ table.campaigns tbody tr td.stat { ...@@ -101,9 +101,14 @@ table.campaigns tbody tr td.stat {
font-style: italic; font-style: italic;
} }
.form-group.title .form-group.active span
{ {
font-size: 16px; color: #D93025;
}
.form-group.active.enabled span
{
color: #2CA02C;
} }
.form-group.url .value-show, .form-group.url .value-show,
...@@ -325,7 +330,8 @@ textarea#cities-codes ...@@ -325,7 +330,8 @@ textarea#cities-codes
margin-top: 30px; margin-top: 30px;
} }
.table.table-striped .table.table-striped,
.table.table-by-cats
{ {
font-family: monospace; font-family: monospace;
} }
...@@ -373,6 +379,7 @@ textarea#cities-codes ...@@ -373,6 +379,7 @@ textarea#cities-codes
font-weight: bold; font-weight: bold;
} }
.table.table-by-cats span.group .table.table-by-cats span.group
{ {
display: inline-block; display: inline-block;
...@@ -381,6 +388,16 @@ textarea#cities-codes ...@@ -381,6 +388,16 @@ textarea#cities-codes
cursor: pointer; cursor: pointer;
} }
.table.table-by-cats tr.cat
{
background-color: #f9f9f9;
}
.table.table-by-cats tr.cat td.period
{
font-weight: bold;
}
.table.table-by-cats span.group b.open .table.table-by-cats span.group b.open
{ {
display: none; display: none;
...@@ -408,7 +425,7 @@ textarea#cities-codes ...@@ -408,7 +425,7 @@ textarea#cities-codes
.table.table-by-cats td.subcat-title .table.table-by-cats td.subcat-title
{ {
padding-left: 30px; padding-left: 40px;
} }
.table.table-by-cats .table.table-by-cats
...@@ -419,6 +436,7 @@ textarea#cities-codes ...@@ -419,6 +436,7 @@ textarea#cities-codes
.table.table-by-cats th:not(.period) .table.table-by-cats th:not(.period)
{ {
width: 1px; width: 1px;
text-align: right;
} }
.table.table-by-cats th.zone-size .table.table-by-cats th.zone-size
......
src/public/js/adm/amsystem-campaign.js
View file @ b17f41b8
...@@ -116,7 +116,7 @@ $(document).ready(function () { ...@@ -116,7 +116,7 @@ $(document).ready(function () {
autoClose: true, autoClose: true,
maxDate: nowDate, maxDate: nowDate,
onSelect: function(fd, d, picker) { onSelect: function(fd, d, picker) {
selectDataPicker(fd, d, picker); selectDatePicker(fd, d, picker);
}, },
}).data('datepicker'), }).data('datepicker'),
datepicker2 = $dateTo.datepicker({ datepicker2 = $dateTo.datepicker({
...@@ -124,7 +124,7 @@ $(document).ready(function () { ...@@ -124,7 +124,7 @@ $(document).ready(function () {
autoClose: true, autoClose: true,
maxDate: nowDate, maxDate: nowDate,
onSelect: function(fd, d, picker) { onSelect: function(fd, d, picker) {
selectDataPicker(fd, d, picker); selectDatePicker(fd, d, picker);
}, },
}).data('datepicker'), }).data('datepicker'),
...@@ -175,8 +175,8 @@ $(document).ready(function () { ...@@ -175,8 +175,8 @@ $(document).ready(function () {
return value.toFixed(accuracy); return value.toFixed(accuracy);
} }
if (isCurrencyValue) { if (isCurrencyValue || (['cpm', 'cpc'].indexOf(dataLine) > -1)) {
return format(value)/* + ' грн.'*/; return format(value) + ' ₴';
} else { } else {
return format(value); return format(value);
} }
...@@ -203,8 +203,10 @@ $(document).ready(function () { ...@@ -203,8 +203,10 @@ $(document).ready(function () {
if (currentActiveLine == 'ctr') format = d3.format(',.2f'); if (currentActiveLine == 'ctr') format = d3.format(',.2f');
if (currentActiveLine == 'cpc') format = d3.format(',.1f'); if (currentActiveLine == 'cpc') format = d3.format(',.1f');
if (isCurrencyValue) return format(value)/* + ' грн.'*/; if (isCurrencyValue) return format(value) + ' ₴';
if (currentActiveLine == 'ctr') return format(value) + ' %'; if (currentActiveLine == 'ctr') return format(value) + ' %';
if (currentActiveLine == 'cpm') return format(value) + ' ₴';
if (currentActiveLine == 'cpc') return format(value) + ' ₴';
return format(value); return format(value);
} }
...@@ -240,11 +242,6 @@ $(document).ready(function () { ...@@ -240,11 +242,6 @@ $(document).ready(function () {
} }
//console.log('AAA dataStat = ', dataStat); //console.log('AAA dataStat = ', dataStat);
//console.log('AAA dataStatTotal = ', dataStatTotal);
//console.log('AAA dataSitesStat = ', dataSitesStat);
//console.log('AAA dataRegionsStat = ', dataRegionsStat);
//console.log('AAA codeRegions = ', codeRegions);
//console.log('AAA codeCities = ', codeCities);
function ShowCommonStatInfo() function ShowCommonStatInfo()
{ {
...@@ -525,27 +522,25 @@ $(document).ready(function () { ...@@ -525,27 +522,25 @@ $(document).ready(function () {
// Отрисовка таблицы: // Отрисовка таблицы:
dataTableForSort.forEach(function(item){ dataTableForSort.forEach(function(item){
$row = $('<tr data-id="' + item['site'] + '">'); $row = $('<tr class="cat" data-id="' + item['site'] + '">');
if (item['sub']) { if (item['sub']) {
$row.append($('<td>').html('<span class="group"><b class="closed">+</b><b class="open">&ndash;</b></span> ' + item['site'])); $row.append($('<td class="period">').html('<span class="group"><b class="closed">+</b><b class="open">&ndash;</b></span> ' + item['site']));
} else { } else {
$row.append($('<td>').html(item['site'])); $row.append($('<td class="period">').html(item['site']));
} }
activeLinesId.forEach(function(line){ activeLinesId.forEach(function(line){
$row.append($('<td class="stat '+ line +'">').html(valueFormatTable(item[line], line))); $row.append($('<td class="stat '+ line +'">').html(valueFormatTable(item[line], line)));
}); });
$row.append($('<td>'));
$row.appendTo($tableContent); $row.appendTo($tableContent);
if (item['sub']) { if (item['sub']) {
for (var zone in item['sub']) { for (var zone in item['sub']) {
$row = $('<tr class="subcat" data-parent="' + item['site'] + '">'); $row = $('<tr class="subcat" data-parent="' + item['site'] + '">');
$row.append($('<td class="subcat-title">').html(item['site'] + '[' + zone % 100 + ']')); $row.append($('<td class="subcat-title">').html('зона [' + zone % 100 + '] (' + '300x250' + ')'));
activeLinesId.forEach(function(line){ activeLinesId.forEach(function(line){
$row.append($('<td class="stat '+ line +'">').html(valueFormatTable(item['sub'][zone][line], line))); $row.append($('<td class="stat '+ line +'">').html(valueFormatTable(item['sub'][zone][line], line)));
}); });
$row.append($('<td class="stat">').html('300x600'));
$row.appendTo($tableContent); $row.appendTo($tableContent);
} }
} }
...@@ -607,11 +602,11 @@ $(document).ready(function () { ...@@ -607,11 +602,11 @@ $(document).ready(function () {
regionName = (codeRegions[item['region']]) ? codeRegions[item['region']] : item['region']; regionName = (codeRegions[item['region']]) ? codeRegions[item['region']] : item['region'];
$row = $('<tr data-id="' + item['region'] + '">'); $row = $('<tr class="cat" data-id="' + item['region'] + '">');
if (item['sub']) { if (item['sub']) {
$row.append($('<td>').html('<span class="group"><b class="closed">+</b><b class="open">&ndash;</b></span> ' + regionName)); $row.append($('<td class="period">').html('<span class="group"><b class="closed">+</b><b class="open">&ndash;</b></span> ' + regionName));
} else { } else {
$row.append($('<td>').html(regionName)); $row.append($('<td class="period">').html(regionName));
} }
activeLinesId.forEach(function(line){ activeLinesId.forEach(function(line){
...@@ -641,10 +636,13 @@ $(document).ready(function () { ...@@ -641,10 +636,13 @@ $(document).ready(function () {
} }
// Выбор времени: // Выбор времени:
function selectDataPicker(fd, d, picker) function selectDatePicker(fd, d, picker)
{ {
var type = picker.$el.parents('.form-group-data').data('type'); var type = picker.$el.parents('.form-group-data').data('type');
requestDataPeriod(type); requestDataPeriod(type);
//datepicker2.update('minDate', d);
//datepicker1.update('maxDate', d);
} }
// Запрос данных за временной период: // Запрос данных за временной период:
...@@ -708,7 +706,6 @@ $(document).ready(function () { ...@@ -708,7 +706,6 @@ $(document).ready(function () {
} }
activeLine = 'views'; activeLine = 'views';
activeLines = JSON.parse($('#campaign-stat-cats').val()); activeLines = JSON.parse($('#campaign-stat-cats').val());
activeLinesId = Object.keys(activeLines); activeLinesId = Object.keys(activeLines);
......
src/src/App/Action/User/CabinetAmSystem.php
View file @ b17f41b8
...@@ -47,7 +47,7 @@ class CabinetAmSystem extends Common ...@@ -47,7 +47,7 @@ class CabinetAmSystem extends Common
const CAMPAIGN_STAT_CATS = [ const CAMPAIGN_STAT_CATS = [
'views' => ['title' => 'Показы', 'color' => '#2CA02C'], 'views' => ['title' => 'Показы', 'color' => '#2CA02C'],
'clicks' => ['title' => 'Клики', 'color' => '#D62728'], 'clicks' => ['title' => 'Клики', 'color' => '#D62728'],
'money' => ['title' => 'Расход, грн.', 'color' => '#1F77B4'], 'money' => ['title' => 'Расход', 'color' => '#1F77B4'],
'reach' => ['title' => 'Охват', 'color' => '#FF7F0E'], 'reach' => ['title' => 'Охват', 'color' => '#FF7F0E'],
'ctr' => ['title' => 'CTR', 'color' => '#9467BD'], 'ctr' => ['title' => 'CTR', 'color' => '#9467BD'],
'cpm' => ['title' => 'eCPM', 'color' => '#33C7B6'], 'cpm' => ['title' => 'eCPM', 'color' => '#33C7B6'],
......
src/templates/app/user/campaign_item.phtml
View file @ b17f41b8
...@@ -120,27 +120,26 @@ if (!$error) { ...@@ -120,27 +120,26 @@ if (!$error) {
<!-- Header --> <!-- Header -->
<div class="panel-heading"> <div class="panel-heading">
<h1> <h1>
<a href="<?=$link_campaigns_list ?>">Кампании</a> <a href="<?=$link_campaigns_list ?>">Кампании</a>/<?= $campaign_title ?>
</h1> </h1>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="switch-data"> <div class="switch-data">
<span class="switch-item selected" data-type="settings">Настройки кампании</span> <span class="switch-item" data-type="settings">Настройки кампании</span>
<span class="switch-item" data-type="stat-common">Общая статистика</span> <span class="switch-item selected" data-type="stat-common">Общая статистика</span>
<span class="switch-item" data-type="stat-sites">По сайтам</span> <span class="switch-item" data-type="stat-sites">По сайтам</span>
<span class="switch-item" data-type="stat-regions">По регионам</span> <span class="switch-item" data-type="stat-regions">По регионам</span>
</div> </div>
<!-- Настройки кампании --> <!-- Настройки кампании -->
<div class="form-group-data selected" data-type="settings"> <div class="form-group-data settings" data-type="settings">
<fieldset disabled="disabled"> <fieldset disabled="disabled">
<!-- Активность и Название --> <!-- Статус кампании -->
<div class="form-group title"> <div class="form-group active <?php if ($campaign_active): ?>enabled<?php endif; ?>">
<input type="checkbox" id="campaign-active" name="campaign-active" <?php if ($campaign_active): ?>checked<?php endif; ?>> <label class="campaign-active">Статус:</label><span><?php if ($campaign_active): ?>активна<?php else: ?>остановлена<?php endif; ?></span>
<label class="campaign-title"><?= $campaign_title ?></label>
</div> </div>
<!-- Даты проведения --> <!-- Даты проведения -->
...@@ -344,7 +343,7 @@ if (!$error) { ...@@ -344,7 +343,7 @@ if (!$error) {
<th><span class="sort">Показы</span></th> <th><span class="sort">Показы</span></th>
<th><span class="sort">Клики</span></th> <th><span class="sort">Клики</span></th>
<th><span class="sort">CTR</span></th> <th><span class="sort">CTR</span></th>
<th><span class="sort">Расход, грн.</span></th> <th><span class="sort">Расход</span></th>
<th><span class="sort">eCPM</span></th> <th><span class="sort">eCPM</span></th>
<th><span class="sort">eCPC</span></th> <th><span class="sort">eCPC</span></th>
</tr> </tr>
...@@ -360,9 +359,9 @@ if (!$error) { ...@@ -360,9 +359,9 @@ if (!$error) {
<td class="stat <?= $target_class ?>"><?= $stat['views'] ?></td> <td class="stat <?= $target_class ?>"><?= $stat['views'] ?></td>
<td class="stat"><?= $stat['clicks'] ?></td> <td class="stat"><?= $stat['clicks'] ?></td>
<td class="stat"><?= $stat['ctr'] ?></td> <td class="stat"><?= $stat['ctr'] ?></td>
<td class="stat <?= $target_class ?>"><?= $stat['money'] ?></td> <td class="stat <?= $target_class ?>"><?= $stat['money'] ?> &#8372;</td>
<td class="stat"><?= $stat['cpm'] ?></td> <td class="stat"><?= $stat['cpm'] ?> &#8372;</td>
<td class="stat"><?= $stat['cpc'] ?></td> <td class="stat"><?= $stat['cpc'] ?> &#8372;</td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
<?php endif ?> <?php endif ?>
...@@ -377,7 +376,7 @@ if (!$error) { ...@@ -377,7 +376,7 @@ if (!$error) {
</div> </div>
<!-- Общая статистика --> <!-- Общая статистика -->
<div class="form-group-data stat-common" data-type="stat-common"> <div class="form-group-data stat-common selected" data-type="stat-common">
<div class="b-content__loading"></div> <div class="b-content__loading"></div>
<div class="campaign-stat"> <div class="campaign-stat">
...@@ -468,7 +467,6 @@ if (!$error) { ...@@ -468,7 +467,6 @@ if (!$error) {
<b class="cat" id="<?= $name ?>"><?= $cat['title'] ?></b> <b class="cat" id="<?= $name ?>"><?= $cat['title'] ?></b>
</th> </th>
<?php endforeach; ?> <?php endforeach; ?>
<th class="zone-size"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
src/templates/app/user/campaigns_list.phtml
View file @ b17f41b8
...@@ -62,9 +62,7 @@ $error = $this->error; ...@@ -62,9 +62,7 @@ $error = $this->error;
<table class="table table-striped campaigns" data-content="campaigns" data-action="/amsystem/campaigns/id/edit/"> <table class="table table-striped campaigns" data-content="campaigns" data-action="/amsystem/campaigns/id/edit/">
<thead> <thead>
<tr> <tr>
<?php /* ?>
<th width="1px"></th> <th width="1px"></th>
<?php */ ?>
<th width="1px">#ID</th> <th width="1px">#ID</th>
<th>Название кампании</th> <th>Название кампании</th>
<th width="1px">Показы</th> <th width="1px">Показы</th>
...@@ -85,11 +83,9 @@ $error = $this->error; ...@@ -85,11 +83,9 @@ $error = $this->error;
$stat = $stats[$campaign_id]; $stat = $stats[$campaign_id];
$target_class = ($campaign['target_action'] == 'load') ? 'load-target' : ''; $target_class = ($campaign['target_action'] == 'load') ? 'load-target' : '';
?> ?>
<?php /* ?>
<td> <td>
<input class="is-active" type="checkbox" data-id="<?= $campaign_id ?>" <?php if ($campaign['active']): ?>checked<?php endif; ?>> <input class="is-active" type="checkbox" data-id="<?= $campaign_id ?>" <?php if ($campaign['active']): ?>checked<?php endif; ?> disabled>
</td> </td>
<?php */ ?>
<td> <td>
<span class="item-id"><?= $campaign_id ?></span> <span class="item-id"><?= $campaign_id ?></span>
</td> </td>
......
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