Update contacts view
This commit is contained in:
parent
8dd4fc6d74
commit
513fa2acaf
9 changed files with 162 additions and 124 deletions
|
|
@ -3,22 +3,26 @@
|
|||
namespace App\Http\Controllers\Bo;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Bo\FilterCustomerRequest;
|
||||
use App\Models\AppUser;
|
||||
use App\Models\Contact;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
|
||||
class ContactController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Http\Requests\Bo\FilterCustomerRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index(Request $request)
|
||||
public function index(FilterCustomerRequest $request)
|
||||
{
|
||||
/** @var \Illuminate\Database\Eloquent\Builder $query */
|
||||
$query = Contact::query();
|
||||
|
||||
$query->with('appUser');
|
||||
|
||||
/** @var string $search Search field */
|
||||
if ($request->search) {
|
||||
$this->searchQuery(
|
||||
|
|
@ -35,9 +39,17 @@ class ContactController extends Controller
|
|||
/** Sort columns with a query */
|
||||
$this->sortQuery($query);
|
||||
|
||||
if ($request->user) {
|
||||
$query->whereHas('appUser', function (Builder $q) use ($request) {
|
||||
$q->where('id', $request->user);
|
||||
});
|
||||
}
|
||||
|
||||
$contactModelList = $this->paginate($query);
|
||||
|
||||
return view('bo.pages.contacts.index', compact('contactModelList', 'searchFields'));
|
||||
$appUsers = AppUser::query()->select(['id', 'lastname', 'firstname'])->get();
|
||||
|
||||
return view('bo.pages.contacts.index', compact('contactModelList', 'searchFields', 'appUsers'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -48,6 +60,7 @@ class ContactController extends Controller
|
|||
*/
|
||||
public function show(Contact $contact)
|
||||
{
|
||||
$contact->load('appUser.directories');
|
||||
return \view('bo.pages.contacts.show', ['contactModel' => $contact]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
30
app/Http/Requests/Bo/FilterCustomerRequest.php
Normal file
30
app/Http/Requests/Bo/FilterCustomerRequest.php
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Bo;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class FilterCustomerRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return \auth()->check();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'customer' => 'sometimes|nullable|numeric|exists:app_users,id'
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@ use Kwaadpepper\Enum\Traits\CastsEnums;
|
|||
* @property string $firstname
|
||||
* @property string $email
|
||||
* @property string $password
|
||||
* @property integer $role
|
||||
* @property \App\Enums\AppUserRolesEnum $role
|
||||
* @property boolean $status
|
||||
* @property integer $order
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,57 +1,52 @@
|
|||
@php
|
||||
$iArgs = [];
|
||||
if(request()->sort_col) {
|
||||
$iArgs['sort_col'] = request()->sort_col;
|
||||
}
|
||||
|
||||
if(request()->search) {
|
||||
$iArgs['search'] = request()->sort_way;
|
||||
}
|
||||
@endphp
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<form id="searchForm" action="{{ request()->url() }}">
|
||||
<div class="input-group">
|
||||
<label class="input-group-text" for="searchField">{{ $searchFields }}</label>
|
||||
@if(request()->sort_col)
|
||||
<input class="d-none" type="text" name="sort_col" value="{{ request()->sort_col }}">
|
||||
{{-- CONTACTS FILTER --}}
|
||||
@if (request()->user)
|
||||
<input class="d-none" name="user" type="text" value="{{ request()->user }}">
|
||||
@endif
|
||||
@if(request()->sort_way)
|
||||
<input class="d-none" type="text" name="sort_way" value="{{ request()->sort_way }}">
|
||||
@if (request()->sort_col)
|
||||
<input class="d-none" name="sort_col" type="text" value="{{ request()->sort_col }}">
|
||||
@endif
|
||||
@if(request()->rangefilter)
|
||||
<input class="d-none" type="text" name="rangefilter" value="{{ request()->rangefilter }}">
|
||||
@if (request()->sort_way)
|
||||
<input class="d-none" name="sort_way" type="text" value="{{ request()->sort_way }}">
|
||||
@endif
|
||||
@if(request()->group)
|
||||
<input class="d-none" type="text" name="group" value="{{ request()->group }}">
|
||||
@if (request()->rangefilter)
|
||||
<input class="d-none" name="rangefilter" type="text" value="{{ request()->rangefilter }}">
|
||||
@endif
|
||||
<input type="search" id="searchField" name="search" class="form-control"
|
||||
value="{{ request()->search }}" placeholder="{{ __('Vos mots clés ici..') }}"/>
|
||||
@if (request()->group)
|
||||
<input class="d-none" name="group" type="text" value="{{ request()->group }}">
|
||||
@endif
|
||||
<input class="form-control" id="searchField" name="search" type="search" value="{{ request()->search }}"
|
||||
placeholder="{{ __('Vos mots clés ici..') }}" />
|
||||
@if (request()->routeIs('bo.documents.*'))
|
||||
<select id="searchTag" name="tag" class="form-select">
|
||||
<option value="0">{{ __('Rechercher par tags') }}</option>
|
||||
@foreach($tags as $key => $tag)
|
||||
<option value="{{ $tag->id }}" @if (intval($searchTag) === $tag->id) selected @endif>{{ $tag->name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<select class="form-select" id="searchTag" name="tag">
|
||||
<option value="0">{{ __('Rechercher par tags') }}</option>
|
||||
@foreach ($tags as $key => $tag)
|
||||
<option value="{{ $tag->id }}" @if (intval($searchTag) === $tag->id) selected @endif>{{ $tag->name }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@endif
|
||||
<button type="submit" class="btn btn-primary" data-bs-toggle="tooltip" title="{{ __('Rechercher') }}">
|
||||
<button class="btn btn-primary" data-bs-toggle="tooltip" type="submit" title="{{ __('Rechercher') }}">
|
||||
<i class="fas fa-search"></i>
|
||||
</button>
|
||||
<button id="searchDelete" type="button" class="btn btn-danger" data-bs-toggle="tooltip"
|
||||
<button class="btn btn-danger" id="searchDelete" data-bs-toggle="tooltip" type="button"
|
||||
title="{{ __('Supprimer la recherche') }}">
|
||||
<i class="fas fa-backspace"></i>
|
||||
</button>
|
||||
@push('scripts')
|
||||
<script nonce="{{ $nonce }}">
|
||||
document.getElementById('searchDelete').addEventListener('click', function (e) {
|
||||
document.getElementById('searchField').value = '';
|
||||
if (document.getElementById('searchTag')) {
|
||||
document.getElementById('searchTag').selectedIndex = 0;
|
||||
}
|
||||
document.getElementById('searchForm').submit();
|
||||
});
|
||||
</script>
|
||||
<script nonce="{{ $nonce }}">
|
||||
document.getElementById('searchDelete').addEventListener('click', function(e) {
|
||||
document.getElementById('searchField').value = '';
|
||||
if (document.getElementById('searchTag')) {
|
||||
document.getElementById('searchTag').selectedIndex = 0;
|
||||
}
|
||||
document.getElementById('searchForm').submit();
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
17
resources/views/bo/pages/app-users/card.blade.php
Normal file
17
resources/views/bo/pages/app-users/card.blade.php
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="d-flex flex-column">
|
||||
<div class="d-flex flex-column mb-3">
|
||||
<a href="mailto:{{ $appUser->email }}">{{ $appUser->email }}</a>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="h5">{{ __('Dossiers accessibles') }}</div>
|
||||
<ul>
|
||||
@foreach ($appUser->directories as $directory)
|
||||
<li><a href="{{ route('bo.directories.edit', $directory) }}">{{ $directory->name['fr'] }}</a></li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
<div class="row">
|
||||
{{-- TITLE --}}
|
||||
<div class="col-12 mb-3">
|
||||
<fieldset class="border h-100 bg-white p-3">
|
||||
<legend>{{ __('Informations générales') }}</legend>
|
||||
@php
|
||||
$data = [
|
||||
'id' => 'document',
|
||||
'documents' => $documents,
|
||||
'directories' => $directories,
|
||||
'model' => $documentModel ?? null,
|
||||
'languages' => \App\Enums\Documents\LangEnum::toArray(),
|
||||
'csrf' => csrf_token(),
|
||||
];
|
||||
@endphp
|
||||
<div class="crud-document-input" data-json='@json($data)'></div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{{-- TAGS --}}
|
||||
<div class="col-12 mb-3">
|
||||
<fieldset class="border h-100 bg-white p-3">
|
||||
<legend>{{ __('Étiquettes') }}</legend>
|
||||
<div class="row">
|
||||
<div class="col-12 mb-3">
|
||||
@include('bo.partials.inputs.pivot-belongs-to-many', [
|
||||
'id' => 'app_userAuthorizedFolders',
|
||||
'name' => 'tags',
|
||||
'label' => __('Étiquettes associées'),
|
||||
'model' => $documentModel ?? null,
|
||||
'itemsList' => $tags,
|
||||
'itemLimit' => [0,5],
|
||||
'placeholder' => __('Recherchez une étiquette'),
|
||||
'helper' => __('Sélectionner des étiquettes parmis la liste (0 minimum et 5 maximum).'),
|
||||
])
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
{{-- STATUS --}}
|
||||
<div class="col-12 col-md-6 mb-3">
|
||||
<fieldset class="border h-100 bg-white p-3">
|
||||
<legend>{{ __('Publication') }}</legend>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@include('bo.partials.inputs.boolean-switch', [
|
||||
'id' => 'documentStatus',
|
||||
'name' => 'status',
|
||||
'label' => __('État de publication'),
|
||||
'model' => $documentModel ?? null,
|
||||
'helper' => __('Le document est publié ou non.')
|
||||
])
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@push('scripts')
|
||||
<script nonce="{{ $nonce }}">
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
// Submit button clone.
|
||||
const submit = document.getElementById('formSubmit')
|
||||
submitClone = document.getElementById('formSubmitClone');
|
||||
submitClone.addEventListener('click', (event) => {
|
||||
event.preventDefault();
|
||||
submit.click('');
|
||||
})
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
@ -3,9 +3,10 @@
|
|||
<thead>
|
||||
@php
|
||||
$cols = [
|
||||
'lastname' => __('Nom'),
|
||||
'email' => __('Email'),
|
||||
'phone' => __('Téléphone'),
|
||||
'lastname' => __('Nom'),
|
||||
'app_user_id' => __('Commercial'),
|
||||
'updated_at' => __('Mis à jour'),
|
||||
];
|
||||
@endphp
|
||||
|
|
@ -18,15 +19,18 @@
|
|||
@if ($contactModelList->count())
|
||||
@foreach ($contactModelList as $contactModel)
|
||||
<tr>
|
||||
<td class="align-middle">
|
||||
<span>{{ $contactModel->email }}</span>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<span>{{ $contactModel->phone }}</span>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<span>{{ $contactModel->lastname }} {{ $contactModel->firsname }}</span>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<a href="mailto:{{ $contactModel->email }}">{{ $contactModel->email }}</a>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<a href="tel:{{ $contactModel->phone }}">{{ $contactModel->phone }}</a>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<span>{{ $contactModel->appUser->lastname }} {{ $contactModel->appUser->firstname }}</span>
|
||||
</td>
|
||||
<td class="align-middle">
|
||||
<span>{{ $contactModel->updated_at->isoFormat('\L\e DD/MM/YYYY \à HH:mm') }}</span>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,33 @@
|
|||
</div>
|
||||
<div class="col d-flex justify-content-end align-items-center">
|
||||
<div class="justify-content-end ms-1">
|
||||
|
||||
<div class="input-group mb-3">
|
||||
<label class="input-group-text" for="filter-app-user-field">{{ __('Filtrer') }}</label>
|
||||
<select class="form-select" id="filter-app-user-field">
|
||||
<option @if (!request()->user) selected @endif>{{ __('Choisir un commercial') }}</option>
|
||||
@foreach ($appUsers as $appUser)
|
||||
<option data-id="{{ $appUser->id }}" @if (request()->user == $appUser->id) selected @endif>
|
||||
{{ __($appUser->lastname) }} {{ __($appUser->firstname) }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<button class="btn btn-outline-secondary" id="reset-app-user-filter" type="button">
|
||||
<i class="fa fa-delete-left"></i>
|
||||
</button>
|
||||
</div>
|
||||
@push('scripts')
|
||||
<script nonce="{{ $nonce ?? null }}">
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const appUserFilter = document.getElementById('filter-app-user-field');
|
||||
const appUserFilterReset = document.getElementById('reset-app-user-filter');
|
||||
appUserFilterReset.addEventListener('click', () => window.location = '{{ route('bo.contacts.index') }}')
|
||||
appUserFilter.addEventListener('change', (e) =>
|
||||
window.location = '{{ route('bo.contacts.index', ['user' => 'USER']) }}'.replace('USER', appUserFilter.options[
|
||||
appUserFilter.options.selectedIndex].dataset.id ?? '')
|
||||
)
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -40,12 +40,35 @@
|
|||
{{ $contactModel->updated_at->isoFormat('DD/MM/YYYY \à HH:mm') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
{{-- COMMERCIAL --}}
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-4 col-lg3"><span class="fw-bold">{{ __('Commercial') }}</span></div>
|
||||
<div class="col align-middle">
|
||||
<div class="accordion" id="appUserAccordion">
|
||||
<div class="accordion-item">
|
||||
<div class="accordion-header">
|
||||
<button class="accordion-button collapsed" data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseAppUser" type="button" aria-expanded="false"
|
||||
aria-controls="collapseAppUser">
|
||||
<span class="h5">{{ $contactModel->appUser->lastname }}
|
||||
{{ $contactModel->appUser->firstname }}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="accordion-collapse collapse" id="collapseAppUser" data-bs-parent="#appUserAccordion">
|
||||
<div class="accordion-body">
|
||||
@include('bo.pages.app-users.card', ['appUser' => $contactModel->appUser])
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{-- EMAIL --}}
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-4 col-lg3"><span class="fw-bold">{{ __('Email') }}</span><span
|
||||
class="fw-bold"> ({{ __('obligatoire') }})</span></div>
|
||||
<div class="col align-middle">
|
||||
<pre class="h5 text-bg-light p-3">{{ $contactModel->email }}</pre>
|
||||
<pre class="text-bg-light p-3"><a class="fs-5" href="mailto:{{ $contactModel->email }}">{{ $contactModel->email }}</a></pre>
|
||||
</div>
|
||||
</div>
|
||||
{{-- LASTNAME --}}
|
||||
|
|
@ -53,7 +76,7 @@
|
|||
<div class="col-12 col-md-4 col-lg3"><span class="fw-bold">{{ __('Nom') }}</span><span
|
||||
class="fw-bold"> ({{ __('obligatoire') }})</span></div>
|
||||
<div class="col align-middle">
|
||||
<pre class="text-bg-light p-3">{{ $contactModel->lastname }}</pre>
|
||||
<pre class="text-bg-light p-3"><span class="fs-5">{{ $contactModel->lastname }}</span></pre>
|
||||
</div>
|
||||
</div>
|
||||
{{-- FIRSTNAME --}}
|
||||
|
|
@ -61,14 +84,14 @@
|
|||
<div class="col-12 col-md-4 col-lg3"><span class="fw-bold">{{ __('Prénom') }}</span><span
|
||||
class="fw-bold"> ({{ __('obligatoire') }})</span></div>
|
||||
<div class="col align-middle">
|
||||
<pre class="text-bg-light p-3">{{ $contactModel->firstname }}</pre>
|
||||
<pre class="text-bg-light p-3"><span class="fs-5">{{ $contactModel->firstname }}</span></pre>
|
||||
</div>
|
||||
</div>
|
||||
{{-- PHONE --}}
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-4 col-lg3"><span class="fw-bold">{{ __('Téléphone') }}</span></div>
|
||||
<div class="col align-middle">
|
||||
<pre class="text-bg-light p-3">{{ $contactModel->phone }}</pre>
|
||||
<pre class="text-bg-light p-3"><a class="fs-4" href="tel:{{ $contactModel->phone }}">{{ $contactModel->phone }}</a></pre>
|
||||
</div>
|
||||
</div>
|
||||
{{-- NOTES --}}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue