From 98c1a6bd4fc12f21773897108b28b46068017fc3 Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Mon, 24 Oct 2016 18:53:10 +0200
Subject: [PATCH 1/8] Datepicker orientation changed to bottom

---
 www/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/js/main.js b/www/js/main.js
index 55ccd4c..d5b17b1 100755
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -2,6 +2,6 @@ $(document).ready(function(){
     $.nette.init();
 
     $('.datepicker').datepicker({
-        orientation: 'left top'
+        orientation: 'left bottom'
     });
 });
\ No newline at end of file

From 0d8d66a078e87727a3151843bae7d7082a74790b Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Mon, 24 Oct 2016 19:49:38 +0200
Subject: [PATCH 2/8] iCheck for checkboxes

---
 app/templates/@layout.latte | 2 ++
 www/js/main.js              | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/templates/@layout.latte b/app/templates/@layout.latte
index 17d3257..68e1afc 100644
--- a/app/templates/@layout.latte
+++ b/app/templates/@layout.latte
@@ -10,6 +10,7 @@
 
     <link href="{$basePath}/bower-plugins/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
     <link href="{$basePath}/bower-plugins/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css" rel="stylesheet">
+    <link href="{$basePath}/bower-plugins/iCheck/skins/flat/blue.css" rel="stylesheet">
     {block head}{/block}
 </head>
 
@@ -53,6 +54,7 @@
         <script src="{$basePath}/bower-plugins/jquery/dist/jquery.min.js"></script>
         <script src="{$basePath}/bower-plugins/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="{$basePath}/bower-plugins/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
+        <script src="{$basePath}/bower-plugins/iCheck/icheck.js"></script>
         <script src="{$basePath}/js/nette.ajax.js"></script>
         <script src="{$basePath}/js/live-form-validation.js"></script>
         <script src="{$basePath}/js/nette.ajax.confirm.js"></script>
diff --git a/www/js/main.js b/www/js/main.js
index d5b17b1..c68b5fb 100755
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -4,4 +4,9 @@ $(document).ready(function(){
     $('.datepicker').datepicker({
         orientation: 'left bottom'
     });
+
+    $('input').iCheck({
+        handle: 'checkbox',
+        checkboxClass: 'icheckbox_flat-blue'
+    });
 });
\ No newline at end of file

From b120761791b14980082473f27249dbf373144f3d Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Mon, 24 Oct 2016 21:03:06 +0200
Subject: [PATCH 3/8] Completing task on checkbox check

---
 app/presenter/TaskPresenter.php    | 42 ++++++++++++++++++++++++++----
 app/templates/@layout.latte        | 12 +++++----
 app/templates/Task/taskGroup.latte |  2 +-
 www/js/main.js                     | 28 +++++++++++++++++---
 4 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/app/presenter/TaskPresenter.php b/app/presenter/TaskPresenter.php
index 5e2bbf9..0b3cfe8 100644
--- a/app/presenter/TaskPresenter.php
+++ b/app/presenter/TaskPresenter.php
@@ -23,17 +23,30 @@ public function renderDefault()
         $this->template->taskGroups = $this->getTaskGroups();
     }
 
+    /**
+     * @param int $id
+     */
+    public function handleCompleteTask($id)
+    {
+		$task = $this->taskRepository->getById($id);
+		if($task){
+			$task->setCompleted(TRUE);
+			$this->taskRepository->updateEntity($task);
+			$this->flashMessage('Task was completed', 'success');
+		} else {
+			$this->flashMessage('Task was not found', 'error');
+		}
+		
+		$this->redrawOrRedirect(['tasks', 'flashes']);
+    }
+
     /**
      * @param int $id
      */
     public function handleDeleteTaskGroup($id)
     {
         $this->taskGroupRepository->delete($id);
-        if ($this->isAjax()) {
-            $this->redrawControl('taskGroups');
-        } else {
-            $this->redirect('this');
-        }
+		$this->redrawOrRedirect('taskGroups');
     }
 
     /**
@@ -98,4 +111,23 @@ protected function getTasks($idTaskGroup)
         }
         return $result;
     }
+	
+	
+	/**
+	 * @param string|array $snippets
+	 * @param string $destination
+	 */
+	private function redrawOrRedirect($snippets, $destination = 'this')
+    {
+    	if($this->isAjax()){
+			if(!is_array($snippets)){
+				$snippets = [$snippets];
+			}
+			foreach($snippets as $snippet){
+				$this->redrawControl($snippet);
+			}
+		} else {
+			$this->redirect($destination);
+		}
+    }
 }
diff --git a/app/templates/@layout.latte b/app/templates/@layout.latte
index 68e1afc..28b2e48 100644
--- a/app/templates/@layout.latte
+++ b/app/templates/@layout.latte
@@ -39,11 +39,13 @@
                 </nav>
             </div>
             <div class="col-md-9" role="main">
-                {foreach $flashes as $flash}
-                    <div class="alert alert-{$flash->type}" role="alert">
-                        {$flash->message}
-                    </div>
-                {/foreach}
+            	{snippet flashes}
+					{foreach $flashes as $flash}
+						<div class="alert alert-{$flash->type}" role="alert">
+							{$flash->message}
+						</div>
+					{/foreach}
+                {/snippet}
 
                 {include content}
             </div>
diff --git a/app/templates/Task/taskGroup.latte b/app/templates/Task/taskGroup.latte
index 7e265b7..11a7b27 100644
--- a/app/templates/Task/taskGroup.latte
+++ b/app/templates/Task/taskGroup.latte
@@ -6,7 +6,7 @@
                 <ul class="list-group">
                     {foreach $tasks as $task}
                         <li class="list-group-item">
-                            <input type="checkbox" />
+                            <input type="checkbox" n:attr="checked => $task['completed']" class="handle" data-link="{link completeTask! $task['id']}" />
                             <span>{$task['name']}</span>
                             <span class="label label-info">{$task['date']|date:'d.m.Y'}</span>
                         </li>
diff --git a/www/js/main.js b/www/js/main.js
index c68b5fb..9b11c93 100755
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -1,12 +1,34 @@
 $(document).ready(function(){
     $.nette.init();
 
+    function bindICheck(){
+        $('input').iCheck({
+            handle: 'checkbox',
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+    }
+
+    function bindHandleCheckbox() {
+        $('input[type=checkbox].handle').on('ifChecked', function (e) {
+            var link = $(this).data('link');
+            $.nette.ajax(link);
+        });
+    }
+
+    /* init */
+    bindICheck();
+    bindHandleCheckbox();
+
     $('.datepicker').datepicker({
         orientation: 'left bottom'
     });
 
-    $('input').iCheck({
-        handle: 'checkbox',
-        checkboxClass: 'icheckbox_flat-blue'
+    /* after ajax */
+    $.nette.ext({
+        load: function () {
+            bindICheck();
+            bindHandleCheckbox();
+        }
     });
+
 });
\ No newline at end of file

From e18a393bfa779292ace9b32d46842a903f799bea Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Mon, 24 Oct 2016 22:42:07 +0200
Subject: [PATCH 4/8] Ajax task saving, typo in task form success method name,
 added time to flash messages

---
 app/components/form/InsertTask.php            | 17 ++++++--
 .../form/templates/InsertTask.latte           | 42 ++++++++++---------
 app/presenter/TaskPresenter.php               |  2 +-
 app/templates/@layout.latte                   |  2 +-
 app/templates/Task/taskGroup.latte            | 18 ++++----
 5 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/components/form/InsertTask.php b/app/components/form/InsertTask.php
index 9997c70..9bc8705 100644
--- a/app/components/form/InsertTask.php
+++ b/app/components/form/InsertTask.php
@@ -5,6 +5,7 @@
 use App\Model\Entity\TaskGroup;
 use App\Model\Repository\TaskRepository;
 use App\Model\Repository\TaskGroupRepository;
+use App\Presenters\TaskPresenter;
 use Nette\Application\UI\Control;
 use Nette\Application\UI\Form;
 
@@ -55,7 +56,7 @@ protected function createComponentInsertTaskForm()
             ->setRequired('Please fill task date');
         $form->addHidden('idTaskGroup', $this->idTaskGroup);
         $form->addSubmit('submit', 'Add');
-        $form->onSuccess[] = array($this, 'insertTaskFromSuccess');
+        $form->onSuccess[] = array($this, 'insertTaskFormSuccess');
         return $form;
     }
 
@@ -63,7 +64,7 @@ protected function createComponentInsertTaskForm()
      * @param Form $form
      * @param $values
      */
-    public function insertTaskFromSuccess(Form $form, $values)
+    public function insertTaskFormSuccess(Form $form, $values)
     {
         $taskGroup = $this->taskGroupRepository->getById($values->idTaskGroup);
 
@@ -72,7 +73,15 @@ public function insertTaskFromSuccess(Form $form, $values)
         $taskEntity->setDate($values->date);
         $taskEntity->setTaskGroup($taskGroup);
         $this->taskRepository->insert($taskEntity);
-        $this->presenter->flashMessage('Task was created', 'success');
-        $this->redirect('this');
+		
+		if($this->presenter->isAjax()){
+			$form->setValues(['idTaskGroup' => $this->idTaskGroup], TRUE);
+			$this->redrawControl();
+		}
+	
+		/** @var TaskPresenter $presenter */
+		$presenter = $this->presenter;
+        $presenter->flashMessage('Task was created', 'success');
+		$presenter->redrawOrRedirect(['flashes', 'tasks']);
     }
 }
diff --git a/app/components/form/templates/InsertTask.latte b/app/components/form/templates/InsertTask.latte
index e03d57b..6e10642 100644
--- a/app/components/form/templates/InsertTask.latte
+++ b/app/components/form/templates/InsertTask.latte
@@ -1,20 +1,22 @@
-{form insertTaskForm}
-    <div class="row">
-        <div class="col-md-7">
-            <div class="form-group">
-                {label name /}
-                {input name, class => 'form-control'}
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="form-group">
-                {label date /}
-                {input date, class => 'form-control datepicker'}
-            </div>
-        </div>
-        <div class="col-md-2">
-            <br/>
-            {input submit, class => 'btn btn-primary'}
-        </div>
-    </div>
-{/form}
\ No newline at end of file
+{snippet}
+	{form insertTaskForm}
+		<div class="row">
+			<div class="col-md-7">
+				<div class="form-group">
+					{label name /}
+					{input name, class => 'form-control'}
+				</div>
+			</div>
+			<div class="col-md-3">
+				<div class="form-group">
+					{label date /}
+					{input date, class => 'form-control datepicker'}
+				</div>
+			</div>
+			<div class="col-md-2">
+				<br/>
+				{input submit, class => 'btn btn-primary ajax'}
+			</div>
+		</div>
+	{/form}
+{/snippet}
\ No newline at end of file
diff --git a/app/presenter/TaskPresenter.php b/app/presenter/TaskPresenter.php
index 0b3cfe8..f9c3483 100644
--- a/app/presenter/TaskPresenter.php
+++ b/app/presenter/TaskPresenter.php
@@ -117,7 +117,7 @@ protected function getTasks($idTaskGroup)
 	 * @param string|array $snippets
 	 * @param string $destination
 	 */
-	private function redrawOrRedirect($snippets, $destination = 'this')
+	public function redrawOrRedirect($snippets, $destination = 'this')
     {
     	if($this->isAjax()){
 			if(!is_array($snippets)){
diff --git a/app/templates/@layout.latte b/app/templates/@layout.latte
index 28b2e48..e93de87 100644
--- a/app/templates/@layout.latte
+++ b/app/templates/@layout.latte
@@ -42,7 +42,7 @@
             	{snippet flashes}
 					{foreach $flashes as $flash}
 						<div class="alert alert-{$flash->type}" role="alert">
-							{$flash->message}
+							{$flash->message} <span class="text-muted">({(new DateTime)|date:'Y/m/d H:i:s'})</span>
 						</div>
 					{/foreach}
                 {/snippet}
diff --git a/app/templates/Task/taskGroup.latte b/app/templates/Task/taskGroup.latte
index 11a7b27..853e479 100644
--- a/app/templates/Task/taskGroup.latte
+++ b/app/templates/Task/taskGroup.latte
@@ -3,15 +3,15 @@
     <div class="row">
         <div class="col-md-12">
             {snippet tasks}
-                <ul class="list-group">
-                    {foreach $tasks as $task}
-                        <li class="list-group-item">
-                            <input type="checkbox" n:attr="checked => $task['completed']" class="handle" data-link="{link completeTask! $task['id']}" />
-                            <span>{$task['name']}</span>
-                            <span class="label label-info">{$task['date']|date:'d.m.Y'}</span>
-                        </li>
-                    {/foreach}
-                </ul>
+				<ul class="list-group">
+					{foreach $tasks as $task}
+						<li class="list-group-item">
+							<input type="checkbox" n:attr="checked => $task['completed']" class="handle" data-link="{link completeTask! $task['id']}" />
+							<span>{$task['name']}</span>
+							<span class="label label-info">{$task['date']|date:'d.m.Y'}</span>
+						</li>
+					{/foreach}
+				</ul>
             {/snippet}
         </div>
     </div>

From 6ba9ec12b708531efb719db9086b39716575fb4f Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Mon, 24 Oct 2016 22:42:52 +0200
Subject: [PATCH 5/8] Ajax task saving - js

---
 www/js/main.js | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/www/js/main.js b/www/js/main.js
index 9b11c93..0f5e778 100755
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -2,7 +2,9 @@ $(document).ready(function(){
     $.nette.init();
 
     function bindICheck(){
-        $('input').iCheck({
+        var input = $('input');
+        input.iCheck('destroy');
+        input.iCheck({
             handle: 'checkbox',
             checkboxClass: 'icheckbox_flat-blue'
         });
@@ -11,23 +13,35 @@ $(document).ready(function(){
     function bindHandleCheckbox() {
         $('input[type=checkbox].handle').on('ifChecked', function (e) {
             var link = $(this).data('link');
-            $.nette.ajax(link);
+            var bound = $(this).data('handle-bound');
+            if(!bound){
+                $.nette.ajax(link);
+                $(this).data('handle-bound', 1);
+            }
         });
     }
 
-    /* init */
-    bindICheck();
-    bindHandleCheckbox();
+    function bindDatepicker() {
+        var datepicker = $('.datepicker');
+        datepicker.datepicker('destroy');
+        datepicker.datepicker({
+            orientation: 'left bottom'
+        });
+    }
 
-    $('.datepicker').datepicker({
-        orientation: 'left bottom'
-    });
+    function initBinds(){
+        bindICheck();
+        bindHandleCheckbox();
+        bindDatepicker();
+    }
+
+    /* init */
+    initBinds();
 
     /* after ajax */
     $.nette.ext({
         load: function () {
-            bindICheck();
-            bindHandleCheckbox();
+            initBinds();
         }
     });
 

From dd68f9c6c835877a8bb5acacc1aab62b52ba80bc Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Tue, 25 Oct 2016 15:01:25 +0200
Subject: [PATCH 6/8] Tasks are ordered by date descending

---
 app/model/repository/TaskRepository.php | 16 +++++++++-------
 app/presenter/TaskPresenter.php         |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/model/repository/TaskRepository.php b/app/model/repository/TaskRepository.php
index 7980e47..d1169b2 100644
--- a/app/model/repository/TaskRepository.php
+++ b/app/model/repository/TaskRepository.php
@@ -23,14 +23,16 @@ public function getById($id)
     {
         return $this->task->find($id);
     }
-
-    /**
-     * @param number $idTaskGroup
-     * @return Entity\Task[]
-     */
-    public function getByTaskGroup($idTaskGroup)
+	
+	
+	/**
+	 * @param number $idTaskGroup
+	 * @param array|null $orderBy
+	 * @return Entity\Task[]
+	 */
+    public function getByTaskGroup($idTaskGroup, $orderBy = NULL)
     {
-        return $this->task->findBy(array('taskGroup' => $idTaskGroup));
+        return $this->task->findBy(array('taskGroup' => $idTaskGroup), $orderBy);
     }
 
     /**
diff --git a/app/presenter/TaskPresenter.php b/app/presenter/TaskPresenter.php
index f9c3483..542865e 100644
--- a/app/presenter/TaskPresenter.php
+++ b/app/presenter/TaskPresenter.php
@@ -100,7 +100,7 @@ protected function getTaskGroups()
     protected function getTasks($idTaskGroup)
     {
         $result = array();
-        $tasks = $this->taskRepository->getByTaskGroup($idTaskGroup);
+        $tasks = $this->taskRepository->getByTaskGroup($idTaskGroup, ['date' => 'DESC']);
         foreach ($tasks as $task) {
             $item = array();
             $item['id'] = $task->getId();

From 90809f485cc412425ea5865499fe2708eacbf834 Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Tue, 25 Oct 2016 17:57:09 +0200
Subject: [PATCH 7/8] Task Group added to InsertTask form, filtration added to
 tasks list

---
 app/components/form/FilterTasks.php           | 76 +++++++++++++++++++
 app/components/form/InsertTask.php            |  8 +-
 .../form/templates/FilterTasks.latte          | 16 ++++
 .../form/templates/InsertTask.latte           |  8 +-
 app/config/config.neon                        |  1 +
 app/factories/form/IFilterTasksFactory.php    | 12 +++
 app/model/repository/TaskGroupRepository.php  | 13 ++++
 app/model/repository/TaskRepository.php       | 11 ++-
 app/presenter/TaskPresenter.php               | 47 +++++++++++-
 app/templates/Task/taskGroup.latte            |  2 +
 10 files changed, 185 insertions(+), 9 deletions(-)
 create mode 100644 app/components/form/FilterTasks.php
 create mode 100644 app/components/form/templates/FilterTasks.latte
 create mode 100644 app/factories/form/IFilterTasksFactory.php

diff --git a/app/components/form/FilterTasks.php b/app/components/form/FilterTasks.php
new file mode 100644
index 0000000..d183a96
--- /dev/null
+++ b/app/components/form/FilterTasks.php
@@ -0,0 +1,76 @@
+<?php
+namespace App\Components\Form;
+
+use App\Model\Entity\Task;
+use App\Model\Entity\TaskGroup;
+use App\Model\Repository\TaskRepository;
+use App\Model\Repository\TaskGroupRepository;
+use App\Presenters\TaskPresenter;
+use Nette\Application\UI\Control;
+use Nette\Application\UI\Form;
+
+class FilterTasks extends Control
+{
+    /** @var TaskRepository*/
+    public $taskRepository;
+	/** @var number */
+    public $idTaskGroup;
+	/** @var array */
+    public $filter = [];
+
+    /**
+     * @param TaskRepository $taskRepository
+     */
+    public function __construct(TaskRepository $taskRepository)
+    {
+        parent::__construct();
+        $this->taskRepository = $taskRepository;
+    }
+
+    public function render()
+    {
+        $template = $this->template;
+        $template->setFile(__DIR__ . '/templates/FilterTasks.latte');
+        $template->render();
+    }
+
+    /**
+     * @param int $idTaskGroup
+     */
+    public function setTaskGroupId($idTaskGroup)
+    {
+        $this->idTaskGroup = $idTaskGroup;
+    }
+
+    /**
+     * @param array $filter
+     */
+    public function setFilter(array $filter)
+    {
+        $this->filter = $filter;
+    }
+
+    /**
+     * @return Form
+     */
+    protected function createComponentFilterTasksForm()
+    {
+        $form = new Form();
+        $form->addText('name', 'Name');
+        $form->addSubmit('submit', 'Filter');
+        $form->onSuccess[] = array($this, 'filterTasksFormSuccess');
+		
+		$form->setDefaults($this->filter);
+		
+        return $form;
+    }
+
+    /**
+     * @param Form $form
+     * @param $values
+     */
+    public function filterTasksFormSuccess(Form $form, $values)
+    {
+        $this->presenter->redirect('this', ['filter' => (array) $values]);
+    }
+}
diff --git a/app/components/form/InsertTask.php b/app/components/form/InsertTask.php
index 9bc8705..34cd52c 100644
--- a/app/components/form/InsertTask.php
+++ b/app/components/form/InsertTask.php
@@ -54,7 +54,9 @@ protected function createComponentInsertTaskForm()
             ->setRequired('Please fill task name');
         $form->addText('date', 'Date')
             ->setRequired('Please fill task date');
-        $form->addHidden('idTaskGroup', $this->idTaskGroup);
+        $form->addSelect('taskGroup', 'Task group', $this->taskGroupRepository->getSelect())
+            ->setRequired('Please select task group')
+			->setDefaultValue($this->idTaskGroup);
         $form->addSubmit('submit', 'Add');
         $form->onSuccess[] = array($this, 'insertTaskFormSuccess');
         return $form;
@@ -66,7 +68,7 @@ protected function createComponentInsertTaskForm()
      */
     public function insertTaskFormSuccess(Form $form, $values)
     {
-        $taskGroup = $this->taskGroupRepository->getById($values->idTaskGroup);
+        $taskGroup = $this->taskGroupRepository->getById($values->taskGroup);
 
         $taskEntity = new Task();
         $taskEntity->setName($values->name);
@@ -75,7 +77,7 @@ public function insertTaskFormSuccess(Form $form, $values)
         $this->taskRepository->insert($taskEntity);
 		
 		if($this->presenter->isAjax()){
-			$form->setValues(['idTaskGroup' => $this->idTaskGroup], TRUE);
+			$form->setValues(['taskGroup' => $this->idTaskGroup], TRUE);
 			$this->redrawControl();
 		}
 	
diff --git a/app/components/form/templates/FilterTasks.latte b/app/components/form/templates/FilterTasks.latte
new file mode 100644
index 0000000..a9f01cb
--- /dev/null
+++ b/app/components/form/templates/FilterTasks.latte
@@ -0,0 +1,16 @@
+{snippet}
+	{form filterTasksForm}
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+					{label name /}
+					{input name, class => 'form-control'}
+				</div>
+			</div>
+			<div class="col-md-2">
+				<br/>
+				{input submit, class => 'btn btn-primary'}
+			</div>
+		</div>
+	{/form}
+{/snippet}
\ No newline at end of file
diff --git a/app/components/form/templates/InsertTask.latte b/app/components/form/templates/InsertTask.latte
index 6e10642..a499fda 100644
--- a/app/components/form/templates/InsertTask.latte
+++ b/app/components/form/templates/InsertTask.latte
@@ -1,12 +1,18 @@
 {snippet}
 	{form insertTaskForm}
 		<div class="row">
-			<div class="col-md-7">
+			<div class="col-md-4">
 				<div class="form-group">
 					{label name /}
 					{input name, class => 'form-control'}
 				</div>
 			</div>
+			<div class="col-md-3">
+				<div class="form-group">
+					{label taskGroup /}
+					{input taskGroup, class => 'form-control'}
+				</div>
+			</div>
 			<div class="col-md-3">
 				<div class="form-group">
 					{label date /}
diff --git a/app/config/config.neon b/app/config/config.neon
index 8251824..e056023 100644
--- a/app/config/config.neon
+++ b/app/config/config.neon
@@ -21,6 +21,7 @@ services:
     - App\Model\Repository\TaskRepository
     - App\Factories\Modal\IInsertTaskGroupFactory
     - App\Factories\Form\IInsertTaskFactory
+    - App\Factories\Form\IFilterTasksFactory
 
 extensions:
     console: Kdyby\Console\DI\ConsoleExtension
diff --git a/app/factories/form/IFilterTasksFactory.php b/app/factories/form/IFilterTasksFactory.php
new file mode 100644
index 0000000..c0f203c
--- /dev/null
+++ b/app/factories/form/IFilterTasksFactory.php
@@ -0,0 +1,12 @@
+<?php
+namespace App\Factories\Form;
+
+use App\Components\Form\FilterTasks;
+
+interface IFilterTasksFactory
+{
+    /**
+     * @return FilterTasks
+     */
+    public function create();
+}
diff --git a/app/model/repository/TaskGroupRepository.php b/app/model/repository/TaskGroupRepository.php
index 5deb810..4531f36 100644
--- a/app/model/repository/TaskGroupRepository.php
+++ b/app/model/repository/TaskGroupRepository.php
@@ -40,4 +40,17 @@ public function insert(Entity\TaskGroup $taskGroup)
         $this->entityManager->persist($taskGroup);
         $this->entityManager->flush();
     }
+	
+	/**
+	 * @param array $criteria
+	 * @param string $value
+	 * @param string $key
+	 * @param array $orderBy
+	 * @return array
+	 */
+	public function getSelect($criteria = array(), $value = 'name',
+		$orderBy = array('name' => 'ASC'), $key = 'id')
+    {
+		return $this->taskGroup->findPairs($criteria, $value, $orderBy, $key);
+    }
 }
diff --git a/app/model/repository/TaskRepository.php b/app/model/repository/TaskRepository.php
index d1169b2..374c9c1 100644
--- a/app/model/repository/TaskRepository.php
+++ b/app/model/repository/TaskRepository.php
@@ -24,7 +24,6 @@ public function getById($id)
         return $this->task->find($id);
     }
 	
-	
 	/**
 	 * @param number $idTaskGroup
 	 * @param array|null $orderBy
@@ -34,6 +33,16 @@ public function getByTaskGroup($idTaskGroup, $orderBy = NULL)
     {
         return $this->task->findBy(array('taskGroup' => $idTaskGroup), $orderBy);
     }
+	
+	/**
+	 * @param array $criteria
+	 * @param array|null $orderBy
+	 * @return Entity\Task[]
+	 */
+    public function getBy(array $criteria, $orderBy = NULL)
+    {
+        return $this->task->findBy($criteria, $orderBy);
+    }
 
     /**
      * @param Entity\Task $task
diff --git a/app/presenter/TaskPresenter.php b/app/presenter/TaskPresenter.php
index 542865e..7baf9b5 100644
--- a/app/presenter/TaskPresenter.php
+++ b/app/presenter/TaskPresenter.php
@@ -15,8 +15,18 @@ class TaskPresenter extends BasePresenter
     public $insertTaskGroupFactory;
     /** @var \App\Factories\Form\IInsertTaskFactory @inject */
     public $insertTaskFactory;
-    /** @var number */
-    protected $idTaskGroup;
+    /** @var \App\Factories\Form\IFilterTasksFactory @inject */
+    public $filterTasksFactory;
+    /**
+	 * @var number
+	 * @persistent
+	 */
+    public $idTaskGroup;
+    /**
+	 * @var array
+	 * @persistent
+	 */
+    public $filter = [];
 
     public function renderDefault()
     {
@@ -37,7 +47,7 @@ public function handleCompleteTask($id)
 			$this->flashMessage('Task was not found', 'error');
 		}
 		
-		$this->redrawOrRedirect(['tasks', 'flashes']);
+		$this->redrawOrRedirect(array('tasks', 'flashes'));
     }
 
     /**
@@ -77,6 +87,17 @@ protected function createComponentInsertTaskForm()
         return $control;
     }
 
+    /**
+     * @return \App\Components\Form\FilterTasks
+     */
+    protected function createComponentFilterTasksForm()
+    {
+        $control = $this->filterTasksFactory->create();
+        $control->setTaskGroupId($this->idTaskGroup);
+		$control->setFilter($this->filter);
+        return $control;
+    }
+
     /**
      * @return array
      */
@@ -100,7 +121,12 @@ protected function getTaskGroups()
     protected function getTasks($idTaskGroup)
     {
         $result = array();
-        $tasks = $this->taskRepository->getByTaskGroup($idTaskGroup, ['date' => 'DESC']);
+		$criteria = array_merge(
+			$this->prepareTasksFilter(),
+			array('taskGroup' => $idTaskGroup)
+		);
+		
+        $tasks = $this->taskRepository->getBy($criteria, ['date' => 'DESC']);
         foreach ($tasks as $task) {
             $item = array();
             $item['id'] = $task->getId();
@@ -130,4 +156,17 @@ public function redrawOrRedirect($snippets, $destination = 'this')
 			$this->redirect($destination);
 		}
     }
+	
+	
+	/**
+	 * @return array
+	 */
+	private function prepareTasksFilter()
+	{
+		$filter = [];
+		if(array_key_exists('name', $this->filter)){
+			$filter['name LIKE'] = "%{$this->filter['name']}%";
+		}
+		return $filter;
+	}
 }
diff --git a/app/templates/Task/taskGroup.latte b/app/templates/Task/taskGroup.latte
index 853e479..dd82c03 100644
--- a/app/templates/Task/taskGroup.latte
+++ b/app/templates/Task/taskGroup.latte
@@ -1,5 +1,7 @@
 {block content}
     {control insertTaskForm}
+    <hr>
+    {control filterTasksForm}
     <div class="row">
         <div class="col-md-12">
             {snippet tasks}

From 32d69ca869632ecedaed8c0ad6e94c6e37c1d4c5 Mon Sep 17 00:00:00 2001
From: Zuzana Kreizlova <ithaka@seznam.cz>
Date: Tue, 25 Oct 2016 18:48:39 +0200
Subject: [PATCH 8/8] All new arrays converted to long syntax

---
 app/components/form/FilterTasks.php | 4 ++--
 app/components/form/InsertTask.php  | 4 ++--
 app/presenter/TaskPresenter.php     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/components/form/FilterTasks.php b/app/components/form/FilterTasks.php
index d183a96..ad16113 100644
--- a/app/components/form/FilterTasks.php
+++ b/app/components/form/FilterTasks.php
@@ -16,7 +16,7 @@ class FilterTasks extends Control
 	/** @var number */
     public $idTaskGroup;
 	/** @var array */
-    public $filter = [];
+    public $filter = array();
 
     /**
      * @param TaskRepository $taskRepository
@@ -71,6 +71,6 @@ protected function createComponentFilterTasksForm()
      */
     public function filterTasksFormSuccess(Form $form, $values)
     {
-        $this->presenter->redirect('this', ['filter' => (array) $values]);
+        $this->presenter->redirect('this', array('filter' => (array) $values));
     }
 }
diff --git a/app/components/form/InsertTask.php b/app/components/form/InsertTask.php
index 34cd52c..594ceaf 100644
--- a/app/components/form/InsertTask.php
+++ b/app/components/form/InsertTask.php
@@ -77,13 +77,13 @@ public function insertTaskFormSuccess(Form $form, $values)
         $this->taskRepository->insert($taskEntity);
 		
 		if($this->presenter->isAjax()){
-			$form->setValues(['taskGroup' => $this->idTaskGroup], TRUE);
+			$form->setValues(array('taskGroup' => $this->idTaskGroup), TRUE);
 			$this->redrawControl();
 		}
 	
 		/** @var TaskPresenter $presenter */
 		$presenter = $this->presenter;
         $presenter->flashMessage('Task was created', 'success');
-		$presenter->redrawOrRedirect(['flashes', 'tasks']);
+		$presenter->redrawOrRedirect(array('flashes', 'tasks'));
     }
 }
diff --git a/app/presenter/TaskPresenter.php b/app/presenter/TaskPresenter.php
index 7baf9b5..0beab30 100644
--- a/app/presenter/TaskPresenter.php
+++ b/app/presenter/TaskPresenter.php
@@ -26,7 +26,7 @@ class TaskPresenter extends BasePresenter
 	 * @var array
 	 * @persistent
 	 */
-    public $filter = [];
+    public $filter = array();
 
     public function renderDefault()
     {
@@ -126,7 +126,7 @@ protected function getTasks($idTaskGroup)
 			array('taskGroup' => $idTaskGroup)
 		);
 		
-        $tasks = $this->taskRepository->getBy($criteria, ['date' => 'DESC']);
+        $tasks = $this->taskRepository->getBy($criteria, array('date' => 'DESC'));
         foreach ($tasks as $task) {
             $item = array();
             $item['id'] = $task->getId();
@@ -147,7 +147,7 @@ public function redrawOrRedirect($snippets, $destination = 'this')
     {
     	if($this->isAjax()){
 			if(!is_array($snippets)){
-				$snippets = [$snippets];
+				$snippets = array($snippets);
 			}
 			foreach($snippets as $snippet){
 				$this->redrawControl($snippet);
@@ -163,7 +163,7 @@ public function redrawOrRedirect($snippets, $destination = 'this')
 	 */
 	private function prepareTasksFilter()
 	{
-		$filter = [];
+		$filter = array();
 		if(array_key_exists('name', $this->filter)){
 			$filter['name LIKE'] = "%{$this->filter['name']}%";
 		}