Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2021-12-01 13:47:31 +01:00
commit a6e112cbd7
No known key found for this signature in database
GPG key ID: 55196BEE445F6049

View file

@ -91,6 +91,27 @@ $userPr = Auth::user()->sites ?? collect([]);
</tr>
@endif
@foreach ($tickets as $ticket)
@php
$cls = $ticket->status == TicketStatus::archived() ? 'text-secondary' : null;
$cls = (!$cls && $ticket->status == TicketStatus::new()) ? 'text-danger' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::processed()) ? 'text-info' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::recette()) ? 'text-primary' : $cls;
$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
<tr>
<td scope="row">
{{ $ticket->id }}
@ -111,27 +132,6 @@ $userPr = Auth::user()->sites ?? collect([]);
</td>
<td>{{ Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i') }}</td>
<td>{{ $ticket->user->name }}</td>
@php
$cls = $ticket->status == TicketStatus::archived() ? 'text-secondary' : null;
$cls = (!$cls && $ticket->status == TicketStatus::new()) ? 'text-danger' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::processed()) ? 'text-info' : $cls;
$cls = (!$cls && $ticket->status == TicketStatus::recette()) ? 'text-primary' : $cls;
$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>
{{-- Modal du ticket --}}