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
030857ab
Commit
030857ab
authored
Jan 21, 2019
by
Александр Чаплыгин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Правки по оформлению табл.страниц
parent
3eeeb1b1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
9 deletions
+17
-9
styles-feeds-stat.css
src/public/css/styles-feeds-stat.css
+5
-1
script-feeds-stat-table.js
src/public/js/script-feeds-stat-table.js
+10
-4
Statistics.php
src/src/App/Model/Statistics.php
+1
-3
counter.phtml
src/templates/app/index/counter.phtml
+1
-1
No files found.
src/public/css/styles-feeds-stat.css
View file @
030857ab
...
...
@@ -163,9 +163,13 @@ input[type="checkbox"]
margin-top
:
30px
;
}
.table.table-striped.admin
{
font-family
:
monospace
;
}
.table.table-striped.admin
thead
.metric.sortable
tr
b
{
cursor
:
pointer
;
}
...
...
src/public/js/script-feeds-stat-table.js
View file @
030857ab
...
...
@@ -11,11 +11,17 @@ $(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'
);
return
format
(
value
);
if
(
isCurrencyValue
)
{
return
format
(
value
)
+
' грн.'
;
}
else
{
return
format
(
value
);
}
}
function
RenderInterval
(
dataLineChartStat
)
...
...
@@ -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
=
{};
...
...
src/src/App/Model/Statistics.php
View file @
030857ab
...
...
@@ -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
],
);
...
...
src/templates/app/index/counter.phtml
View file @
030857ab
<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>
...
...
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