#45 t&m

Author: mnvx

app/Http/Controllers/IssueController.php

@@ -43,7 +43,7 @@ protected function prepareDataForIndex(FormRequest $request, array $data)
                 'assigneeList' => $contributorRepository->getItemsForSelect(),
                 'projectsList' => $projectRepository->getItemsForSelect(),
                 'labelList' => $labelRepository->getItemsForSelect(null, null, 'name'),
-                'milestonelList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
+                'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
                 'total' => [
                     'estimate' => $totalEstimate,
                     'time' => $totalTime,

app/Http/Controllers/TimeController.php

@@ -25,6 +25,15 @@ protected function getService()
         return app(AppServiceProvider::ELOQUENT_SPENT_SERVICE);
     }
 
+    public function index(FormRequest $request)
+    {
+        if ($request->get('submit') === 'act_tnm.csv') {
+            $data = $this->getService()->getTNMList($request->all());
+            return $this->downloadCsv($data);
+        }
+        return parent::index($request);
+    }
+
     protected function prepareDataForIndex(FormRequest $request, array $data)
     {
         /** @var ContributorRepositoryEloquent $contributorRepository */
@@ -47,7 +56,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'),
+                'milestoneList' => $milestoneRepository->getItemsForSelect(null, null, 'id', 'title'),
                 'total' => [
                     'time' => $totalTime,
                 ],

app/Model/Repository/SpentRepositoryEloquent.php

@@ -90,6 +90,23 @@ public function getListQuery(array $parameters): Builder
         return $query;
     }
 
+    public function getTNMListQuery(array $parameters): Builder
+    {
+        $query = $this->getListQuery($parameters);
+        $query = $query->select([
+                DB::raw("date_trunc('second', max(note.gitlab_created_at)) as gitlab_created_at"),
+                'issue.iid as issue',
+                'issue.title as title',
+                DB::raw('sum(spent.hours) as hours'),
+            ])
+            ->groupBy([
+                'issue.iid',
+                'issue.title',
+            ])
+            ->orderBy('issue.iid');
+        return $query;
+    }
+
     public function stat($parameters): Collection
     {
         /** @var Builder $query */

app/Model/Service/Eloquent/EloquentSpentService.php

@@ -31,4 +31,10 @@ public function getTotalTime(array $parameters)
         return $query->first()->total;
     }
 
+    public function getTNMList($parameters)
+    {
+        $query = $this->repository->getTNMListQuery($parameters);
+        return $query->cursor();
+    }
+
 }

resources/lang/en/messages.php

@@ -12,6 +12,7 @@
     | as the size rules. Feel free to tweak each of these messages here.
     |
     */
+    'Act t&m CSV' => 'Act t&m CSV',
     'Active users' => 'Active users',
     'Add' => 'Add',
     'Added by mistake or occurs problem with payment' => 'Added by mistake or occurs problem with payment',

resources/lang/ru/messages.php

@@ -12,6 +12,7 @@
     | as the size rules. Feel free to tweak each of these messages here.
     |
     */
+    'Act t&m CSV' => 'Акт t&m CSV',
     'Active users' => 'Активные пользователи',
     'Add' => 'Добавить',
     'Added by mistake or occurs problem with payment' => 'Добавлено ошибочно или возникла проблема с платежом',

resources/views/gitpab/issue/index_filter_form.blade.php

@@ -72,7 +72,7 @@
             <div class="form-group">
                 @include('partial.form.element.select', [
                     'name' => 'milestones[]',
-                    'list' => $milestonelList,
+                    'list' => $milestoneList,
                     'selected' => $request->input('milestones'),
                     'options' => ['multiple' => 'multiple'],
                     'label' => __('messages.Milestones'),

resources/views/gitpab/time/index_filter_form.blade.php

@@ -72,7 +72,7 @@
             <div class="form-group">
                 @include('partial.form.element.select', [
                     'name' => 'milestones[]',
-                    'list' => $milestonelList,
+                    'list' => $milestoneList,
                     'selected' => $request->input('milestones'),
                     'options' => ['multiple' => 'multiple'],
                     'label' => __('messages.Milestones'),
@@ -90,6 +90,9 @@
                 <span class="group-btn">
                     <button name="submit" value="csv" type="submit" class="btn btn-default">@lang('messages.Export CSV')</button>
                 </span>
+                <span class="group-btn">
+                    <button name="submit" value="act_tnm.csv" type="submit" class="btn btn-default">@lang('messages.Act t&m CSV')</button>
+                </span>
                 <span class="group-btn pull-right">
                     <a class="btn btn-default" href="{{ route('time.index') }}">@lang('messages.Reset')</a>
                 </span>