Skip to content

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

Инфо сообщение об отсутствии истории по клику, правка ширины ячеек

parent 0ccd5763
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 80 deletions
src/public/css/styles-feeds-stat.css
View file @ 723d395c
...@@ -209,7 +209,15 @@ input[type="checkbox"] ...@@ -209,7 +209,15 @@ input[type="checkbox"]
border-bottom: 2px solid red; border-bottom: 2px solid red;
} }
.table.table-striped.admin.transactions thead tr th.OrderSum .table.table-striped.admin.transactions thead tr th.ViewID,
.table.table-striped.admin.transactions thead tr th.OrderSum,
.table.table-striped.admin.transactions thead tr th.AdMoney
{
width: 1px;
}
.table.table-striped.admin.transactions thead tr th.OrderSum,
.table.table-striped.admin.transactions thead tr th.AdMoney
{ {
text-align: right; text-align: right;
} }
...@@ -228,12 +236,12 @@ input[type="checkbox"] ...@@ -228,12 +236,12 @@ input[type="checkbox"]
/* .b-basket-content */ /* .b-basket-content */
.table.table-striped.admin.transactions thead tr th.period .table.table-striped.admin.transactions thead tr th.period
{ {
min-width: 100px; width: 1px;
} }
.table.table-striped.admin thead tr th.Timestamp .table.table-striped.admin thead tr th.Timestamp
{ {
width: 100px; width: 1px;
line-height: 14px; line-height: 14px;
} }
...@@ -242,6 +250,11 @@ input[type="checkbox"] ...@@ -242,6 +250,11 @@ input[type="checkbox"]
line-height: 13px; line-height: 13px;
} }
.table.table-striped.admin tbody td.Timestamp span
{
white-space: nowrap;
}
.table.table-striped.admin thead tr th.Basket .table.table-striped.admin thead tr th.Basket
{ {
line-height: 14px; line-height: 14px;
...@@ -276,13 +289,6 @@ input[type="checkbox"] ...@@ -276,13 +289,6 @@ input[type="checkbox"]
text-align: center; text-align: center;
width: 55px; width: 55px;
} }
.table.table-striped.admin.transactions thead tr th.OrderSum
{
width: 100px;
}
.table.table-striped.admin td.Basket .table.table-striped.admin td.Basket
{ {
...@@ -469,4 +475,11 @@ input[type="checkbox"] ...@@ -469,4 +475,11 @@ input[type="checkbox"]
.b-filter__switch-item a:hover .b-filter__switch-item a:hover
{ {
text-decoration: none; text-decoration: none;
} }
\ No newline at end of file
.click-history-info
{
height: 400px;
padding-top: 200px;
text-align: center;
}
\ No newline at end of file
src/templates/app/user/cabinet-feed-click-history.phtml
View file @ 723d395c
...@@ -45,10 +45,8 @@ $src = $sxml['src']; ...@@ -45,10 +45,8 @@ $src = $sxml['src'];
$error = $this->error; $error = $this->error;
if (!$error) { if (!$error) {
$viewIdStats = $this->viewIdStats; $viewIdStats = $this->viewIdStats;
$cats = $this->cats; $cats = $this->cats;
} }
?> ?>
...@@ -67,79 +65,78 @@ if (!$error) { ...@@ -67,79 +65,78 @@ if (!$error) {
<section class="b-content__work"> <section class="b-content__work">
<div class="wrapp" style="position: relative;"> <div class="wrapp" style="position: relative;">
<div class="b-feeds-stat_data-loading"></div> <?php //var_dump($viewIdStats) ?>
<?php if(!$viewIdStats): ?>
<?php //print_r($viewIdStats) ?> <div class="click-history-info">
<h2>Извините, история по клику недоступна</h2>
</div>
<div class="chart-graph-stat-info"> <?php else: ?>
<h2>По заданным параметрам статистика отсутствует</h2>
</div>
<div class="chart-graph-stat-error">
<h2>Ошибка в статистике</h2>
<div class="message"></div>
</div>
<?php /* Таблица */ ?> <?php /* Таблица */ ?>
<div id="table-stat" class="b-table_wrapp"> <div id="table-stat" class="b-table_wrapp">
<div class="b-content__loading"></div> <div class="b-content__loading"></div>
<table id="table-line" class="table table-striped admin transactions viewid"> <table id="table-line" class="table table-striped admin transactions viewid">
<thead class="metric sortable"> <thead class="metric sortable">
<tr> <tr>
<?php foreach($cats as $name => $title): ?> <?php foreach($cats as $name => $title): ?>
<th class="<?= $name ?>" data-id="<?= $name ?>"> <th class="<?= $name ?>" data-id="<?= $name ?>">
<?php if ($name == 'Basket'): ?> <?php if ($name == 'Basket'): ?>
<b class="cat not-sorted" id="<?= $name ?>"><?= _t($title)?></b><br /> <b class="cat not-sorted" id="<?= $name ?>"><?= _t($title)?></b><br />
<b class="basket-link not-sorted">Товар</b> <b class="quantity not-sorted">Кол-во</b> <b class="price not-sorted">Цена</b> <b class="basket-link not-sorted">Товар</b> <b class="quantity not-sorted">Кол-во</b> <b class="price not-sorted">Цена</b>
<?php else: ?>
<b class="cat" id="<?= $name ?>"><?= _t($title)?></b>
<?php endif; ?>
</th>
<?php endforeach; ?>
</tr>
</thead>
<tbody>
<?php foreach($viewIdStats as $view_id): ?>
<tr>
<?php foreach($cats as $name => $title): ?>
<td class="<?= $name ?>" data-id="<?= $name ?>">
<?php if($name == 'StartTime' || $name == 'EndTime'): ?>
<?php
$date_time = explode(" ", $view_id[$name]);
?>
<span style="white-space: nowrap;">
<b><?= $date_time[1] ?></b>
<span><?= $date_time[0] ?></span>
</span>
<?php elseif($name == 'Basket'): ?>
<div class="b-basket-content">
<a class="view-id-url" href="<?=$view_id['URL'] ?>" target="_blank"><?= $view_id['URL'] ?></a>
<?php if(count($view_id[$name])>0): ?>
<table>
<tbody>
<?php foreach($view_id[$name] as $item): ?>
<tr>
<td><a class="basket-link" href="<?=$item['URL'] ?>" target="_blank"><?=$item['Title'] ?></a></td>
<td><span class="quantity"><?=$item['Quantity'] ?></span></td>
<td><span class="price"><?=$item['Price'] ?></span></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
</div>
<?php else: ?> <?php else: ?>
<b class="cat" id="<?= $name ?>"><?= _t($title)?></b> <span class="cat"><?= $view_id[$name] ?></span>
<?php endif; ?> <?php endif; ?>
</th> </td>
<?php endforeach; ?>
</tr> <?php endforeach; ?>
</thead> </tr>
<tbody>
<?php foreach($viewIdStats as $view_id): ?>
<tr>
<?php foreach($cats as $name => $title): ?>
<td class="<?= $name ?>" data-id="<?= $name ?>">
<?php if($name == 'StartTime' || $name == 'EndTime'): ?>
<?php
$date_time = explode(" ", $view_id[$name]);
?>
<span style="white-space: nowrap;">
<b><?= $date_time[1] ?></b>
<span><?= $date_time[0] ?></span>
</span>
<?php elseif($name == 'Basket'): ?>
<div class="b-basket-content">
<a class="view-id-url" href="<?=$view_id['URL'] ?>" target="_blank"><?= $view_id['URL'] ?></a>
<?php if(count($view_id[$name])>0): ?>
<table>
<tbody>
<?php foreach($view_id[$name] as $item): ?>
<tr>
<td><a class="basket-link" href="<?=$item['URL'] ?>" target="_blank"><?=$item['Title'] ?></a></td>
<td><span class="quantity"><?=$item['Quantity'] ?></span></td>
<td><span class="price"><?=$item['Price'] ?></span></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
</div>
<?php else: ?>
<span class="cat"><?= $view_id[$name] ?></span>
<?php endif; ?>
</td>
<?php endforeach; ?> <?php endforeach; ?>
</tr> </tbody>
<?php endforeach; ?> </table>
</tbody> </div>
</table>
</div>
<?php endif; ?>
</div> </div>
</section> </section>
......
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