Display next run datetime.

dereuromark · Oct 26, 2024 · 9e1abd4 · 9e1abd4
1 parent 837f5b7
commit 9e1abd4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/Controller/Admin/SchedulerRowsController.php b/src/Controller/Admin/SchedulerRowsController.php
@@ -80,7 +80,7 @@ public function edit($id = null) {
 			if ($this->SchedulerRows->save($row)) {
 				$this->Flash->success(__('The row has been saved.'));
 
-				return $this->redirect(['action' => 'index']);
+				return $this->redirect(['action' => 'view', $id]);
 			}
 			$this->Flash->error(__('The row could not be saved. Please, try again.'));
 		}

diff --git a/templates/Admin/QueueScheduler/index.php b/templates/Admin/QueueScheduler/index.php
@@ -64,13 +64,13 @@
 				</td>
 				<td>
 					<?php if ($schedulerRow->last_run) { ?>
-						<div><small>Last run: <?php echo $this->Time->nice($schedulerRow->last_run); ?></small></div>
+						<div><small><?= __('Last Run') ?>: <?php echo $this->Time->nice($schedulerRow->last_run); ?></small></div>
 					<?php } ?>
 					<?php
 						$nextRun = $schedulerRow->next_run ?: $schedulerRow->calculateNextRun();
 					?>
 					<?php if ($nextRun) { ?>
-						<div><small>Next run: <?php echo $this->Time->nice($nextRun); ?></small></div>
+						<div><small><?= __('Next Run') ?>: <?php echo $this->Time->nice($nextRun); ?></small></div>
 					<?php } ?>
 				</td>
 				<td class="actions">

diff --git a/templates/Admin/SchedulerRows/index.php b/templates/Admin/SchedulerRows/index.php
@@ -47,13 +47,17 @@
 						<?php } ?>
 
 						<?php if ($row->last_run) { ?>
-						<div><small>Last run: <?php echo $this->Time->nice($row->last_run); ?></small></div>
+						<div><small><?= __('Last Run') ?>: <?php echo $this->Time->nice($row->last_run); ?></small></div>
 						<?php } ?>
 						<?php
 							$nextRun = $row->next_run ?: $row->calculateNextRun();
 						?>
 						<?php if ($nextRun) { ?>
-							<div><small>Next run: <?php echo $this->Time->nice($nextRun); ?></small></div>
+							<?php if (!$row->enabled) { ?>
+								<div class="canceled"><small><del><?= __('Next Run') ?>: <?php echo $this->Time->nice($nextRun); ?></del></small></div>
+							<?php } else { ?>
+								<div><small><?= __('Next Run') ?>: <?php echo $this->Time->nice($nextRun); ?></small></div>
+							<?php } ?>
 						<?php } ?>
 					</td>
 					<td><?= $this->Time->nice($row->created) ?></td>

diff --git a/templates/Admin/SchedulerRows/view.php b/templates/Admin/SchedulerRows/view.php
@@ -18,13 +18,17 @@
 			<h2><?= h($row->name) ?></h2>
 
 			<table class="table table-striped">
+				<tr>
+					<th><?= __('Type') ?></th>
+					<td><?= $row::types($row->type) ?></td>
+				</tr>
 				<tr>
 					<th><?= __('Frequency') ?></th>
 					<td><?= h($row->frequency) ?></td>
 				</tr>
 				<tr>
-					<th><?= __('Type') ?></th>
-					<td><?= $row::types($row->type) ?></td>
+					<th><?= __('Enabled') ?></th>
+					<td><?= $this->element('QueueScheduler.yes_no', ['value' => $row->enabled]) ?> <?= $row->enabled ? __('Yes') : __('No'); ?></td>
 				</tr>
 				<tr>
 					<th><?= __('Last Run') ?></th>
@@ -37,7 +41,11 @@
 					<tr>
 						<th><?= __('Next Run') ?></th>
 						<td>
-							<?= $this->Time->nice($nextRun) ?>
+							<?php if (!$row->enabled) { ?>
+								<div class="canceled"><del><?php echo $this->Time->nice($nextRun); ?></del></div>
+							<?php } else { ?>
+								<div><?php echo $this->Time->nice($nextRun); ?></div>
+							<?php } ?>
 							<div>
 							(<?php echo $this->Time->timeAgoInWords($nextRun); ?>)
 							</div>