Skip to content

Commit

Permalink
2.63.2 Addition of lower prev / next buttons for all paged reports
Browse files Browse the repository at this point in the history
  • Loading branch information
@classaxe
classaxe committed Mar 5, 2024
1 parent 64340cf commit fe5ff5d
Show file tree
Hide file tree
Showing 39 changed files with 157 additions and 227 deletions.
22 changes: 8 additions & 14 deletions src/Controller/Web/Donations/Collection.php
View file
Expand Up @@ -16,7 +16,7 @@
*/
class Collection extends WebBase
{
const defaultlimit = -1;
const defaultlimit = 100;
const defaultSorting = 'id';
const defaultOrder = 'd';

Expand Down Expand Up @@ -49,36 +49,30 @@ public function index(
throw $this->createAccessDeniedException('You do not have access to this page');
}
$this->session->set('route', '');
$options = [
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $this->donationRepository->getCount()
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
$parameters = [
'args' => $args,
'columns' => $this->donationRepository->getColumns(),
'form' => $form->createView(),
'_locale' => $_locale,
'matched' => sprintf($this->i18n('of %s Donations'), $options['total']),
'matched' => sprintf($this->i18n('of %s Donations'), $args['total']),
'mode' => $this->i18n('Donations'),
'records' => $this->donationRepository->getRecords($args),
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'system' => $system
];
Expand Down
8 changes: 4 additions & 4 deletions src/Controller/Web/Donations/Donation.php
View file
Expand Up @@ -72,16 +72,16 @@ public function donation(
if (!$id && !$isAdmin) {
return $this->redirectToRoute('donors', ['system' => $system]);
}
$options = [
$args = [
'id' => $donation->getId(),
];
foreach (static::EDITABLE_FIELDS as $f) {
$options[$f] = $donation->{'get' . ucfirst($f)}();
$args[$f] = $donation->{'get' . ucfirst($f)}();
}
$options['date'] = $donation->getDate() ? $donation->getDate()->format('Y-m-d') : '';
$args['date'] = $donation->getDate() ? $donation->getDate()->format('Y-m-d') : '';
$form = $donationForm->buildForm(
$this->createFormBuilder(),
$options
$args
);
$form->handleRequest($request);
if ($isAdmin && $form->isSubmitted() && $form->isValid()) {
Expand Down
22 changes: 8 additions & 14 deletions src/Controller/Web/Donors/Collection.php
View file
Expand Up @@ -16,7 +16,7 @@
*/
class Collection extends WebBase
{
const defaultlimit = -1;
const defaultlimit = 100;
const defaultSorting = 'name';
const defaultOrder = 'a';

Expand Down Expand Up @@ -49,36 +49,30 @@ public function index(
throw $this->createAccessDeniedException('You do not have access to this page');
}
$this->session->set('route', '');
$options = [
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $this->donorRepository->getCount()
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
$parameters = [
'args' => $args,
'columns' => $this->donorRepository->getColumns(),
'form' => $form->createView(),
'_locale' => $_locale,
'matched' => sprintf($this->i18n('of %s Donor Profiles'), $options['total']),
'matched' => sprintf($this->i18n('of %s Donor Profiles'), $args['total']),
'mode' => $this->i18n('Donor Profiles'),
'records' => $this->donorRepository->getRecords($args),
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'stats' => $this->donorRepository->getStats(),
'system' => $system
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/Web/Listeners/Collection.php
View file
Expand Up @@ -123,9 +123,9 @@ public function controller(
'_locale' => $_locale,
'mode' => 'Listeners and Locations',
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : $this->listenerRepository::defaultLimit,
'page' => isset($args['page']) ? $args['page'] : $this->listenerRepository::defaultPage,
'total' => $total
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $total
],
'system' => $system,
'tabs' => $tabs,
Expand Down
23 changes: 8 additions & 15 deletions src/Controller/Web/Listeners/ListenerLogs.php
View file
Expand Up @@ -74,24 +74,17 @@ private function displayLogs($_locale, $system, $id, $request, $form, $isRemote)
return $this->redirectToRoute('listeners', ['system' => $system]);
}

$isAdmin = $this->parameters['isAdmin'];
$options = [
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $isRemote ? $listener->getCountRemoteLogs() : $listener->getCountLogs()
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
if ($isRemote) {
$args['operatorId'] = $id;
Expand All @@ -117,16 +110,16 @@ private function displayLogs($_locale, $system, $id, $request, $form, $isRemote)
'form' => $form->createView(),
'_locale' => $_locale,
'isMultiOperator' => ($listener->getMultiOperator() === 'Y'),
'matched' => sprintf($matchedSuffix, $options['total']),
'matched' => sprintf($matchedSuffix, $args['total']),
'mode' => sprintf($mode, $listener->getFormattedNameAndLocation()),
'logs' => $logs,
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'system' => $system,
'tabs' => $this->listenerRepository->getTabs($listener, $isAdmin),
'tabs' => $this->listenerRepository->getTabs($listener, $this->parameters['isAdmin']),
'typeRepository' => $this->typeRepository
];
return $this->render($template, $this->getMergedParameters($parameters));
Expand Down
20 changes: 7 additions & 13 deletions src/Controller/Web/Listeners/ListenerLogsessions.php
View file
Expand Up @@ -76,23 +76,17 @@ private function displayLogSessions($_locale, $system, $id, $request, $form, $is
}

$isAdmin = $this->parameters['isAdmin'];
$options = [
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $isRemote ? $listener->getCountRemoteLogsessions() : $listener->getCountLogsessions()
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
if ($isRemote) {
$args['operatorId'] = $id;
Expand All @@ -117,13 +111,13 @@ private function displayLogSessions($_locale, $system, $id, $request, $form, $is
'form' => $form->createView(),
'_locale' => $_locale,
'isMultiOperator' => ($listener->getMultiOperator() === 'Y'),
'matched' => sprintf($matchedSuffix, $options['total']),
'matched' => sprintf($matchedSuffix, $args['total']),
'mode' => sprintf($mode, $listener->getFormattedNameAndLocation()),
'logsessions' => $logSessions,
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'system' => $system,
'tabs' => $this->listenerRepository->getTabs($listener, $isAdmin),
Expand Down
26 changes: 8 additions & 18 deletions src/Controller/Web/Listeners/ListenerSignals.php
View file
Expand Up @@ -46,28 +46,18 @@ public function controller(
}

$isAdmin = $this->parameters['isAdmin'];
$totalSignals = $listener->getCountSignals();
$options = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $totalSignals
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $totalSignals,
'total' => $listener->getCountSignals(),
'listenerID' => $id
];
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args['total'] = $totalSignals;
$args['listenerID'] = $id;
$args = $form->getData() + $args;
}
$columns = $this->listenerRepository->getColumns('signals');
$signals = $this->signalRepository->getSignals($args, $columns);
Expand All @@ -77,12 +67,12 @@ public function controller(
'columns' => $columns,
'form' => $form->createView(),
'_locale' => $_locale,
'matched' => 'of '.$options['total'].' signals',
'matched' => 'of ' . $args['total'] . ' signals',
'mode' => 'Signals | ' . $listener->getFormattedNameAndLocation(),
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'signals' => $signals,
'system' => $system,
Expand Down
18 changes: 6 additions & 12 deletions src/Controller/Web/Logsessions/Collection.php
View file
Expand Up @@ -43,7 +43,7 @@ public function Collection(
Form $form
)
{
$options = [
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
Expand All @@ -52,16 +52,10 @@ public function Collection(
'location' => '',
'type' => [],
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
$columns = $this->logsessionRepository->getColumns();
$logSessions = $this->logsessionRepository->getLogsessions($args, $columns);
Expand All @@ -75,9 +69,9 @@ public function Collection(
'mode' => 'Log Sessions',
'logsessions' => $logSessions,
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $total
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $total
],
'system' => $system,
'tabs' => [],
Expand Down
26 changes: 9 additions & 17 deletions src/Controller/Web/Logsessions/LogsessionLogs.php
View file
Expand Up @@ -44,27 +44,19 @@ public function controller(
if (!(int) $id || !$logsession = $this->logsessionRepository->find($id)) {
return $this->redirectToRoute('logsession', ['system' => $system]);
}

$isAdmin = $this->parameters['isAdmin'];
$options = [
$args = [
'logsessionID' => $id,
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting,
'total' => $logsession->getLogs()
];
$form = $form->buildForm($this->createFormBuilder(), $options);
$form = $form->buildForm($this->createFormBuilder(), $args);
$form->handleRequest($request);
$args = [
'limit' => static::defaultlimit,
'order' => static::defaultOrder,
'page' => 0,
'sort' => static::defaultSorting
];
if ($form->isSubmitted() && $form->isValid()) {
$args = $form->getData();
$args = $form->getData() + $args;
}
$args['logSessionId'] = $id;
$columns = $this->listenerRepository->getColumns('logs');
$logs = $this->logRepository->getLogs($args, $columns);

Expand All @@ -74,16 +66,16 @@ public function controller(
'columns' => $columns,
'form' => $form->createView(),
'_locale' => $_locale,
'matched' => 'of '.$options['total']. ' log records.',
'matched' => 'of ' . $args['total'] . ' log records.',
'mode' => "Logs | Log Session $id",
'logs' => $logs,
'results' => [
'limit' => isset($args['limit']) ? $args['limit'] : static::defaultlimit,
'page' => isset($args['page']) ? $args['page'] : 0,
'total' => $options['total']
'limit' => $args['limit'],
'page' => $args['page'],
'total' => $args['total']
],
'system' => $system,
'tabs' => $this->logsessionRepository->getTabs($logsession, $isAdmin),
'tabs' => $this->logsessionRepository->getTabs($logsession, $this->parameters['isAdmin']),
'typeRepository' => $this->typeRepository
];
return $this->render('logsession/logs.html.twig', $this->getMergedParameters($parameters));
Expand Down

0 comments on commit fe5ff5d

Please sign in to comment.