Merge pull request #446 from InfyOmLabs/develop

v0.1.5-beta Release

app/Http/Controllers/ClientController.php

@@ -5,6 +5,7 @@
 use App\Http\Requests\CreateClientRequest;
 use App\Http\Requests\UpdateClientRequest;
 use App\Models\Client;
+use App\Models\Department;
 use App\Queries\ClientDataTable;
 use App\Repositories\ClientRepository;
 use App\Repositories\ProjectRepository;
@@ -47,8 +48,9 @@ public function index(Request $request)
         if ($request->ajax()) {
             return Datatables::of((new ClientDataTable())->get())->make(true);
         }
+        $departments = Department::all()->pluck('name', 'id')->toArray();
 
-        return view('clients.index');
+        return view('clients.index', ['departments' => $departments]);
     }
 
     /**

app/Http/Controllers/DepartmentController.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\CreateDepartmentRequest;
+use App\Http\Requests\UpdateDepartmentRequest;
+use App\Models\Department;
+use App\Queries\DepartmentDataTable;
+use App\Repositories\ClientRepository;
+use App\Repositories\DepartmentRepository;
+use DataTables;
+use Exception;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class DepartmentController extends AppBaseController
+{
+    /** @var DepartmentRepository */
+    private $departmentRepository;
+
+    public function __construct(DepartmentRepository $departmentRepo)
+    {
+        $this->departmentRepository = $departmentRepo;
+    }
+
+    /**
+     * Display a listing of the Department.
+     *
+     * @param Request $request
+     *
+     * @throws Exception
+     *
+     * @return Factory|View
+     */
+    public function index(Request $request)
+    {
+        if ($request->ajax()) {
+            return DataTables::of((new DepartmentDataTable())->get())->make(true);
+        }
+
+        return view('departments.index');
+    }
+
+    /**
+     * Store a newly created Department in storage.
+     *
+     * @param CreateDepartmentRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(CreateDepartmentRequest $request)
+    {
+        $input = $request->all();
+
+        $this->departmentRepository->create($input);
+
+        return $this->sendSuccess('Department created successfully.');
+    }
+
+    /**
+     * Show the form for editing the specified Department.
+     *
+     * @param Department $department
+     *
+     * @return JsonResponse
+     */
+    public function edit(Department $department)
+    {
+        return $this->sendResponse($department, 'Department retrieved successfully.');
+    }
+
+    /**
+     * Update the specified Department in storage.
+     *
+     * @param Department              $department
+     * @param UpdateDepartmentRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function update(Department $department, UpdateDepartmentRequest $request)
+    {
+        $this->departmentRepository->update($request->all(), $department->id);
+
+        return $this->sendSuccess('Department updated successfully.');
+    }
+
+    /**
+     * Remove the specified Department from storage.
+     *
+     * @param Department $department
+     *
+     * @throws Exception
+     *
+     * @return JsonResponse
+     */
+    public function destroy(Department $department)
+    {
+        $this->departmentRepository->delete($department->id);
+
+        return $this->sendSuccess('Department deleted successfully.');
+    }
+
+    /**
+     * @param Request          $request
+     * @param ClientRepository $clientRepository
+     *
+     * @return JsonResponse
+     */
+    public function clients(Request $request, ClientRepository $clientRepository)
+    {
+        $projects = $clientRepository->getClientList($request->get('department_id', null));
+
+        return $this->sendResponse($projects, 'Clients retrieved successfully.');
+    }
+}

app/Http/Controllers/ReportController.php

@@ -8,6 +8,7 @@
 use App\Models\User;
 use App\Queries\ReportDataTable;
 use App\Repositories\ClientRepository;
+use App\Repositories\DepartmentRepository;
 use App\Repositories\ProjectRepository;
 use App\Repositories\ReportRepository;
 use App\Repositories\TagRepository;
@@ -17,11 +18,12 @@
 use DataTables;
 use Exception;
 use Flash;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
-use Response;
+use Illuminate\View\View;
 
 /**
  * Class ReportController.
@@ -43,18 +45,23 @@ class ReportController extends AppBaseController
     /** @var ProjectRepository */
     private $projectRepo;
 
+    /** @var DepartmentRepository */
+    private $departmentRepo;
+
     public function __construct(
         ReportRepository $reportRepo,
         UserRepository $userRepository,
         ProjectRepository $projectRepository,
         ClientRepository $clientRepository,
-        TagRepository $tagRepository
+        TagRepository $tagRepository,
+        DepartmentRepository $departmentRepository
     ) {
         $this->reportRepository = $reportRepo;
         $this->userRepo = $userRepository;
         $this->clientRepo = $clientRepository;
         $this->tagRepo = $tagRepository;
         $this->projectRepo = $projectRepository;
+        $this->departmentRepo = $departmentRepository;
     }
 
     /**
@@ -64,7 +71,7 @@ public function __construct(
      *
      * @throws Exception
      *
-     * @return Response
+     * @return Factory|View
      */
     public function index(Request $request)
     {
@@ -79,14 +86,15 @@ public function index(Request $request)
     /**
      * Show the form for creating a new Report.
      *
-     * @return Response
+     * @return Factory|View
      */
     public function create()
     {
         $data['tags'] = $this->tagRepo->getTagList();
         $data['users'] = $this->userRepo->getUserList();
         $data['clients'] = $this->clientRepo->getClientList();
         $data['projects'] = $this->projectRepo->getProjectsList();
+        $data['departments'] = $this->departmentRepo->getDepartmentList();
 
         return view('reports.create', $data);
     }
@@ -96,7 +104,7 @@ public function create()
      *
      * @param CreateReportRequest $request
      *
-     * @return Response
+     * @return RedirectResponse|Redirector
      */
     public function store(CreateReportRequest $request)
     {
@@ -114,7 +122,7 @@ public function store(CreateReportRequest $request)
      *
      * @param Report $report
      *
-     * @return Response
+     * @return Factory|View
      */
     public function show(Report $report)
     {
@@ -136,7 +144,7 @@ public function show(Report $report)
      *
      * @param Report $report
      *
-     * @return Response
+     * @return Factory|View
      */
     public function edit(Report $report)
     {
@@ -146,10 +154,12 @@ public function edit(Report $report)
         $data['tagIds'] = $this->reportRepository->getTagIds($id);
         $data['userIds'] = $this->reportRepository->getUserIds($id);
         $data['clientId'] = $this->reportRepository->getClientId($id);
+        $data['departmentId'] = $this->reportRepository->getDepartmentId($id);
         $data['projects'] = $this->projectRepo->getProjectsList($data['clientId']);
         $data['users'] = $this->userRepo->getUserList($data['projectIds']);
         $data['clients'] = $this->clientRepo->getClientList();
         $data['tags'] = $this->tagRepo->getTagList();
+        $data['departments'] = $this->departmentRepo->getDepartmentList();
 
         return view('reports.edit')->with($data);
     }
@@ -162,7 +172,7 @@ public function edit(Report $report)
      *
      * @throws Exception
      *
-     * @return Response
+     * @return RedirectResponse|Redirector
      */
     public function update(Report $report, UpdateReportRequest $request)
     {

app/Http/Requests/CreateDepartmentRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Department;
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateDepartmentRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return Department::$rules;
+    }
+}

app/Http/Requests/UpdateDepartmentRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Department;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateDepartmentRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $id = $this->route('department')->id;
+        $rules = Department::$rules;
+        $rules['name'] = 'required|unique:departments,name,'.$id;
+
+        return $rules;
+    }
+}