#30 Spent time: add filter by milestone

zubroide · Jan 13, 2019 · 61e7ab6 · 61e7ab6
1 parent 2345408
commit 61e7ab6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/app/Http/Controllers/TimeController.php b/app/Http/Controllers/TimeController.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\TimeListRequest;
 use App\Model\Repository\ContributorRepositoryEloquent;
 use App\Model\Repository\LabelRepositoryEloquent;
+use App\Model\Repository\MilestoneRepositoryEloquent;
 use App\Model\Repository\ProjectRepositoryEloquent;
 use App\Model\Service\Eloquent\EloquentSpentService;
 use App\Providers\AppServiceProvider;
@@ -35,6 +36,9 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
         /** @var LabelRepositoryEloquent $labelRepository */
         $labelRepository = app(AppServiceProvider::LABEL_REPOSITORY);
 
+        /** @var MilestoneRepositoryEloquent $milestoneRepository */
+        $milestoneRepository = app(AppServiceProvider::MILESTONE_REPOSITORY);
+
         $totalTime = $this->getService()->getTotalTime($request->all());
 
         return array_merge(
@@ -43,6 +47,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
                 'authorsList' => $contributorRepository->getItemsForSelect(),
                 'projectsList' => $projectRepository->getItemsForSelect(),
                 'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
+                'milestonelList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
                 'total' => [
                     'time' => $totalTime,
                 ],

diff --git a/app/Model/Repository/SpentRepositoryEloquent.php b/app/Model/Repository/SpentRepositoryEloquent.php
@@ -80,6 +80,11 @@ public function getListQuery(array $parameters): Builder
             $query->whereRaw("issue.labels @> array[$labelsString]");
         }
 
+        if ($milestoneIds = Arr::get($parameters, 'milestones'))
+        {
+            $query->whereIn('issue.milestone_id', $milestoneIds);
+        }
+
         return $query;
     }
 

diff --git a/resources/views/gitpab/time/index_filter_form.blade.php b/resources/views/gitpab/time/index_filter_form.blade.php
@@ -68,6 +68,17 @@
                 ])
             </div>
         </div>
+        <div class="col-md-4">
+            <div class="form-group">
+                @include('partial.form.element.select', [
+                    'name' => 'milestones[]',
+                    'list' => $milestonelList,
+                    'selected' => $request->input('milestones'),
+                    'options' => ['multiple' => 'multiple'],
+                    'label' => __('messages.Milestones'),
+                ])
+            </div>
+        </div>
     </div>
 
     <div class="row">

diff --git a/resources/views/gitpab/time/index_table.blade.php b/resources/views/gitpab/time/index_table.blade.php
@@ -104,6 +104,6 @@
     <tr>
         <td colspan="2"></td>
         <td>{{  $total['time'] }}</td>
-        <td colspan="3"></td>
+        <td colspan="4"></td>
     </tr>
 @endsection