Skip to content

Commit

Permalink
Merge pull request #9 from TheDMSGroup/ENG-557-contact-dl
Browse files Browse the repository at this point in the history 
[ENG-557] Improve contact export.
  • Loading branch information
@heathdutton
heathdutton authored Oct 11, 2018
2 parents 6291c21 + 5087327 commit 8b2e47e
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 324 deletions.
297 changes: 20 additions & 277 deletions Controller/CampaignControllerOverride.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
class CampaignControllerOverride extends CampaignController
{
/**
/*
* Alternative of 'MauticCampaignBundle:Campaign:contacts'
* Gets contacts as a list.
*
Expand All @@ -27,280 +27,23 @@ class CampaignControllerOverride extends CampaignController
*
* @return \Symfony\Component\HttpFoundation\JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function contactsAction($objectId, $page = 1)
{
return $this->delegateView(
[
'viewParameters' => [
'page' => $page,
'objectId' => $objectId,
],
'passthroughVars' => [
'route' => false,
'mauticContent' => null,
],
'contentTemplate' => 'MauticCampaignWatchBundle:Campaign:leads.html.php',
]
);
// @todo - see if we can avoid re-inventing the stone wheel and do the following via ajax purely?
// //set some permissions
// $permissions = $this->get('mautic.security')->isGranted(
// [
// 'lead:leads:viewown',
// 'lead:leads:viewother',
// 'lead:leads:create',
// 'lead:leads:editown',
// 'lead:leads:editother',
// 'lead:leads:deleteown',
// 'lead:leads:deleteother',
// 'lead:imports:view',
// 'lead:imports:create',
// ],
// 'RETURN_ARRAY'
// );
//
// if (!$permissions['lead:leads:viewown'] && !$permissions['lead:leads:viewother']) {
// return $this->accessDenied();
// }
//
// if ($this->request->getMethod() == 'POST') {
// $this->setListFilters();
// }
//
// /** @var \Mautic\LeadBundle\Model\LeadModel $model */
// $model = $this->getModel('lead');
// $session = $this->get('session');
// //set limits
// $limit = $session->get('mautic.lead.limit', $this->get('mautic.helper.core_parameters')->getParameter('default_pagelimit'));
// $start = ($page === 1) ? 0 : (($page - 1) * $limit);
// if ($start < 0) {
// $start = 0;
// }
//
// //do some default filtering
// $orderBy = $session->get('mautic.lead.orderby', 'l.last_active');
// $orderByDir = $session->get('mautic.lead.orderbydir', 'DESC');
//
// $filter = ['force' => [
// // @todo - Add campaign specificity.
// ]];
// $translator = $this->get('translator');
// $anonymous = $translator->trans('mautic.lead.lead.searchcommand.isanonymous');
// $mine = $translator->trans('mautic.core.searchcommand.ismine');
// $indexMode = $this->request->get('view', $session->get('mautic.lead.indexmode', 'list'));
//
// $session->set('mautic.lead.indexmode', $indexMode);
//
// $filter['force'] .= " !$anonymous";
//
// if (!$permissions['lead:leads:viewother']) {
// $filter['force'] .= " $mine";
// }
//
// $results = $model->getEntities([
// 'start' => $start,
// 'limit' => $limit,
// 'filter' => $filter,
// 'orderBy' => $orderBy,
// 'orderByDir' => $orderByDir,
// 'withTotalCount' => true,
// ]);
//
// $count = $results['count'];
// unset($results['count']);
//
// $leads = $results['results'];
// unset($results);
//
// if ($count && $count < ($start + 1)) {
// //the number of entities are now less then the current page so redirect to the last page
// if ($count === 1) {
// $lastPage = 1;
// } else {
// $lastPage = (ceil($count / $limit)) ?: 1;
// }
// $session->set('mautic.lead.page', $lastPage);
// $returnUrl = $this->generateUrl('mautic_contact_index', ['page' => $lastPage]);
//
// return $this->postActionRedirect(
// [
// 'returnUrl' => $returnUrl,
// 'viewParameters' => ['page' => $lastPage],
// 'contentTemplate' => 'MauticLeadBundle:Lead:index',
// 'passthroughVars' => [
// 'activeLink' => '#mautic_contact_index',
// 'mauticContent' => 'lead',
// ],
// ]
// );
// }
//
// //set what page currently on so that we can return here after form submission/cancellation
// $session->set('mautic.lead.page', $page);
//
// $tmpl = $this->request->isXmlHttpRequest() ? $this->request->get('tmpl', 'index') : 'index';
//
// $listArgs = [];
// if (!$this->get('mautic.security')->isGranted('lead:lists:viewother')) {
// $listArgs['filter']['force'] = " $mine";
// }
//
// // Get the max ID of the latest lead added
// $maxLeadId = $model->getRepository()->getMaxLeadId();
//
// return $this->delegateView(
// [
// 'viewParameters' => [
// 'searchValue' => $search,
// 'items' => $leads,
// 'page' => $page,
// 'totalItems' => $count,
// 'limit' => $limit,
// 'permissions' => $permissions,
// 'tmpl' => $tmpl,
// 'indexMode' => $indexMode,
// 'lists' => [],
// 'currentList' => null,
// 'security' => $this->get('mautic.security'),
// 'inSingleList' => false,
// 'noContactList' => [],
// 'maxLeadId' => $maxLeadId,
// 'anonymousShowing' => false,
// ],
// 'contentTemplate' => "MauticLeadBundle:Lead:{$indexMode}.html.php",
// 'passthroughVars' => [
// 'activeLink' => '#mautic_contact_index',
// 'mauticContent' => 'lead',
// 'route' => $this->generateUrl('mautic_contact_index', ['page' => $page]),
// ],
// ]
// );
}

