Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
addcpm-json
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Александр Чаплыгин
addcpm-json
Commits
1f62ca14
Commit
1f62ca14
authored
Feb 07, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Вынес в конфиг основнцю категорию отчетов
parent
17c75ec6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
9 deletions
+21
-9
feeds.global.php
src/config/autoload/feeds.global.php
+7
-0
styles-feeds-stat.css
src/public/css/styles-feeds-stat.css
+8
-0
script-feeds-stat.js
src/public/js/script-feeds-stat.js
+2
-2
cabinet-feed.phtml
src/templates/app/user/cabinet-feed.phtml
+4
-7
No files found.
src/config/autoload/feeds.global.php
View file @
1f62ca14
...
@@ -31,6 +31,10 @@ return [
...
@@ -31,6 +31,10 @@ return [
'title'
=>
'Сводный отчет'
,
'title'
=>
'Сводный отчет'
,
'type'
=>
'feed_stat'
,
'type'
=>
'feed_stat'
,
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
'main_cat'
=>
[
[
'name'
=>
'date'
,
'title'
=>
'Дата'
,
'isSorted'
=>
true
],
//['name' => 'campaign','title' => 'Кампания','isSorted' => true]
],
'cats'
=>
[
'cats'
=>
[
'Views'
=>
'Показы'
,
'Views'
=>
'Показы'
,
'Clicks'
=>
'Клики'
,
'Clicks'
=>
'Клики'
,
...
@@ -43,6 +47,9 @@ return [
...
@@ -43,6 +47,9 @@ return [
'title'
=>
'Транзакции'
,
'title'
=>
'Транзакции'
,
'type'
=>
'feed_transactions'
,
'type'
=>
'feed_transactions'
,
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
'fields'
=>
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
],
'main_cat'
=>
[
[
'name'
=>
'order'
,
'title'
=>
'#OrderID'
,
'isSorted'
=>
false
]
],
'cats'
=>
[
'cats'
=>
[
'Timestamp'
=>
'Время<br />Дата'
,
'Timestamp'
=>
'Время<br />Дата'
,
'Basket'
=>
'Состав корзины'
,
'Basket'
=>
'Состав корзины'
,
...
...
src/public/css/styles-feeds-stat.css
View file @
1f62ca14
...
@@ -281,6 +281,14 @@ input[type="checkbox"]
...
@@ -281,6 +281,14 @@ input[type="checkbox"]
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.table.table-striped
thead
tr
th
.period
b
:after
{
content
:
" / "
;
}
.table.table-striped
thead
tr
th
.period
b
:last-child:after
{
content
:
""
;
}
.b-basket-content
.b-basket-content
...
...
src/public/js/script-feeds-stat.js
View file @
1f62ca14
...
@@ -215,8 +215,8 @@ $(document).ready(function(){
...
@@ -215,8 +215,8 @@ $(document).ready(function(){
//campaignStatsData = res.campaign;
//campaignStatsData = res.campaign;
periodStatsData
=
res
;
periodStatsData
=
res
;
dataLineChartStat
=
periodStatsData
;
dataLineChartStat
=
periodStatsData
;
$
(
'.main-cat'
).
removeClass
(
'selected'
);
$
(
'.main-cat.date
'
).
addClass
(
'selected'
);
//$('.main-cat
').addClass('selected');
renderLineChart
();
renderLineChart
();
renderHourTable
();
renderHourTable
();
}
}
...
...
src/templates/app/user/cabinet-feed.phtml
View file @
1f62ca14
...
@@ -65,6 +65,7 @@ if (!$error) {
...
@@ -65,6 +65,7 @@ if (!$error) {
$current_report
=
$this
->
current_report
;
$current_report
=
$this
->
current_report
;
$report_conf
=
$this
->
report_conf
;
$report_conf
=
$this
->
report_conf
;
$report_title
=
$report_conf
[
'title'
];
$report_title
=
$report_conf
[
'title'
];
$report_main_cat
=
$report_conf
[
'main_cat'
];
$report_cats
=
$report_conf
[
'cats'
];
$report_cats
=
$report_conf
[
'cats'
];
$reports_list
=
$this
->
reports_list
;
$reports_list
=
$this
->
reports_list
;
$periods_list
=
$this
->
periods_list
;
$periods_list
=
$this
->
periods_list
;
...
@@ -176,13 +177,9 @@ if (!$error) {
...
@@ -176,13 +177,9 @@ if (!$error) {
<thead
class=
"metric sortable"
>
<thead
class=
"metric sortable"
>
<tr>
<tr>
<th
class=
"period"
data-id=
"period"
>
<th
class=
"period"
data-id=
"period"
>
<?php
if
(
$current_report
==
'common'
)
:
?>
<?php
foreach
(
$report_main_cat
as
$main_cat
)
:
?>
<b
class=
"main-cat date selected"
>
<?=
_t
(
'Дата'
)
?>
</b>
<b
class=
"main-cat selected
<?php
if
(
!
$main_cat
[
'isSorted'
])
:
?>
not-sorted
<?php
endif
;
?>
"
data-cat=
"
<?=
$main_cat
[
'name'
]
?>
"
>
<?=
_t
(
$main_cat
[
'title'
])
?>
</b>
<?php
/* ?>/ <b class="main-cat campaign"><?= _t('Кампания')?></b><?php */
?>
<?php
endforeach
;
?>
<?php
endif
;
?>
<?php
if
(
$current_report
==
'transaction'
)
:
?>
<b
class=
"main-cat date selected not-sorted"
>
<?=
_t
(
'#OrderID'
)
?>
</b>
<?php
endif
;
?>
</th>
</th>
<?php
foreach
(
$report_cats
as
$name
=>
$title
)
:
?>
<?php
foreach
(
$report_cats
as
$name
=>
$title
)
:
?>
<th
class=
"
<?=
$name
?>
"
data-id=
"
<?=
$name
?>
"
>
<th
class=
"
<?=
$name
?>
"
data-id=
"
<?=
$name
?>
"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment