Skip to content

Commit 8a6c2c8

Browse files
dbarzindbarzin
authored
Merge pull request #382 from dbarzin/dev
Dev
2 parents e955056 + 3fb43bf commit 8a6c2c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+84
-48
lines changed

‎app/Http/Controllers/ControlController.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -727,14 +727,12 @@ public function destroy(int $id)
727727
// Control not found
728728
abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
729729

730-
// Delete files
731-
$documents = Document::select('id')->where('control_id', $id)->get();
732-
foreach ($documents as $doc) {
733-
unlink(storage_path('docs/' . $doc->id));
730+
// Delete documents
731+
foreach($control->documents()->get() as $document) {
732+
\Log::debug(storage_path('docs/' . $document->id));
733+
unlink(storage_path('docs/' . $document->id));
734734
}
735-
736-
// Delete associated documents
737-
Document::where('control_id', $id)->delete();
735+
$control->documents()->delete();
738736

739737
// Previous control must point to next control
740738
Control::where('next_id', $control->id)
@@ -1256,6 +1254,10 @@ public function unplan(Request $request)
12561254
$control->measures()->detach();
12571255

12581256
// Delete documents
1257+
foreach($control->documents()->get() as $document) {
1258+
\Log::debug(storage_path('docs/' . $document->id));
1259+
unlink(storage_path('docs/' . $document->id));
1260+
}
12591261
$control->documents()->delete();
12601262

12611263
// Delete control

‎docs/config.fr.md‎

Lines changed: 14 additions & 0 deletions

‎docs/config.md‎

Lines changed: 17 additions & 0 deletions

‎docs/images/a1.fr.png‎

-134 KB

‎docs/images/a1.png‎

-118 KB

‎docs/images/a2.fr.png‎

-14.9 KB

‎docs/images/a2.png‎

-33.9 KB

‎resources/views/groups/create.blade.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
@csrf
1010
<div class="grid">
1111
<div class="row">
12-
<div class="cell-1">
12+
<div class="cell-lg-1 cell-md-2">
1313
<label>{{ trans('cruds.group.fields.name') }}</label>
1414
</div>
15-
<div class="cell-2">
15+
<div class="cell-lg-4 cell-md-6">
1616
<input type="text" class="input {{ $errors->has('name') ? 'is-danger' : ''}}" name="name" value="{{ old('name') }}" maxsize='90' required>
1717
</div>
1818
</div>
1919
<div class="row">
20-
<div class="cell-1">
20+
<div class="cell-lg-1 cell-md-2">
2121
<label>{{ trans('cruds.group.fields.description') }}</label>
2222
</div>
23-
<div class="cell-6">
23+
<div class="cell-lg-8 cell-md-10">
2424
<textarea name="description" rows="5" data-role="textarea" data-clear-button="false">{{ old('description') }}</textarea>
2525
</div>
2626
</div>
2727
<div class="row">
28-
<div class="cell-1">
28+
<div class="cell-lg-1 cell-md-2">
2929
<label>{{ trans('cruds.group.fields.users') }}</label>
3030
</div>
31-
<div class="cell-6">
31+
<div class="cell-lg-8 cell-md-10">
3232
<select data-role="select" name="users[]" multiple>
3333
@foreach($all_users as $user)
3434
<option value="{{ $user->id }}">
@@ -40,10 +40,10 @@
4040
</div>
4141

4242
<div class="row">
43-
<div class="cell-1">
44-
<strong>{{ trans('cruds.group.fields.controls') }}</strong>
43+
<div class="cell-lg-1 cell-md-2">
44+
<label>{{ trans('cruds.group.fields.controls') }}</label>
4545
</div>
46-
<div class="cell-6">
46+
<div class="cell-lg-8 cell-md-10">
4747
<select data-role="select" data-filter="true" name="controls[]" id="controls" multiple>
4848
@foreach($all_controls as $control)
4949
<option value="{{ $control->id }}" {{ (in_array($control->id, old('controls', []))) ? 'selected' : '' }}>{{ $control->name }}</option>
@@ -58,7 +58,7 @@
5858

5959
</div>
6060
<div class="row">
61-
<div class="cell-4">
61+
<div class="cell-lg-8 cell-md-10">
6262
<button type="submit" class="button success">
6363
<span class="mif-floppy-disk2"></span>
6464
&nbsp;

‎resources/views/groups/edit.blade.php‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,28 @@
1111
<div class="grid">
1212

1313
<div class="row">
14-
<div class="cell-1">
14+
<div class="cell-lg-1 cell-md-2">
1515
<label>{{ trans('cruds.group.fields.name') }}</label>
1616
</div>
17-
<div class="cell-3">
17+
<div class="cell-lg-4 cell-md-6">
1818
<input type="text" class="input {{ $errors->has('name') ? 'is-danger' : ''}}" name="name" value="{{ $errors->has('login') ? old('login') : $group->name }}" maxlength='90' required>
1919
</div>
2020
</div>
2121

2222
<div class="row">
23-
<div class="cell-1">
23+
<div class="cell-lg-1 cell-md-2">
2424
<label>{{ trans('cruds.group.fields.description') }}</label>
2525
</div>
26-
<div class="cell-6">
26+
<div class="cell-lg-8 cell-md-10">
2727
<textarea name="description" rows="5" data-role="textarea" data-clear-button="false">{{ $errors->has('description') ? old('description') : $group->description }}</textarea>
2828
</div>
2929
</div>
3030

31-
</div>
3231
<div class="row">
33-
<div class="cell-1">
32+
<div class="cell-lg-1 cell-md-2">
3433
<strong>{{ trans('cruds.group.fields.users') }}</strong>
3534
</div>
36-
<div class="cell-6">
35+
<div class="cell-lg-8 cell-md-10">
3736
<select data-role="select" name="users[]" id="users" multiple>
3837
@foreach($all_users as $user)
3938
<option value="{{ $user->id }}" {{ (in_array($user->id, old('users', [])) || $group->users->contains($user->id)) ? 'selected' : '' }}>{{ $user->name }}</option>
@@ -43,10 +42,10 @@
4342
</div>
4443

4544
<div class="row">
46-
<div class="cell-1">
45+
<div class="cell-lg-1 cell-md-2">
4746
<strong>{{ trans('cruds.group.fields.controls') }}</strong>
4847
</div>
49-
<div class="cell-6">
48+
<div class="cell-lg-8 cell-md-10">
5049
<select data-role="select" data-filter="true" name="controls[]" id="controls" multiple>
5150
@foreach($all_controls as $control)
5251
<option value="{{ $control->id }}" {{ (in_array($control->id, old('controls', [])) || $group->controls->contains($control->id)) ? 'selected' : '' }}>{{ $control->name }}</option>
@@ -56,22 +55,26 @@
5655
</div>
5756

5857
<div class="row">
59-
<div class="cell-1">
58+
<div class="cell-lg-1 cell-md-2">
6059
</div>
6160
</div>
6261

63-
<button type="submit" class="button success">
64-
<span class="mif-floppy-disk2"></span>
65-
&nbsp;
66-
{{ trans('common.save') }}
67-
</button>
68-
&nbsp;
69-
</form>
70-
<form action="/groups/{{ $group->id }}">
71-
<button type="submit" class="button">
72-
<span class="mif-cancel"></span>
73-
&nbsp;
74-
{{ trans('common.cancel') }}</button>
75-
</form>
62+
<div class="row">
63+
<div class="cell-lg-12 cell-md-12">
64+
65+
<button type="submit" class="button success">
66+
<span class="mif-floppy-disk2"></span>
67+
&nbsp;
68+
{{ trans('common.save') }}
69+
</button>
70+
&nbsp;
71+
<a href="/groups/{{ $group->id }}" class="button">
72+
<span class="mif-cancel"></span>
73+
&nbsp;
74+
{{ trans('common.cancel') }}</button>
75+
</a>
76+
</div>
77+
</div>
78+
</form>
7679
</div>
7780
@endsection

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@
66
<div class="grid">
77

88
<div class="row">
9-
<div class="cell-1">
9+
<div class="cell-lg-1 cell-md-2">
1010
<strong>{{ trans('cruds.group.fields.name') }}</strong>
1111
</div>
12-
<div class="cell-6">
12+
<div class="cell-lg-6 cell-md-10">
1313
{{ $group->name }}
1414
</div>
1515
</div>
1616

1717
<div class="row">
18-
<div class="cell-1">
18+
<div class="cell-lg-1 cell-md-2">
1919
<strong>{{ trans('cruds.group.fields.description') }}</strong>
2020
</div>
21-
<div class="cell-8">
21+
<div class="cell-lg-10 cell-md-10">
2222
{!! $group->description !!}
2323
</div>
2424
</div>
2525

2626
<div class="row">
27-
<div class="cell-1">
27+
<div class="cell-lg-1 cell-md-2">
2828
<strong>{{ trans('cruds.group.fields.users') }}</strong>
2929
</div>
3030
</div>
3131
<div class="row">
32-
<div class="cell-8">
32+
<div class="cell-lg-12 cell-md-12">
3333
<table class="table striped row-hover cell-border row-border"
3434
data-role="table"
3535
data-rows="25"
@@ -74,7 +74,7 @@
7474
</div>
7575
</div>
7676
<div class="row">
77-
<div class="cell-8">
77+
<div class="cell-lg-12 cell-md-12">
7878
<table class="table striped row-hover cell-border row-border"
7979
data-role="table"
8080
data-rows="25"
@@ -134,7 +134,7 @@
134134
</div>
135135

136136
<div class="row">
137-
<div class="cell-6">
137+
<div class="cell-lg-6 cell-md-10">
138138
<form class="d-inline" action="/groups/{{ $group->id }}/edit">
139139
@if (Auth::User()->role==1)
140140
<button class="button primary">

0 commit comments

Comments
 (0)
⚡