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
d9ae0377
Commit
d9ae0377
authored
Jan 17, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Передача параметра group=Min для суточного запроса, сортирвка в табл.
parent
869f80ec
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+3
-1
Cabinet.php
src/src/App/Action/User/Cabinet.php
+1
-1
Statistics.php
src/src/App/Model/Statistics.php
+13
-2
No files found.
src/public/js/script-feeds-stat-table.js
View file @
d9ae0377
...
...
@@ -89,7 +89,9 @@ $(document).ready(function(){
}
else
{
for
(
var
i
=
0
;
i
<
dataPeriod
.
length
;
i
++
)
{
for
(
var
i
=
dataPeriod
.
length
-
1
;
i
>=
0
;
i
--
)
{
//for(var i = 0; i < dataPeriod.length; i++) {
var
date
=
dataPeriod
[
i
],
...
...
src/src/App/Action/User/Cabinet.php
View file @
d9ae0377
...
...
@@ -119,7 +119,7 @@ class Cabinet extends Common
'Clicks'
=>
'Клики'
,
'Orders'
=>
'Заказы'
,
'OrderSum'
=>
'Сумма по заказам'
,
'AdMoney'
=>
'Стоимость
заказа
'
'AdMoney'
=>
'Стоимость
рекламы
'
];
/*
...
...
src/src/App/Model/Statistics.php
View file @
d9ae0377
...
...
@@ -22,10 +22,21 @@ class Statistics
// Данные по метрикам
public
function
getStatData
(
$report_type
,
$feed_id_list
,
$dates
)
{
$timeDiff
=
(
strtotime
(
$dates
[
1
])
-
strtotime
(
$dates
[
0
]))
/
(
24
*
60
*
60
);
// Определяем разрешение выборки (группировку) по времени:
if
(
$timeDiff
==
0
)
// Одни сутки
{
$dates_group
=
"Min"
;
}
else
// Несколько суток
{
$dates_group
=
"Day"
;
}
$type
=
'feed_stat'
;
$fields
=
[
'Views'
,
'Clicks'
,
'Orders'
,
'OrderSum'
];
$dates
=
array
(
'group'
=>
'Day'
,
'group'
=>
$dates_group
,
//'start' => '2019-01-01',
//'end' => '2019-01-16',
'start'
=>
$dates
[
0
],
...
...
@@ -70,7 +81,7 @@ class Statistics
$data_stats
[
$cat
][]
=
$value
/
$min_koef
;
}
// Временно:
$data_stats
[
'AdMoney'
][]
=
224
0
+
$data
[
'Orders'
];
$data_stats
[
'AdMoney'
][]
=
224
*
$data
[
'Orders'
];
}
// Логика формирования данных по временному интервалу:
...
...
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