/**
* @param array $args
* @param $action
*
* @return array
*/
protected function getViewArguments(array $args, $action)
{
/** @var Campaign $entity */
$entity = $args['entity'];
$objectId = $args['objectId'];
// Init the date range filter form
$this->setCoreParametersHelper($this->container->get('mautic.config'));
$tabDataToggleDefault = $this->coreParametersHelper->getParameter('event_log_date_toggle');
$dateRangeValues = $this->request->get('daterange', []);
$tabDataMode = empty($dateRangeValues) && $tabDataToggleDefault ?
[
'toDate' => ['class' => 'btn-success', 'checked' => 'checked="checked"'],
'byDate' => ['class' => '', 'checked' => ''],
] :
[
'toDate' => ['class' => '', 'checked' => ''],
'byDate' => ['class' => 'btn-success', 'checked' => 'checked="checked"'],
];
$action = $this->generateUrl(
'mautic_campaign_action',
['objectAction' => 'view', 'objectId' => $objectId]
);
$dateRangeForm = $this->get('form.factory')->create(
'daterange',
$dateRangeValues,
['action' => $action]
);

// prepare date values to pass in to event query
$dateFrom = (empty($dateRangeValues['date_from'])) ?
new \DateTime('-30 days midnight')
:
new \DateTime($dateRangeValues['date_from']);

$dateTo = (empty($dateRangeValues['date_to']))
?
new \DateTime('midnight')
:
new \DateTime($dateRangeValues['date_to']);
$dateRangeValues['date_from'] = $dateFrom;
$dateRangeValues['date_to'] = $dateTo;

/** @var LeadEventLogRepository $eventLogRepo */
$eventLogRepo = $this->getDoctrine()->getManager()->getRepository(
'MauticCampaignBundle:LeadEventLog'
);
$events = $this->getCampaignModel()->getEventRepository()->getCampaignEvents(
$entity->getId()
);
$leadCount = $this->getCampaignModel()->getRepository()->getCampaignLeadCount(
$entity->getId(),
null,
[],
$dateRangeValues
);
$campaignLogCounts = $eventLogRepo->getCampaignLogCounts(
$entity->getId(),
false,
false,
$dateRangeValues
);
$sortedEvents = [
'decision' => [],
'action' => [],
'condition' => [],
];

foreach ($events as $event) {
$event['logCount'] =
$event['percent'] =
$event['yesPercent'] =
$event['noPercent'] = 0;
$event['leadCount'] = $leadCount;

if (isset($campaignLogCounts[$event['id']])) {
$event['logCount'] = array_sum($campaignLogCounts[$event['id']]);

if ($leadCount) {
$event['percent'] = round(($event['logCount'] / $leadCount) * 100, 1);
$event['yesPercent'] = round(($campaignLogCounts[$event['id']][1] / $leadCount) * 100, 1);
$event['noPercent'] = round(($campaignLogCounts[$event['id']][0] / $leadCount) * 100, 1);
}
}

$sortedEvents[$event['eventType']][] = $event;
}

$session = $this->get('session');

$campaignSources = $this->getCampaignModel()->getSourceLists();

$this->prepareCampaignSourcesForEdit($objectId, $campaignSources, true);
$this->prepareCampaignEventsForEdit($entity, $objectId, true);

$args['viewParameters'] = array_merge(
$args['viewParameters'],
[
'campaign' => $entity,
'events' => $sortedEvents,
'eventSettings' => $this->getCampaignModel()->getEvents(),
'tags' => $this->getCampaignModel()->getTagList(),
'sources' => $this->getCampaignModel()->getLeadSources($entity),
'dateRangeForm' => $dateRangeForm->createView(),
'campaignSources' => $this->campaignSources,
'campaignEvents' => $events,
'campaignLeads' => $this->forward(
'MauticCampaignBundle:Campaign:contacts',
[
'objectId' => $entity->getId(),
'page' => $this->get('session')->get('mautic.campaign.contact.page', 1),
'ignoreAjax' => true,
]
)->getContent(),
'tabDataMode' => $tabDataMode,
]
);
// $args['contentTemplate'] = 'MauticCampaignWatchBundle:Campaign:details.html.php';

return $args;
}
// public function contactsAction($objectId, $page = 1, $count = NULL, \DateTime $dateFrom = null, \DateTime $dateTo = null)
// {
// return $this->delegateView(
// [
// 'viewParameters' => [
// 'page' => $page,
// 'objectId' => $objectId,
// 'count' => $count,
// 'dateFrom' => $dateFrom,
// 'dateTo' => $dateTo,
// ],
// 'passthroughVars' => [
// 'route' => false,
// 'mauticContent' => null,
// ],
// 'contentTemplate' => 'MauticCampaignWatchBundle:Campaign:leads.html.php',
// ]
// );
// }
}
4 changes: 1 addition & 3 deletions EventListener/CustomContentSubscriber.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ public function getContentInjection(CustomContentEvent $event)
case 'MauticCampaignBundle:Campaign:details.html.php':
switch ($event->getContext()) {
case 'tabs':
// Add tab.
case 'tab.content':
// Add tab content.
$event->addTemplate('MauticCampaignWatchBundle:Campaign:export.html.php');
}
break;
}
Expand Down
36 changes: 36 additions & 0 deletions Views/Campaign/export.html.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

/*
* @copyright 2018 Mautic Contributors. All rights reserved
* @author Digital Media Solutions, LLC
*
* @link http://mautic.org
*
* @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
*/
?>
<script type="text/javascript">
mQuery('a[href="#leads-container"]:first')
.parent()
.after('<button id="lead_export_btn" class="btn btn-success pull-right"><i class="fa fa-download"></i> Export Contacts</button>')
.parent()
.find('#lead_export_btn')
.click(function () {
console.log('dnloadin');
dateFrom = mQuery('#daterange_date_from:first').val();
dateTo = mQuery('#daterange_date_to:first').val();
var frame = document.createElement('iframe'),
campaignId = window.location.pathname.split('/').pop(),
src = mauticBaseUrl + 's/campaignwatch/export/' + campaignId + '/' + dateFrom + '/' + dateTo,
button = mQuery(this);
frame.setAttribute('src', src);
frame.setAttribute('style', 'display: none');
document.body.appendChild(frame);
button.attr('disabled', 'disabled');
setTimeout(function () {
button.attr('disabled', false);
button.find('i').removeClass('fa-spin').removeClass('fa-spinner').addClass('fa-download');
}, 30000);
});
Mautic.loadStylesheet(mauticBaseUrl + 'plugins/MauticCampaignWatchBundle/Assets/css/leads.css');
</script>
Loading

0 comments on commit 8b2e47e

Please sign in to comment.