Skip to content

Commit 35f3a2a

Browse files
dbarzindbarzin
committed
import error handling
1 parent ac4624e commit 35f3a2a

25 files changed

+65
-216
lines changed

‎app/Http/Controllers/MeasureImportController.php‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ function ($e) use ($model) {
8080
}
8181

8282
$errors = Collect();
83+
$messages = Collect();
8384

8485
try {
8586
// Get Filename
@@ -113,9 +114,9 @@ function ($e) use ($model) {
113114
// Clear database
114115
if ($request->has('clean')) {
115116
$this->clean();
116-
$errors->push('Database cleared');
117+
$messages->push('Database cleared');
117118
}
118-
$this->importFromFile($data, $errors);
119+
$this->importFromFile($data, $messages);
119120
}
120121
} finally {
121122
if ($request->file()) {
@@ -127,11 +128,12 @@ function ($e) use ($model) {
127128
if ($request->has('test')) {
128129
// Call command
129130
Artisan::call('deming:generate-tests');
130-
$errors->push('Test data generated');
131+
$messages->push('Test data generated');
131132
}
132133

133134
return back()
134135
->with('errors', $errors)
136+
->with('messages', $messages)
135137
->with('file', $fileName);
136138
}
137139

@@ -242,7 +244,7 @@ public function canImportFromFile(
242244
*/
243245
public function importFromFile(
244246
array $data,
245-
Collection $errors
247+
Collection $messages
246248
) {
247249
// Initialize counters
248250
$deleteCount = 0;
@@ -381,22 +383,22 @@ public function importFromFile(
381383
}
382384

383385
if ($insertCount > 0) {
384-
$errors->push($insertCount . ' lines inserted');
386+
$messages->push($insertCount . ' lines inserted');
385387
}
386388
if ($updateCount > 0) {
387-
$errors->push($updateCount . ' lines updated');
389+
$messages->push($updateCount . ' lines updated');
388390
}
389391
if ($deleteCount > 0) {
390-
$errors->push($deleteCount . ' lines deleted');
392+
$messages->push($deleteCount . ' lines deleted');
391393
}
392394
if ($deleteControlCount > 0) {
393-
$errors->push($deleteControlCount . ' controls deleted');
395+
$messages->push($deleteControlCount . ' controls deleted');
394396
}
395397
if ($deleteDocumentCount > 0) {
396-
$errors->push($deleteDocumentCount . ' documents deleted');
398+
$messages->push($deleteDocumentCount . ' documents deleted');
397399
}
398400
if ($newDomainCount > 0) {
399-
$errors->push($newDomainCount . ' new domains created');
401+
$messages->push($newDomainCount . ' new domains created');
400402
}
401403
}
402404

‎resources/views/actions/close.blade.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,7 @@
1212
<div class="p-3">
1313
<div data-role="panel" data-title-caption="{{ trans('cruds.action.close') }}" data-collapsible="true" data-title-icon="<span class='mif-pending-actions'></span>">
1414

15-
@if (count($errors))
16-
<div class= “form-group”>
17-
<div class= “alert alert-danger”>
18-
<ul>
19-
@foreach ($errors->all() as $error)
20-
<li>{{ $error }}</li>
21-
@endforeach
22-
</ul>
23-
</div>
24-
</div>
25-
@endif
15+
@include('partials.errors')
2616

2717
<form method="POST" action="/action/close">
2818
@csrf

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,7 @@
1111

1212
<div data-role="panel" data-title-caption="{{ trans('cruds.action.create') }}" data-collapsible="true" data-title-icon="<span class='mif-pending-actions'></span>">
1313

14-
@if (count($errors))
15-
<div class= “form-group”>
16-
<div class= “alert alert-danger”>
17-
<ul>
18-
@foreach ($errors->all() as $error)
19-
<li>{{ $error }}</li>
20-
@endforeach
21-
</ul>
22-
</div>
23-
</div>
24-
@endif
14+
@include('partials.errors')
2515

2616
<form method="POST" action="/action/store">
2717
@csrf

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@
1111

1212
<div data-role="panel" data-title-caption="{{ trans('cruds.action.edit') }}" data-collapsible="true" data-title-icon="<span class='mif-pending-actions'></span>">
1313

14-
@if (count($errors))
15-
<div class="remark alert">
16-
<span class="mif-report icon"></span>
17-
@foreach ($errors->all() as $error)
18-
{{ $error }}<br>
19-
@endforeach
20-
</div>
21-
@endif
14+
@include('partials.errors')
2215

2316
<form method="POST" action="/action/save">
2417
@csrf

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,9 @@
99
}
1010
</style>
1111

12-
<div data-role="panel" data-title-caption="{{ trans('cruds.action.show') }}" data-collapsible="true" data-title-icon="<span class='mif-pending-actions'></span>">
12+
<div data-role="panel" data-title-caption="{{ trans('cruds.action.show') }}" data-collapsible="true" data-title-icon="<span class='mif-pending-actions'></span>">
1313

14-
@if (count($errors))
15-
<div class= “form-group”>
16-
<div class= “alert alert-danger”>
17-
<ul>
18-
@foreach ($errors->all() as $error)
19-
<li>{{ $error }}</li>
20-
@endforeach
21-
</ul>
22-
</div>
23-
</div>
24-
@endif
14+
@include('partials.errors')
2515

2616
<form method="POST" action="/action/update">
2717
@csrf

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,8 @@
22

33
@section("content")
44
<div data-role="panel" data-title-caption="{{ trans('cruds.attribute.add') }}" data-collapsible="true" data-title-icon="<span class='mif-tags'></span>">
5-
@if (count($errors))
6-
<div class="grid">
7-
<div class="cell-3 bg-red fg-white">
8-
<ul>
9-
@foreach ($errors->all() as $error)
10-
<li>{{ $error }}</li>
11-
@endforeach
12-
</ul>
13-
</div>
14-
</div>
15-
@endif
5+
6+
@include('partials.errors')
167

178
<form method="POST" action="/attributes">
189
@csrf

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
@section("content")
44
<div data-role="panel" data-title-caption="{{ trans('cruds.attribute.edit') }}" data-collapsible="true" data-title-icon="<span class='mif-tags'></span>">
55

6-
@if (count($errors))
7-
<div class="remark alert">
8-
<span class="mif-report icon"></span>
9-
@foreach ($errors->all() as $error)
10-
{{ $error }}<br>
11-
@endforeach
12-
</div>
13-
@endif
6+
@include('partials.errors')
147

158
<form method="POST" action="/attributes/{{ $attribute->id }}">
169
@method("PATCH")

‎resources/views/config.blade.php‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,7 @@
33
@section("content")
44
<div data-role="panel" data-title-caption="{{ trans('cruds.config.notifications.title') }}" data-collapsible="true" data-title-icon="<span class='mif-alarm'></span>">
55

6-
@if (count($errors))
7-
<div class="remark alert">
8-
<span class="mif-report icon"></span>
9-
@foreach ($errors->all() as $error)
10-
{{ $error }}<br>
11-
@endforeach
12-
</div>
13-
@endif
14-
15-
@if ($message!=null)
16-
<div class="remark alert">
17-
<span class="mif-report icon"></span>
18-
{{ $message }}
19-
</div>
20-
@endif
6+
@include('partials.errors')
217

228
<form method="POST" action="/config/save" enctype="multipart/form-data">
239
@csrf

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22

33
@section("content")
44
<div data-role="panel" data-title-caption='{{ trans("cruds.control.create")}}' data-collapsible="true" data-title-icon="<span class='mif-paste'></span>">
5-
@if (count($errors))
6-
<div class="remark alert">
7-
<span class="mif-report icon"></span>
8-
@foreach ($errors->all() as $error)
9-
{{ $error }}<br>
10-
@endforeach
11-
</div>
12-
@endif
5+
6+
@include('partials.errors')
137

148
<form method="POST" action="/bob/store">
159
@csrf

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
@section("content")
44
<div data-role="panel" data-title-caption='{{ trans("cruds.control.edit")}}' data-collapsible="true" data-title-icon="<span class='mif-paste'></span>">
55

6-
@if (count($errors))
7-
<div class="remark alert">
8-
<span class="mif-report icon"></span>
9-
@foreach ($errors->all() as $error)
10-
{{ $error }}<br>
11-
@endforeach
12-
</div>
13-
@endif
6+
@include('partials.errors')
147

158
<form method="POST" action="/bob/save">
169
@csrf

0 commit comments

Comments
 (0)
⚡