Skip to content

Commit bf58099

Browse files
rexlManurexlManu
committed
Implemented users and files overview
1 parent 795f6ca commit bf58099

File tree

5 files changed

+90
-4
lines changed

5 files changed

+90
-4
lines changed

‎config/config.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,12 @@
132132
* Ether you define your models for references or customize the view.
133133
* Example: [App/Models/User::class]
134134
*/
135-
'reference-models' => []
135+
'reference-models' => [],
136+
/*
137+
* Should be listed?
138+
*/
139+
'list' => [
140+
'users' => false,
141+
'files' => false
142+
]
136143
];

‎resources/views/tickets/partials/files.blade.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<div style="height: 28.15vh; overflow-y: scroll">
2+
@foreach ($ticket->messages()->with('uploads')->get() as $message)
3+
@foreach($message->uploads()->get() as $upload)
4+
<div class="card mt-2">
5+
<div class="card-body">
6+
<div class="row justify-content-between align-items-center">
7+
<div class="col-12">
8+
<div class="row">
9+
<div class="col-12">
10+
<a href="{{ route('laravel-tickets.tickets.download', ['ticket' => $ticket, 'ticketUpload' => $upload]) }}">{{ basename($upload->path) }}</a>
11+
</div>
12+
<div class="col-12 ">
13+
<span class="text-muted">
14+
{{ $message->user->name }} {{ $upload->created_at->format(config('laravel-tickets.datetime-format')) }}
15+
</span>
16+
</div>
17+
</div>
18+
</div>
19+
</div>
20+
</div>
21+
</div>
22+
@endforeach
23+
@endforeach
24+
</div>

‎resources/views/tickets/partials/users.blade.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div style="height: 28.15vh; overflow-y: scroll">
2+
@foreach ($ticket->messages()->whereNotIn('user_id', [$ticket->user_id])->orderBy('created_at', 'asc')->get()->unique('user_id') as $message)
3+
<div class="card mt-2">
4+
<div class="card-body">
5+
<div class="row justify-content-between align-items-center">
6+
<div class="col-sm-4 col-md-4 col-lg-3 col-xl-2">
7+
<img class="rounded" height="48"
8+
src="https://avatars.r-services.eu/{{ $message->user->id }}">
9+
10+
</div>
11+
<div class="col-sm-8 col-md-8 col-lg-9 col-xl-10">
12+
<div class="row">
13+
<div class="col-12">
14+
{{ $message->user->name }}
15+
</div>
16+
<div class="col-12 ">
17+
<span
18+
class="text-muted">{{ $message->created_at->format(config('laravel-tickets.datetime-format')) }}</span>
19+
</div>
20+
</div>
21+
</div>
22+
</div>
23+
</div>
24+
</div>
25+
@endforeach
26+
</div>

‎resources/views/tickets/show.blade.php‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88
@if (config('laravel-tickets.open-ticket-with-answer') || $ticket->state !== 'CLOSED')
@@ -22,8 +22,13 @@
2222
@if (config('laravel-tickets.files'))
2323
<div class="custom-file mt-2">
2424
<input type="file" name="files[]" multiple
25-
class="custom-file-input @error('files') is-invalid @enderror" id="files">
25+
class="custom-file-input @error('files') is-invalid @enderror {{ empty($errors->get('files.*'))?'':'is-invalid' }}"
26+
id="files">
2627
<label class="custom-file-label" for="files">@lang('Choose files')</label>
28+
@foreach($errors->get('files.*') as $value)
29+
<div class="invalid-feedback">{{ $value[0] }}</div>
30+
@endforeach
31+
2732
@error('files')
2833
<div class="invalid-feedback">{{ $message }}</div>
2934
@enderror
@@ -74,7 +79,7 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files">
7479
{!! $messages->links('pagination::bootstrap-4') !!}
7580
</div>
7681
</div>
77-
<div class="col-12 col-md-4">
82+
<div class="col-12 col-sm-12 col-md-12 col-lg-4">
7883
<div class="card">
7984
<div class="card-header">
8085
@lang('Ticket overview')
@@ -117,6 +122,30 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files">
117122
@endif
118123
</div>
119124
</div>
125+
126+
<ul class="nav nav-pills mb mt-2" id="pills-tab">
127+
@if (config('laravel-tickets.list.users'))
128+
<li class="nav-item">
129+
<a class="nav-link" id="pills-users-tab" data-toggle="pill"
130+
href="#pills-users">@lang('Users')</a>
131+
</li>
132+
@endif
133+
@if (config('laravel-tickets.list.files'))
134+
<li class="nav-item">
135+
<a class="nav-link" id="pills-files-tab" data-toggle="pill"
136+
href="#pills-files">@lang('Files')</a>
137+
</li>
138+
@endif
139+
</ul>
140+
<div class="tab-content" id="pills-tabContent">
141+
<div class="tab-pane fade" id="pills-users">
142+
@include('laravel-tickets::tickets.partials.users', compact('ticket'))
143+
</div>
144+
<div class="tab-pane fade" id="pills-files">
145+
@include('laravel-tickets::tickets.partials.files', compact('ticket'))
146+
</div>
147+
</div>
148+
120149
</div>
121150
</div>
122151
@endsection

‎resources/views/tickets/supporters.blade.php‎

Whitespace-only changes.

0 commit comments

Comments
 (0)