Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Employee discipline #20

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?php

namespace App\Modules\Discipline\Http\Controllers;

use App\Http\Controllers\Controller;
use App\Modules\Discipline\Repositories\Interfaces\DisciplinaryCaseActionRepositoryInterface as DisciplinaryCaseActionRepository;
use App\Modules\Discipline\Repositories\Interfaces\DisciplinaryCaseRepositoryInterface as DisciplinaryCaseRepository;
use App\Modules\Pim\Repositories\Interfaces\EmployeeRepositoryInterface as EmployeeRepository;
use App\Modules\Discipline\Http\Requests\DisciplinaryCaseActionRequest;
use Illuminate\Http\Request;
use Datatables;

class DisciplinaryCasesActionsController extends Controller
{
private $disciplinaryCaseActionRepository;

public function __construct(DisciplinaryCaseActionRepository $disciplinaryCaseActionRepository)
{
$this->disciplinaryCaseActionRepository = $disciplinaryCaseActionRepository;
}

/**
* Display a listing of the resource.
*
* @param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @return \Illuminate\Http\Response
*/
public function index(EmployeeRepository $employeeRepository)
{
$employees = $employeeRepository->pluckName();
return view('discipline::disciplinary_cases_actions.index', compact('employees'));
}

/**
* Returns data for the resource list
*
* @return \Illuminate\Http\Response
*/
public function getDatatable()
{
return Datatables::of($this->disciplinaryCaseActionRepository->getCollection([], ['id', 'name', 'description', 'disciplinary_case_id']))
->editColumn('disciplinary_case_id', function($disciplinary_case_action){
return $disciplinary_case_action->disciplinaryCase->name;
})
->addColumn('actions', function($disciplinary_case_action){
return view('includes._datatable_actions', [
'deleteUrl' => route('discipline.disciplinary_cases_actions.destroy', $disciplinary_case_action->id),
'editUrl' => route('discipline.disciplinary_cases_actions.edit', $disciplinary_case_action->id)
]);
})
->make();
}

/**
* Show the form for creating a new resource.
*
* @param \App\Modules\Pim\Http\Repositories\Interfaces\DisciplinaryCaseRepository $disciplinaryCaseRepository
* @return \Illuminate\Http\Response
*/
public function create(DisciplinaryCaseRepository $disciplinaryCaseRepository)
{
$disciplinary_cases = $disciplinaryCaseRepository->getAll()->pluck('name', 'id');
return view('discipline::disciplinary_cases_actions.create', compact('disciplinary_cases'));
}

/**
* Store a newly created resource in storage.
*
* @param \App\Modules\Discipline\Http\Requests\DisciplinaryCaseActionRequest $request
@param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @return \Illuminate\Http\Response
*/
public function store(DisciplinaryCaseActionRequest $request, EmployeeRepository $employeeRepository)
{
$disciplinaryCaseData = $this->disciplinaryCaseActionRepository->create($request->all());

$request->session()->flash('success', trans('app.discipline.disciplinary_cases.store_success'));
return redirect()->route('discipline.disciplinary_cases_actions.edit', $disciplinaryCaseData->id);
}

/**
* Display the specified resource.
*
* @param integer unique identifier for the resource
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}

/**
* Show the form for editing the specified resource.
*
* @param integer unique identifier for the resource
* @param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @return \Illuminate\Http\Response
*/
public function edit($id, EmployeeRepository $employeeRepository, DisciplinaryCaseRepository $disciplinaryCaseRepository)
{
$disciplinary_case_action = $this->disciplinaryCaseActionRepository->getById($id);
$disciplinary_cases = $disciplinaryCaseRepository->getAll()->pluck('name', 'id');
$employees = $employeeRepository->pluckName();
$breadcrumb = ['title' => $disciplinary_case_action->name, 'id' => $disciplinary_case_action->id];
return view('discipline::disciplinary_cases_actions.edit', compact('employees', 'disciplinary_case_action', 'disciplinary_cases', 'breadcrumb'));
}

/**
* Update the specified resource in storage.
*
* @param integer unique identifier for the resource
* @param \App\Modules\Discipline\Http\Requests\DisciplinaryCaseActionRequest $request
* @return \Illuminate\Http\Response
*/
public function update($id, DisciplinaryCaseActionRequest $request)
{
$disciplinaryCaseData = $this->disciplinaryCaseActionRepository->update($id, $request->all());
$request->session()->flash('success', trans('app.discipline.disciplinary_cases.update_success'));
return redirect()->route('discipline.disciplinary_cases_actions.edit', $disciplinaryCaseData->id);
}

/**
* Remove the specified resource from storage.
*
* @param integer unique identifier for the resource
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function destroy($id, Request $request)
{
$this->disciplinaryCaseActionRepository->delete($id);
$request->session()->flash('success', trans('app.discipline.disciplinary_cases.delete_success'));
return redirect()->route('discipline.disciplinary_cases_actions.index');
}
}
25 changes: 20 additions & 5 deletions app/Modules/Discipline/Http/Controllers/DisciplinaryCasesController.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
use App\Modules\Discipline\Http\Requests\DisciplinaryCaseRequest;
use Illuminate\Http\Request;
use Datatables;
use App\Repositories\UserRepository;
use Illuminate\Support\Facades\Mail;
use Illuminate\Mail\Mailer;

class DisciplinaryCasesController extends Controller
{
Expand Down Expand Up @@ -56,21 +59,31 @@ public function getDatatable()
* @param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @return \Illuminate\Http\Response
*/
public function create(EmployeeRepository $employeeRepository)
public function create(EmployeeRepository $employeeRepository, UserRepository $userRepository)
{
$employees = $employeeRepository->pluckName();
return view('discipline::disciplinary_cases.create', compact('employees'));
$users = $userRepository->pluckName();

return view('discipline::disciplinary_cases.create', compact('employees', 'users'));
}

/**
* Store a newly created resource in storage.
*
* @param \App\Modules\Discipline\Http\Requests\DisciplinaryCaseRequest $request
* @param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @param \App\Repositories\UserRepository $userRepository
* @return \Illuminate\Http\Response
*/
public function store(DisciplinaryCaseRequest $request)
public function store(DisciplinaryCaseRequest $request, EmployeeRepository $employeeRepository)
{
$disciplinaryCaseData = $this->disciplinaryCaseRepository->create($request->all());
$employee = $employeeRepository->getById($disciplinaryCaseData->user_id);
Mail::send('emails.employee-disciplinary-case', json_decode(json_encode($disciplinaryCaseData), true), function($message) use ($employee)
{
$message->from(env('MAIL_EMAIL_FROM'));
$message->to($employee['email']);
});
$request->session()->flash('success', trans('app.discipline.disciplinary_cases.store_success'));
return redirect()->route('discipline.disciplinary_cases.edit', $disciplinaryCaseData->id);
}
Expand All @@ -91,14 +104,16 @@ public function show($id)
*
* @param integer unique identifier for the resource
* @param \App\Modules\Pim\Http\Repositories\Interfaces\EmployeeRepository $employeeRepository
* @param \App\Repositories\UserRepository $userRepository
* @return \Illuminate\Http\Response
*/
public function edit($id, EmployeeRepository $employeeRepository)
public function edit($id, EmployeeRepository $employeeRepository, UserRepository $userRepository)
{
$disciplinary_case = $this->disciplinaryCaseRepository->getById($id);
$employees = $employeeRepository->pluckName();
$users = $userRepository->pluckName();
$breadcrumb = ['title' => $disciplinary_case->name, 'id' => $disciplinary_case->id];
return view('discipline::disciplinary_cases.edit', compact('employees', 'disciplinary_case', 'breadcrumb'));
return view('discipline::disciplinary_cases.edit', compact('employees', 'disciplinary_case', 'users', 'breadcrumb'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace App\Modules\Discipline\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;

class DisciplinaryCaseActionRequest 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 [
'name' => ['required']
];
}
}
18 changes: 18 additions & 0 deletions app/Modules/Discipline/Models/DisciplinaryCaseAction.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

namespace App\Modules\Discipline\Models;

use Illuminate\Database\Eloquent\Model;
use App\User;
use App\Modules\Discipline\Models\DisciplinaryCase;

class DisciplinaryCaseAction extends Model
{
protected $table = 'disciplinary_cases_actions';
protected $guarded = ['id'];

public function disciplinaryCase()
{
return $this->belongsTo(DisciplinaryCase::class, 'disciplinary_case_id');
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace App\Modules\Discipline\Repositories;

use App\Repositories\EloquentRepository;
use App\Modules\Discipline\Models\DisciplinaryCaseAction;
use App\Modules\Discipline\Repositories\Interfaces\DisciplinaryCaseActionRepositoryInterface;

class DisciplinaryCaseActionRepository extends EloquentRepository implements DisciplinaryCaseActionRepositoryInterface
{
public function __construct(DisciplinaryCaseAction $model)
{
$this->model = $model;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace App\Modules\Discipline\Repositories\Interfaces;

interface DisciplinaryCaseActionRepositoryInterface
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
{!! Form::select('user_id', $employees, null, ['class' => 'form-control employees']) !!}
</div>
</div>
<div class="form-group">
{!! Form::label('reported_by', trans('app.discipline.disciplinary_cases.reported_by'), ['class' => 'col-sm-3']) !!}
<div class="col-sm-6">
{!! Form::select('reported_by', $users, null, ['class' => 'form-control users']) !!}
</div>
</div>
@include('errors._form-errors')
<hr>
<div class="form-group">
Expand All @@ -31,5 +37,6 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
<script>
$(".employees").select2();
$(".users").select2();
</script>
@endsection
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<div class="form-group">
{!! Form::label('name', trans('app.discipline.disciplinary_cases.name').':', ['class' => 'col-sm-3']) !!}
<div class="col-sm-6">
{!! Form::text('name', null, ['class' => 'form-control']) !!}
</div>
</div>
<div class="form-group">
{!! Form::label('description', trans('app.discipline.disciplinary_cases.description').':', ['class' => 'col-sm-3']) !!}
<div class="col-sm-6">
{!! Form::textarea('description', null, ['class' => 'form-control']) !!}
</div>
</div>
<div class="form-group">
{!! Form::label('disciplinary_case', trans('app.discipline.disciplinary_cases_actions.main'), ['class' => 'col-sm-3']) !!}
<div class="col-sm-6">
{!! Form::select('disciplinary_case_id', $disciplinary_cases, null, ['class' => 'form-control disciplinaryCases']) !!}
</div>
</div>
@include('errors._form-errors')
<hr>
<div class="form-group">
<div class="col-sm-6 col-sm-offset-3">
<a href="{{route('discipline.disciplinary_cases_actions.index')}}" class="btn btn-default">{{trans('app.cancel')}}</a>
{!! Form::submit($submitName, ['class' => 'btn btn-primary']) !!}
</div>
</div>
@section('additionalCSS')
<link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css" rel="stylesheet" />
@endsection
@section('additionalJS')
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
<script>
$(".disciplinaryCases").select2();
</script>
@endsection
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@extends('layouts.main')
@section('content')
<div class="row">
<div class="col-sm-12">
<div class="custom-panel">
<div class="custom-panel-heading">{{trans('app.discipline.disciplinary_cases.add_new')}}</div>
{!! Form::open(['route' => 'discipline.disciplinary_cases_actions.store', 'class' => 'form-horizontal']) !!}
@include('discipline::disciplinary_cases_actions._form', ['submitName' => trans('app.submit')])
{!! Form::close() !!}
</div>
</div>
</div>
@endsection
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@extends('layouts.main')
@section('content')
<div class="row">
<div class="col-sm-12">
<div class="custom-panel">
<div class="custom-panel-heading">{{trans('app.discipline.disciplinary_cases.edit_details')}}</div>
{!! Form::model($disciplinary_case_action, ['method' => 'PUT', 'route' => ['discipline.disciplinary_cases_actions.update', $disciplinary_case_action->id], 'class' => 'form-horizontal']) !!}
@include('discipline::disciplinary_cases_actions._form', ['submitName' => trans('app.submit')])
{!! Form::close() !!}
</div>
</div>
</div>
@endsection
Loading