Skip to content

Commit

Permalink
Implemented users and files overview
Browse files Browse the repository at this point in the history
  • Loading branch information
rexlManu committed Nov 19, 2020
1 parent 795f6ca commit bf58099
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 4 deletions.
9 changes: 8 additions & 1 deletion config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,12 @@
* Ether you define your models for references or customize the view.
* Example: [App/Models/User::class]
*/
'reference-models' => []
'reference-models' => [],
/*
* Should be listed?
*/
'list' => [
'users' => false,
'files' => false
]
];
24 changes: 24 additions & 0 deletions resources/views/tickets/partials/files.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<div style="height: 28.15vh; overflow-y: scroll">
@foreach ($ticket->messages()->with('uploads')->get() as $message)
@foreach($message->uploads()->get() as $upload)
<div class="card mt-2">
<div class="card-body">
<div class="row justify-content-between align-items-center">
<div class="col-12">
<div class="row">
<div class="col-12">
<a href="{{ route('laravel-tickets.tickets.download', ['ticket' => $ticket, 'ticketUpload' => $upload]) }}">{{ basename($upload->path) }}</a>
</div>
<div class="col-12 ">
<span class="text-muted">
{{ $message->user->name }} {{ $upload->created_at->format(config('laravel-tickets.datetime-format')) }}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach
@endforeach
</div>
26 changes: 26 additions & 0 deletions resources/views/tickets/partials/users.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div style="height: 28.15vh; overflow-y: scroll">
@foreach ($ticket->messages()->whereNotIn('user_id', [$ticket->user_id])->orderBy('created_at', 'asc')->get()->unique('user_id') as $message)
<div class="card mt-2">
<div class="card-body">
<div class="row justify-content-between align-items-center">
<div class="col-sm-4 col-md-4 col-lg-3 col-xl-2">
<img class="rounded" height="48"
src="https://avatars.r-services.eu/{{ $message->user->id }}">

</div>
<div class="col-sm-8 col-md-8 col-lg-9 col-xl-10">
<div class="row">
<div class="col-12">
{{ $message->user->name }}
</div>
<div class="col-12 ">
<span
class="text-muted">{{ $message->created_at->format(config('laravel-tickets.datetime-format')) }}</span>
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach
</div>
35 changes: 32 additions & 3 deletions resources/views/tickets/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@section('content')
<div class="row">
<div class="col-12 col-md-8">
<div class="col-12 col-sm-12 col-md-12 col-lg-8">
@includeWhen(session()->has('message'), 'laravel-tickets::alert', ['type' => 'info', 'message' => session()->get('message')])

@if (config('laravel-tickets.open-ticket-with-answer') || $ticket->state !== 'CLOSED')
Expand All @@ -22,8 +22,13 @@
@if (config('laravel-tickets.files'))
<div class="custom-file mt-2">
<input type="file" name="files[]" multiple
class="custom-file-input @error('files') is-invalid @enderror" id="files">
class="custom-file-input @error('files') is-invalid @enderror {{ empty($errors->get('files.*'))?'':'is-invalid' }}"
id="files">
<label class="custom-file-label" for="files">@lang('Choose files')</label>
@foreach($errors->get('files.*') as $value)
<div class="invalid-feedback">{{ $value[0] }}</div>
@endforeach

@error('files')
<div class="invalid-feedback">{{ $message }}</div>
@enderror
Expand Down Expand Up @@ -74,7 +79,7 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files">
{!! $messages->links('pagination::bootstrap-4') !!}
</div>
</div>
<div class="col-12 col-md-4">
<div class="col-12 col-sm-12 col-md-12 col-lg-4">
<div class="card">
<div class="card-header">
@lang('Ticket overview')
Expand Down Expand Up @@ -117,6 +122,30 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files">
@endif
</div>
</div>

<ul class="nav nav-pills mb mt-2" id="pills-tab">
@if (config('laravel-tickets.list.users'))
<li class="nav-item">
<a class="nav-link" id="pills-users-tab" data-toggle="pill"
href="#pills-users">@lang('Users')</a>
</li>
@endif
@if (config('laravel-tickets.list.files'))
<li class="nav-item">
<a class="nav-link" id="pills-files-tab" data-toggle="pill"
href="#pills-files">@lang('Files')</a>
</li>
@endif
</ul>
<div class="tab-content" id="pills-tabContent">
<div class="tab-pane fade" id="pills-users">
@include('laravel-tickets::tickets.partials.users', compact('ticket'))
</div>
<div class="tab-pane fade" id="pills-files">
@include('laravel-tickets::tickets.partials.files', compact('ticket'))
</div>
</div>

</div>
</div>
@endsection
Empty file.

0 comments on commit bf58099

Please sign in to comment.