Queue refactoring

src/Queue/Components/IJobControlFactory.php

@@ -18,8 +18,9 @@ interface IJobControlFactory
 {
 
 	/**
+	 * @param integer $id
 	 * @return \Venne\Queue\Components\JobControl
 	 */
-	public function create();
+	public function create($id);
 
 }

src/Queue/Components/JobControl.php

@@ -24,6 +24,9 @@
 class JobControl extends \Venne\System\UI\Control
 {
 
+	/** @var integer */
+	private $id;
+
 	/** @var \Nette\Security\User */
 	private $user;
 
@@ -33,24 +36,29 @@ class JobControl extends \Venne\System\UI\Control
 	/** @var \Venne\DataTransfer\DataTransferManager */
 	private $dataTransferManager;
 
+	/**
+	 * @param integer $id
+	 * @param \Doctrine\ORM\EntityManager $entityManager
+	 * @param \Nette\Security\User $user
+	 * @param \Venne\DataTransfer\DataTransferManager $dataTransferManager
+	 */
 	public function __construct(
+		$id,
 		EntityManager $entityManager,
 		User $user,
 		DataTransferManager $dataTransferManager
 	) {
 		parent::__construct();
 
+		$this->id = $id;
 		$this->jobRepository = $entityManager->getRepository(Job::class);
 		$this->user = $user;
 		$this->dataTransferManager = $dataTransferManager;
 	}
 
-	/**
-	 * @param int $id
-	 */
-	public function handleRemove($id)
+	public function handleRemove()
 	{
-		if (($entity = $this->jobRepository->find($id)) === null) {
+		if (($entity = $this->jobRepository->find($this->id)) === null) {
 			throw new BadRequestException;
 		}
 
@@ -65,11 +73,11 @@ public function handleRemove($id)
 		}
 	}
 
-	public function render($id)
+	public function render()
 	{
 		$this->template->job = $this->dataTransferManager
-			->createQuery(JobDto::class, function () use ($id) {
-				return $this->jobRepository->find($id);
+			->createQuery(JobDto::class, function () {
+				return $this->jobRepository->find($this->id);
 			})
 			->enableCache()
 			->fetch();

src/Queue/Components/JobsControl.latte

@@ -1,18 +1,18 @@
 {var $count = count($jobs)}
 
 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-	<i class="fa fa-tasks"></i> <span class="badge">{$count}</span>
+	<i class="fa fa-tasks"></i> <span class="badge">{$jobCount}</span>
 </a>
 
 <div id="jobs-{!$control->name}" class="dropdown-menu list-group notification-container">
 	<div role="presentation" class="dropdown-header">
 		<i class="fa fa-tasks"></i>
-		{_'%count% jobs', $count}
+		{_'%count% jobs', $jobCount}
 	</div>
 
-	<div class="list-group notification-list-group">
+	<div class="list-group notification-list-group" n:snippet="content" data-ajax-append>
 		<div n:foreach="$jobs->toArray() as $job" class="list-group-item">
-			{control job $job->id}
+			{control job-$job->id}
 		</div>
 	</div>
 
@@ -21,6 +21,7 @@
 	</a>
 </div>
 
+{snippet js}
 <script type="text/javascript">
 	$(function(){
 		$('#jobs-{!$control->name}').on('click', function(e) {
@@ -31,5 +32,19 @@
 				$(this).remove();
 			});
 		});
+
+		var $list = $('#jobs-{!$control->name} .notification-list-group');
+		$list.on('scroll.notifications', function () {
+			var $this = $(this);
+
+			if ($this.scrollTop() + $this.height() >= $this[0].scrollHeight - 20) {
+				$list.off('scroll.notifications');
+				$.nette.ajax({
+					url: {link load! offset => $offset},
+					off: ['spinner', 'unique']
+				});
+			}
+		});
 	});
 </script>
+{/snippet}

src/Queue/Components/JobsControl.php

@@ -12,6 +12,7 @@
 namespace Venne\Queue\Components;
 
 use Doctrine\ORM\EntityManager;
+use Nette\Application\UI\Multiplier;
 use Nette\Security\User;
 use Venne\DataTransfer\DataTransferManager;
 use Venne\Queue\JobDto;
@@ -23,6 +24,9 @@
 class JobsControl extends \Venne\System\UI\Control
 {
 
+	/** @var integer */
+	private $offset = 0;
+
 	/** @var \Nette\Security\User */
 	private $user;
 
@@ -50,11 +54,23 @@ public function __construct(
 	}
 
 	/**
-	 * @return \Venne\Queue\Components\JobControl
+	 * @param integer $offset
+	 */
+	public function handleLoad($offset)
+	{
+		$this->offset = (integer) $offset;
+		$this->redrawControl('content');
+		$this->redrawControl('js');
+	}
+
+	/**
+	 * @return \Nette\Application\UI\Multiplier
 	 */
 	protected function createComponentJob()
 	{
-		return $this->jobControlFactory->create();
+		return new Multiplier(function ($id) {
+			return $this->jobControlFactory->create($id);
+		});
 	}
 
 	public function render()
@@ -64,10 +80,18 @@ public function render()
 				return $this->jobRepository->createQueryBuilder('a')
 					->andWhere('a.user = :user')->setParameter('user', $this->user->getIdentity()->getId())
 					->orderBy('a.date', 'ASC')
+					->setMaxResults(5)
+					->setFirstResult($this->offset)
 					->getQuery()->getResult();
 			})
-			->enableCache()
+			->enableCache($this->offset)
 			->fetchAll();
+		$this->template->jobCount = $this->jobRepository->createQueryBuilder('a')
+			->select('COUNT(a.id)')
+			->andWhere('a.user = :user')->setParameter('user', $this->user->getIdentity()->getId())
+			->getQuery()->getSingleScalarResult();
+		$this->template->offset = $this->offset + 5;
+
 		$this->template->render();
 	}
 

src/Queue/DI/QueueExtension.php

@@ -79,10 +79,6 @@ public function loadConfiguration()
 			->setInject(true)
 			->addTag(SystemExtension::TAG_TRAY_COMPONENT)
 			->addTag(WidgetsExtension::TAG_WIDGET, 'jobs');
-
-		$container->addDefinition($this->prefix('jobControlFactory'))
-			->setImplement('Venne\Queue\Components\IJobControlFactory')
-			->setInject(true);
 	}
 
 	/**

src/Queue/DI/services.neon

@@ -2,3 +2,9 @@ services:
 
 	- Venne\Queue\AdminModule\JobFormFactory (@system.admin.ajaxFormFactory)
 	- Venne\Queue\AdminModule\JobFormService
+
+	Venne\Queue\Components\NotificationControl:
+		arguments: [%id%]
+		implement: Venne\Queue\Components\IJobControlFactory
+		parameters: [id]
+		inject: true