forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Jérémy Munsch 2021-12-01 13:46:24 +01:00
commit 6d6aa4eec0
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
resources/views/ticket/index.blade.php
View file

@ -97,7 +97,7 @@ $userPr = Auth::user()->sites ?? collect([]);
</td>
<td>{{ $ticket->site->name }}</td>
<td>
<span class="badge @if($ticket->type->equals(TicketType::bug())) bg-danger @elseif($ticket->type->equals(TicketType::evolution())) bg-success @else bg-primary @endif">{{ $ticket->type->label }}</span>
<span class="badge {{ $ticketClass }}">{{ $ticket->type->label }}</span>
</td>
<td>
@if ($ticket->file !== null)
@ -119,6 +119,18 @@ $userPr = Auth::user()->sites ?? collect([]);
$cls = (!$cls && $ticket->status == TicketStatus::production()) ? 'text-success' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::inprogress()) ? 'text-dark' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::waiting()) ? 'text-white bg-danger' : $cls;
$ticketClass = 'bg-primary';
switch($ticket->type) {
case TicketType::bug():
$ticketClass = 'bg-danger';
break;
case TicketType::evolution():
$ticketClass = 'bg-success';
break;
case TicketType::newsletter():
$ticketClass = 'bg-warning';
break;
}
@endphp
<td><span class="rounded {{ $cls }}">{{ $ticket->status->label }}</span></td>
<td>
@ -135,20 +147,6 @@ $userPr = Auth::user()->sites ?? collect([]);
<div class="modal-header">
<h5 class="modal-title" id="ticket{{ $ticket->id }}ModalLabel">
<b>{{ $ticket->site->name }}</b> - <u>{{__('Ticket n°') }} {{ $ticket->id }}</u>&nbsp;-&nbsp;
@php
$ticketClass = 'bg-primary';
switch($ticket->type) {
case TicketType::bug():
$ticketClass = 'bg-danger';
break;
case TicketType::evolution():
$ticketClass = 'bg-success';
break;
case TicketType::newsletter():
$ticketClass = 'bg-warning';
break;
}
@endphp
<span class="badge {{ $ticketClass }}">{{
$ticket->type->label
}}</span>
@ -168,7 +166,7 @@ $userPr = Auth::user()->sites ?? collect([]);
<td>
<a href="{{ route('ticket.show', $ticket->id) }}" class="btn btn-sm btn-outline-success">{{ __('Messages') }}</a>
@if(auth()->user()->isAdmin())
<a href="{{ route('ticket.edit', $ticket) }}" class="btn btn-sm btn-outline-primary">{{ __('Modifier') }}</a>
<a href="{{ route('ticket.edit', $ticket) }}" class="btn btn-sm btn-outline-primary">{{ __('Modifier') }}</a>
@endif
@can('delete', $ticket)
@if(!$ticket->status->equals(TicketStatus::archived()))