Skip to content

Commit 98cdb32

Browse files
dbarzindbarzin
authored
Merge pull request #461 from dbarzin/dev
Dev
2 parents 9278b46 + 11a7789 commit 98cdb32

File tree

16 files changed

+155
-166
lines changed

16 files changed

+155
-166
lines changed

‎app/Console/Commands/Cleanup.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
namespace App\Console\Commands;
44

55
use App\Models\Control;
6-
use App\Models\Document;
76
use Carbon\Carbon;
87
use Illuminate\Console\Command;
9-
use Illuminate\Support\Facades\DB;
108
use Illuminate\Support\Facades\Log;
11-
use Illuminate\Support\Facades\File;
129

1310
class Cleanup extends Command
1411
{
@@ -48,7 +45,6 @@ public function handle()
4845
$durationInMonths = config('deming.cleanup-duration');
4946

5047
if ($durationInMonths > 0) {
51-
5248
Log::info("Cleanup {$durationInMonths} months");
5349

5450
// Compute date in the past
@@ -65,5 +61,4 @@ public function handle()
6561

6662
Log::info('Cleanup Done.');
6763
}
68-
6964
}

‎app/Console/Commands/SendNotifications.php‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -55,51 +55,51 @@ public function handle()
5555
' days.'
5656
);
5757

58-
// Loop on all users
59-
$users = User::all();
60-
61-
foreach ($users as $user) {
62-
// get controls
63-
$controls = Control::where('status', 0)
64-
->leftJoin('control_user', 'controls.id', '=', 'control_user.control_id')
65-
->leftJoin('control_user_group', 'controls.id', '=', 'control_user_group.control_id')
66-
->leftJoin('user_user_group', 'control_user_group.user_group_id', '=', 'user_user_group.user_group_id')
67-
->where(function ($query) use ($user) {
68-
$query->where('control_user.user_id', '=', $user->id)
69-
->orWhere('user_user_group.user_id', '=', $user->id);
70-
})
71-
->where('plan_date', '<=', Carbon::today()
72-
->addDays(intval(config('deming.notification.expire-delay')))->toDateString())
73-
->orderBy('plan_date')
74-
->get();
75-
76-
if ($controls->count() > 0) {
77-
App::setlocale($user->language);
78-
$txt = '';
79-
foreach ($controls as $control) {
80-
// Date
81-
$txt .= '<a href="' . url('/bob/show/'. $control->id) . '">';
82-
$txt .= '<b>';
83-
if (strtotime($control->plan_date) >= strtotime('today')) {
84-
$txt .= "<font color='green'>" . $control->plan_date .' </font>';
85-
} else {
86-
$txt .= "<font color='red'>" . $control->plan_date . '</font>';
87-
}
88-
$txt .= '</b>';
89-
$txt .= '</a>';
58+
// Loop on all users
59+
$users = User::all();
60+
61+
foreach ($users as $user) {
62+
// get controls
63+
$controls = Control::where('status', 0)
64+
->leftJoin('control_user', 'controls.id', '=', 'control_user.control_id')
65+
->leftJoin('control_user_group', 'controls.id', '=', 'control_user_group.control_id')
66+
->leftJoin('user_user_group', 'control_user_group.user_group_id', '=', 'user_user_group.user_group_id')
67+
->where(function ($query) use ($user) {
68+
$query->where('control_user.user_id', '=', $user->id)
69+
->orWhere('user_user_group.user_id', '=', $user->id);
70+
})
71+
->where('plan_date', '<=', Carbon::today()
72+
->addDays(intval(config('deming.notification.expire-delay')))->toDateString())
73+
->orderBy('plan_date')
74+
->get();
75+
76+
if ($controls->count() > 0) {
77+
App::setlocale($user->language);
78+
$txt = '';
79+
foreach ($controls as $control) {
80+
// Date
81+
$txt .= '<a href="' . url('/bob/show/'. $control->id) . '">';
82+
$txt .= '<b>';
83+
if (strtotime($control->plan_date) >= strtotime('today')) {
84+
$txt .= "<font color='green'>" . $control->plan_date .' </font>';
85+
} else {
86+
$txt .= "<font color='red'>" . $control->plan_date . '</font>';
87+
}
88+
$txt .= '</b>';
89+
$txt .= '</a>';
90+
// Space
91+
$txt .= ' &nbsp; - &nbsp; ';
92+
// Clauses
93+
foreach ($control->measures() as $measure) {
94+
$txt .= '<a href="' . url('/alice/show/' . $measure->id) . '">'. htmlentities($measure->clause) . '</a>';
9095
// Space
91-
$txt .= ' &nbsp; - &nbsp; ';
92-
// Clauses
93-
foreach ($control->measures() as $measure) {
94-
$txt .= '<a href="' . url('/alice/show/' . $measure->id) . '">'. htmlentities($measure->clause) . '</a>';
95-
// Space
96-
$txt .= ' &nbsp; ';
97-
}
98-
$txt .= ' - &nbsp; ';
99-
// Name
100-
$txt .= htmlentities($control->name);
101-
$txt .= "<br>\n";
96+
$txt .= ' &nbsp; ';
10297
}
98+
$txt .= ' - &nbsp; ';
99+
// Name
100+
$txt .= htmlentities($control->name);
101+
$txt .= "<br>\n";
102+
}
103103

104104
try {
105105
// Create a new PHPMailer instance
@@ -150,7 +150,7 @@ public function handle()
150150
Log::error("Message could not be sent. Mailer Error: {$mail->ErrorInfo}");
151151
}
152152
}
153-
}
153+
}
154154
} else {
155155
Log::info('SendNotifications - no notifications today');
156156
}

‎app/Exports/ActionsExport.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
namespace App\Exports;
44

55
use App\Models\Action;
6+
use Illuminate\Database\Eloquent\Builder;
67
use Maatwebsite\Excel\Concerns\FromQuery;
78
use Maatwebsite\Excel\Concerns\WithColumnWidths;
89
use Maatwebsite\Excel\Concerns\WithHeadings;
910
use Maatwebsite\Excel\Concerns\WithMapping;
1011
use Maatwebsite\Excel\Concerns\WithStyles;
1112
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
12-
use Illuminate\Database\Eloquent\Builder;
1313

1414
class ActionsExport implements FromQuery, WithMapping, WithHeadings, WithStyles, WithColumnWidths
1515
{

‎app/Exports/AttributesExport.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Exports;
44

5-
use App\Models\Attribute;
65
use Illuminate\Support\Facades\DB;
76
use Maatwebsite\Excel\Concerns\FromQuery;
87
use Maatwebsite\Excel\Concerns\ShouldAutoSize;

‎app/Http/Controllers/ActionController.php‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
use App\Exports\ActionsExport;
66
use App\Models\Action;
7+
use Carbon\Carbon;
78
use Illuminate\Http\Request;
89
use Illuminate\Http\Response;
910
use Illuminate\Support\Facades\Auth;
1011
use Illuminate\Support\Facades\DB;
1112
use Maatwebsite\Excel\Facades\Excel;
12-
use Carbon\Carbon;
13-
1413

1514
class ActionController extends Controller
1615
{
@@ -47,10 +46,10 @@ public function index(Request $request)
4746
$request->session()->forget('status');
4847
} else {
4948
$status = $request->session()->get('status');
50-
if ($status==null) {
51-
$status='0';
49+
if ($status === null) {
50+
$status = '0';
5251
$request->session()->put('status', $status);
53-
}
52+
}
5453
}
5554

5655
// Get scope filter
@@ -163,10 +162,11 @@ public function save(Request $request)
163162
$action->cause = request('cause');
164163
$action->remediation = request('remediation');
165164
$action->status = request('status');
166-
if ($action->status==0)
165+
if ($action->status === 0) {
167166
$action->close_date = null;
168-
else
167+
} else {
169168
$action->close_date = request('close_date');
169+
}
170170
$action->justification = request('justification');
171171
$action->update();
172172

@@ -515,31 +515,31 @@ public function chart(Request $request)
515515
{
516516
abort_if(
517517
! ((Auth::User()->role === 1) ||
518-
(Auth::User()->role === 2)) ,
518+
(Auth::User()->role === 2)),
519519
Response::HTTP_FORBIDDEN,
520520
'403 Forbidden'
521521
);
522522

523523
// Start
524524
$start = $request->get('start');
525-
if ($start==null) {
525+
if ($start === null) {
526526
$start = Carbon::now()->startOfYear()->toDateString();
527527
}
528528
// End
529529
$end = $request->get('start');
530-
if ($end==null) {
530+
if ($end === null) {
531531
$end = Carbon::now()->today()->toDateString();
532532
}
533533
// Get scope
534534
$scope = $request->get('scope');
535-
if ($scope!==null) {
536-
$request->session()->put('scope',$scope);
537-
}
538-
else {
539-
if ($request->has('scope'))
535+
if ($scope !== null) {
536+
$request->session()->put('scope', $scope);
537+
} else {
538+
if ($request->has('scope')) {
540539
$request->session()->forget('scope');
541-
else
540+
} else {
542541
$scope = $request->session()->get('scope');
542+
}
543543
}
544544

545545
// Get scopes
@@ -560,29 +560,29 @@ public function chart(Request $request)
560560
foreach ($types as $type) {
561561
$count_open = Action::where('type', $type)
562562
->where('status', 0)
563-
->where(function($query) use ($start) {
563+
->where(function ($query) use ($start) {
564564
$query->whereDate('close_date', '>', $start)
565-
->orWhereNull('close_date');
565+
->orWhereNull('close_date');
566566
})
567-
->where(function($query) use ($end) {
567+
->where(function ($query) use ($end) {
568568
$query->whereDate('close_date', '<', $end)
569-
->orWhereNull('close_date');
569+
->orWhereNull('close_date');
570570
})
571-
->when(!is_null($scope), function ($query) use ($scope) {
571+
->when(! is_null($scope), function ($query) use ($scope) {
572572
$query->where('scope', $scope);
573573
})
574574
->count();
575575
$count_closed = Action::where('type', $type)
576576
->whereIn('status', [1, 2])
577-
->where(function($query) use ($start) {
577+
->where(function ($query) use ($start) {
578578
$query->whereDate('close_date', '>', $start)
579-
->orWhereNull('close_date');
579+
->orWhereNull('close_date');
580580
})
581-
->where(function($query) use ($end) {
581+
->where(function ($query) use ($end) {
582582
$query->whereDate('close_date', '<', $end)
583-
->orWhereNull('close_date');
583+
->orWhereNull('close_date');
584584
})
585-
->when(!is_null($scope), function ($query) use ($scope) {
585+
->when(! is_null($scope), function ($query) use ($scope) {
586586
$query->where('scope', $scope);
587587
})
588588
->count();
@@ -595,18 +595,18 @@ public function chart(Request $request)
595595
}
596596
// Get Actions in scrope
597597
$actions = Action
598-
::where(function($query) use ($start) {
598+
::where(function ($query) use ($start) {
599599
$query->whereDate('close_date', '>', $start)
600-
->orWhereNull('close_date');
601-
})
602-
->where(function($query) use ($end) {
603-
$query->whereDate('close_date', '<', $end)
604-
->orWhereNull('close_date');
605-
})
606-
->when(!is_null($scope), function ($query) use ($scope) {
607-
$query->where('scope', $scope);
600+
->orWhereNull('close_date');
608601
})
609-
->get();
602+
->where(function ($query) use ($end) {
603+
$query->whereDate('close_date', '<', $end)
604+
->orWhereNull('close_date');
605+
})
606+
->when(! is_null($scope), function ($query) use ($scope) {
607+
$query->where('scope', $scope);
608+
})
609+
->get();
610610

611611
// Return
612612
return view('radar.actions')
@@ -616,5 +616,4 @@ public function chart(Request $request)
616616
->with('actions', $actions)
617617
->with('data', $data);
618618
}
619-
620619
}

‎app/Http/Controllers/ControlController.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,8 +1353,11 @@ public function make(Request $request)
13531353
abort_if($control === null, Response::HTTP_NOT_FOUND, '404 Not Found');
13541354

13551355
// Can make of validate control ?
1356-
abort_if(!($control->canMake() || $control->canValidate()),
1357-
Response::HTTP_FORBIDDEN, '403 Forbidden');
1356+
abort_if(
1357+
! ($control->canMake() || $control->canValidate()),
1358+
Response::HTTP_FORBIDDEN,
1359+
'403 Forbidden'
1360+
);
13581361

13591362
// get associated documents
13601363
$documents = DB::table('documents')->where('control_id', $id)->get();

‎app/Http/Controllers/DocumentController.php‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace App\Http\Controllers;
44

55
// Models
6-
use App\Models\Document;
76
use App\Models\Control;
7+
use App\Models\Document;
88
// Framework
99
use Carbon\Carbon;
1010
use Illuminate\Http\Request;
@@ -264,9 +264,7 @@ public function saveConfig(Request $request)
264264
$action = $request->input('action');
265265

266266
// Act
267-
if ($action =='save') {
268-
269-
267+
if ($action === 'save') {
270268
// Set duration
271269
config(['deming.cleanup-duration' => $duration]);
272270

@@ -276,35 +274,33 @@ public function saveConfig(Request $request)
276274

277275
// Message
278276
$messages = Collect('Configuration saved !');
279-
}
280-
else if (($action =='test')&&($duration>0)) {
277+
} elseif (($action === 'test') && ($duration > 0)) {
281278
$dateLimit = Carbon::now()->subMonths($duration)->toDateString();
282279

283280
$result = Control::cleanup($dateLimit, true);
284281

285282
$messages = Collect(
286-
[
283+
[
287284
"{$result['logCount']} log(s) will be deleted.",
288285
"{$result['documentCount']} document(s) will be deleted.",
289-
"{$result['controlCount']} control(s) will be deleted."
286+
"{$result['controlCount']} control(s) will be deleted.",
290287
]
291-
);
292-
}
293-
else if (($action =='delete')&&($duration>0)) {
288+
);
289+
} elseif (($action === 'delete') && ($duration > 0)) {
294290
$dateLimit = Carbon::now()->subMonths($duration)->toDateString();
295291

296292
$result = Control::cleanup($dateLimit, false);
297293

298294
$messages = Collect(
299-
[
295+
[
300296
"{$result['logCount']} log(s) deleted.",
301297
"{$result['documentCount']} document(s) deleted.",
302-
"{$result['controlCount']} control(s) deleted."
298+
"{$result['controlCount']} control(s) deleted.",
303299
]
304-
);
305-
}
306-
else
300+
);
301+
} else {
307302
$messages = null;
303+
}
308304

309305
// get previous fields
310306
$count = Document::count();

0 commit comments

Comments
 (0)
⚡