-
-
Notifications
You must be signed in to change notification settings - Fork 453
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature: Added document visits to page details #519
Conversation
Going back to the original request:
These two pieces of info could be gotten solely from owa_requests no? It has the session_id, document_id (for joining) and the timestamp... |
Thats what i done first i copied the code from getLatestVisits and modified the joins accordingly |
getLatestVisits uses owa_session no? I can take a closer look in the morning. |
Looks like my REST work blew up with PR. sorry! i should have merged this first. |
# Conflicts: # modules/base/module.php # modules/base/reportDashboard.php # modules/base/reportVisitor.php # modules/base/reportVisitors.php # modules/base/templates/report_document.tpl
Don´t worry not a big thing |
@@ -79,13 +79,13 @@ | |||
prshre.load(prurl); | |||
|
|||
var vrurl = '<?php echo $this->makeApiLink(['do' => 'getResultSet', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something is not right here. are you sure you have a full update from master? This could be the reason for the bug in #556
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my addition, corrected it, but that's not the right place. I made a complete merge
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is still showing the old style getResultSet call. see: https://github.com/Open-Web-Analytics/Open-Web-Analytics/blob/master/modules/base/templates/report_document.tpl
Ok i meant to comment about your merge conflict in this window ;) |
# Conflicts: # modules/base/module.php
Looks like you just need to update the schema version. |
Sorry was a little bit busy the last days |
I just fixed it ;-) |
no worries!! |
<span class="inline_h3"><a href="<?php echo $this->makeLink(array('do' => 'base.overlayLauncher', 'document_id' =>$document->get('id'), 'overlay_params' => base64_encode($this->makeParamString(array('action' => 'loadHeatmap', 'api_url' => owa_coreAPI::getSetting('base', 'rest_api_url'), 'apiKey' => $this->getApiKey(), 'document_id' => $document->get('id') ), true, 'json'))));?>" target="_blank">Heatmap Overlay</a></span> (Firefox 3.5+ required) | ||
</P> | ||
<p> | ||
<span class="inline_h3"><a href="<?php echo $this->makeLink(array('do' => 'base.overlayLauncher', 'document_id' =>$document->get('id'), 'overlay_params' => base64_encode($this->makeParamString(array('action' => 'loadHeatmap', 'api_url' => owa_coreAPI::getSetting('base', 'api_url'), 'document_id' => $document->get('id') ), true, 'json'))));?>" target="_blank">Heatmap Overlay</a></span> (Firefox 3.5+ required) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like you are reverting to the old style api_url here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
uh yeah wrong merged...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check again ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good now. merging.
See: #335