Skip to content

Commit 8957a08

Browse files
dbarzindbarzin
authored
Merge pull request #439 from dbarzin/dev
Dev
2 parents ffba8bc + a208884 commit 8957a08

File tree

11 files changed

+1059
-1048
lines changed

11 files changed

+1059
-1048
lines changed

‎composer.lock‎

Lines changed: 94 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 108 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/assets/app-BB6JL1-8.js‎

Lines changed: 0 additions & 722 deletions
This file was deleted.

‎public/build/assets/app-BB6JL1-8.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎public/build/assets/app-CbUqJ3MC.css‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/assets/app-DHSnIrJf.js‎

Lines changed: 731 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/assets/app-DHSnIrJf.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/assets/app-vux9B2bk.css‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎public/build/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"resources/css/app.css": {
3-
"file": "assets/app-vux9B2bk.css",
3+
"file": "assets/app-CbUqJ3MC.css",
44
"src": "resources/css/app.css",
55
"isEntry": true
66
},
77
"resources/js/app.js": {
8-
"file": "assets/app-BB6JL1-8.js",
8+
"file": "assets/app-DHSnIrJf.js",
99
"name": "app",
1010
"src": "resources/js/app.js",
1111
"isEntry": true,

‎resources/views/logs/history.blade.php‎

Lines changed: 117 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,132 @@
11
@extends('layout')
22
@section('content')
3-
<div class="table-responsive" data-role="panel" data-title-caption="{{ trans('cruds.log.title') }}" data-collapsible="false" data-title-icon="<span class='mif-log-file'></span>">
4-
5-
<table class="table table-border cell-border">
6-
<tbody>
7-
<tr>
8-
<th style="width: 150px;">
9-
{{ trans('cruds.log.subject_id') }}
10-
</th>
11-
<td>
12-
@if ($auditLogs->first()->subject_type=='App\\Models\\Measure')
13-
<a href="/alice/show/{{ $auditLogs->first()->subject_id }} ">
14-
{{ $auditLogs->first()->subject_id }}
15-
</a>
16-
@elseif ($auditLogs->first()->subject_type=='App\\Models\\Control')
17-
<a href="/bob/show/{{ $auditLogs->first()->subject_id }} ">
18-
{{ $auditLogs->first()->subject_id }}
19-
</a>
20-
@elseif ($auditLogs->first()->subject_type=='App\\Models\\Action')
21-
<a href="/action/show/{{ $auditLogs->first()->subject_id }} ">
22-
{{ $auditLogs->first()->subject_id }}
23-
</a>
24-
@elseif ($auditLogs->first()->subject_type=='App\\Models\\User')
25-
<a href="/user/show/{{ $auditLogs->first()->subject_id }} ">
26-
{{ $auditLogs->first()->subject_id }}
27-
</a>
28-
@else
3+
<div class="table-responsive" data-role="panel" data-title-caption="{{ trans('cruds.log.title') }}" data-collapsible="false" data-title-icon="<span class='mif-log-file'></span>">
4+
<table class="table table-border cell-border">
5+
<tbody>
6+
<tr>
7+
<th style="width: 150px;">
8+
{{ trans('cruds.log.subject_id') }}
9+
</th>
10+
<td>
11+
@if ($auditLogs->first()->subject_type=='App\\Models\\Measure')
12+
<a href="/alice/show/{{ $auditLogs->first()->subject_id }} ">
13+
{{ $auditLogs->first()->subject_id }}
14+
</a>
15+
@elseif ($auditLogs->first()->subject_type=='App\\Models\\Control')
16+
<a href="/bob/show/{{ $auditLogs->first()->subject_id }} ">
17+
{{ $auditLogs->first()->subject_id }}
18+
</a>
19+
@elseif ($auditLogs->first()->subject_type=='App\\Models\\Action')
20+
<a href="/action/show/{{ $auditLogs->first()->subject_id }} ">
2921
{{ $auditLogs->first()->subject_id }}
22+
</a>
23+
@elseif ($auditLogs->first()->subject_type=='App\\Models\\User')
24+
<a href="/user/show/{{ $auditLogs->first()->subject_id }} ">
25+
{{ $auditLogs->first()->subject_id }}
26+
</a>
27+
@else
28+
{{ $auditLogs->first()->subject_id }}
29+
@endif
30+
</td>
31+
</tr>
32+
<tr>
33+
<th>
34+
id
35+
</th>
36+
@foreach($auditLogs as $auditLog)
37+
<td>
38+
<a href="/logs/show/{{ $auditLog->id }}">
39+
{{ $auditLog->id }}
40+
</a>
41+
</td>
42+
@endforeach
43+
</tr>
44+
<tr>
45+
<th>
46+
{{ trans('cruds.log.action') }}
47+
</th>
48+
@foreach($auditLogs as $auditLog)
49+
<td>
50+
{{ $auditLog->description }}
51+
</td>
52+
@endforeach
53+
</tr>
54+
<tr>
55+
<th>
56+
{{ trans('cruds.log.user') }}
57+
</th>
58+
@foreach($auditLogs as $auditLog)
59+
<td>
60+
<a href="/user/{{ $auditLog->user_id }}">
61+
{{ $auditLog->name }}
62+
</a>
63+
</td>
64+
@endforeach
65+
</tr>
66+
@foreach($auditLog->properties as $key => $value)
67+
<tr>
68+
<th>[{{ $key }}]</th>
69+
@php $previous = null; @endphp
70+
@foreach($auditLogs as $auditLog2)
71+
@php
72+
if (property_exists($auditLog2->properties,$key))
73+
$value = $auditLog2->properties->{$key};
74+
else
75+
$value = null;
76+
@endphp
77+
<td {!! (($loop->first)||($value==$previous)) ? "" : "class='info'" !!}>
78+
@if ((gettype($value)=="string")&&(strlen($value)>100))
79+
{{ substr($value,0,100) }}
80+
@elseif ((gettype($value)=="array"))
81+
@foreach($value as $v)
82+
{{ $v->name }}
83+
@endforeach
84+
@else
85+
{{ $value }}
3086
@endif
3187
</td>
32-
</tr>
33-
<tr>
34-
<th>
35-
id
36-
</th>
37-
@foreach($auditLogs as $auditLog)
38-
<td>
39-
<a href="/logs/show/{{ $auditLog->id }}">
40-
{{ $auditLog->id }}
41-
</a>
42-
</td>
43-
@endforeach
44-
</tr>
45-
<tr>
46-
<th>
47-
{{ trans('cruds.log.action') }}
48-
</th>
49-
@foreach($auditLogs as $auditLog)
50-
<td>
51-
{{ $auditLog->description }}
52-
</td>
53-
@endforeach
54-
</tr>
55-
<tr>
56-
<th>
57-
{{ trans('cruds.log.user') }}
58-
</th>
59-
@foreach($auditLogs as $auditLog)
60-
<td>
61-
<a href="/user/{{ $auditLog->user_id }}">
62-
{{ $auditLog->name }}
63-
</a>
64-
</td>
88+
@php $previous = $value; @endphp
6589
@endforeach
66-
</tr>
67-
@foreach($auditLog->properties as $key => $value)
68-
<tr>
69-
<th>[{{ $key }}]</th>
70-
@php $previous = null; @endphp
71-
@foreach($auditLogs as $auditLog2)
72-
@php
73-
if (property_exists($auditLog2->properties,$key))
74-
$value = $auditLog2->properties->{$key};
75-
else
76-
$value = null;
77-
@endphp
78-
<td {!! (($loop->first)||($value==$previous)) ? "" : "class='info'" !!}>
79-
@if ((gettype($value)=="string")&&(strlen($value)>100))
80-
{{ substr($value,0,100) }}
81-
@elseif ((gettype($value)=="array"))
82-
@foreach($value as $v)
83-
{{ $v->name }}
84-
@endforeach
85-
@else
86-
{{ $value }}
87-
@endif
88-
</td>
89-
@php $previous = $value; @endphp
90-
@endforeach
91-
</tr>
90+
</tr>
91+
@endforeach
92+
<tr>
93+
<th>
94+
{{ trans('cruds.log.host') }}
95+
</th>
96+
@foreach($auditLogs as $auditLog)
97+
<td>
98+
{{ $auditLog->host }}
99+
</td>
92100
@endforeach
93-
<tr>
94-
<th>
95-
{{ trans('cruds.log.host') }}
96-
</th>
97-
@foreach($auditLogs as $auditLog)
98-
<td>
99-
{{ $auditLog->host }}
100-
</td>
101-
@endforeach
102-
</tr>
103-
<tr>
104-
<th>
105-
{{ trans('cruds.log.timestamp') }}
106-
</th>
107-
@foreach($auditLogs as $auditLog)
108-
<td>
109-
{{ $auditLog->created_at }}
110-
</td>
111-
@endforeach
112-
</tr>
113-
</tbody>
114-
</table>
115-
<div>
116-
<br>
117-
<a class="button btn-default" href="/logs">
118-
{{ trans('common.cancel') }}
119-
</a>
120-
</div>
101+
</tr>
102+
<tr>
103+
<th>
104+
{{ trans('cruds.log.timestamp') }}
105+
</th>
106+
@foreach($auditLogs as $auditLog)
107+
<td>
108+
{{ $auditLog->created_at }}
109+
</td>
110+
@endforeach
111+
</tr>
112+
</tbody>
113+
</table>
114+
</div>
115+
<div>
116+
<br>
117+
<a class="button btn-default" href="/logs">
118+
{{ trans('common.cancel') }}
119+
</a>
121120
</div>
122121
@endsection
123122
@section('style')
124123
<style>
125-
/* Style to enable horizontal scroll */
126124
.table-responsive {
127-
overflow-x: auto;
125+
overflow-x: auto !important;
126+
border: 1px solid red; /* Pour voir les limites du conteneur */
127+
}
128+
.table {
129+
min-width: max-content;
128130
}
129131
</style>
130132
@endsection

0 commit comments

Comments
 (0)
⚡