Merge pull request #111 from dbarzin/dev

Dev
dbarzin · Jul 28, 2024 · e15ec79 · e15ec79
2 parents d40cab1 + 0590b32
commit e15ec79
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 56 deletions.
diff --git a/app/Calendar.php b/app/Calendar.php
@@ -116,6 +116,6 @@ public function __toString()
     public function addEvent($txt, $date, $days = 1, $color = '', $id = null)
     {
         $color = $color ? ' ' . $color : $color;
-        $this->events[] = [$txt, $date, $days, $color, $id];
+        $this->events[] = [$txt === null ? '&nbsp' : $txt, $date, $days, $color, $id];
     }
 }
diff --git a/app/Console/Commands/SendNotifications.php b/app/Console/Commands/SendNotifications.php
@@ -104,7 +104,15 @@ public function handle()
                     $message = $txt;
 
                     // Send mail
-                    if (mail($to_email, '=?UTF-8?B?' . base64_encode($subject) . '?=', utf8_decode($message), implode("\r\n", $headers), '-f ' . $to_email)) {
+                    if (mail(
+                        $to_email,
+                        '=?UTF-8?B?' . base64_encode($subject) . '?=',
+                        mb_convert_encoding($message, 'UTF-8', 'ISO-8859-1'),
+                        implode("\r\n", $headers),
+                        '-f ' .
+                        $to_email
+                    )
+                    ) {
                         Log::debug('Mail sent to '.$to_email);
                     } else {
                         Log::debug('Email sending fail.');

diff --git a/app/Exports/DomainsExport.php b/app/Exports/DomainsExport.php
@@ -24,6 +24,8 @@ public function headings(): array
 
     public function styles(Worksheet $worksheet)
     {
+        // fix unused
+        $worksheet;
         return [
             // Style the first row as bold text.
             1 => ['font' => ['bold' => true]],

diff --git a/app/Exports/MeasuresExport.php b/app/Exports/MeasuresExport.php
@@ -33,6 +33,8 @@ public function headings(): array
 
     public function styles(Worksheet $sheet)
     {
+        // fix unused
+        $sheet;
         return [
             // Style the first row as bold text.
             1 => ['font' => ['bold' => true],

diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -450,7 +450,7 @@ public function edit(int $id)
         // get all attributes
         $values = [];
         $attributes = DB::table('measures')->select('attributes')->get();
-        foreach ($attributes as $id => $key) {
+        foreach ($attributes as $key) {
             foreach (explode(' ', $key->attributes) as $value) {
                 array_push($values, $value);
             }
@@ -1068,21 +1068,17 @@ public function make(Request $request)
         $request->session()->put('control', $id);
 
         // compute next control date
-        $next_date = date(
-            'Y-m-d',
-            strtotime(
-                $control->periodicity . ' months',
-                strtotime($control->plan_date)
-            )
-        );
-
-        // compute next control date
-        $next_date =
-            $control->next_date === null
-                ? \Carbon\Carbon::createFromFormat('Y-m-d', $control->plan_date)
-                    ->addMonths($control->periodicity)
-                    ->format('Y-m-d')
-                : $control->next_date->format('Y-m-d');
+        if ($control->periodicity === 0) {
+            // Once
+            $next_date = null;
+        } else {
+            $next_date =
+                $control->next_date === null
+                    ? \Carbon\Carbon::createFromFormat('Y-m-d', $control->plan_date)
+                        ->addMonths($control->periodicity)
+                        ->format('Y-m-d')
+                    : $control->next_date->format('Y-m-d');
+        }
 
         // return view
         return view('controls.make')
@@ -1157,46 +1153,47 @@ public function doMake()
         // Auditee -> propose control
         if (Auth::User()->role === 5) {
             $control->status = 1;
-        }
-        // if there is no next control
-        elseif ($control->next_id === null) {
-            // create a new control
-            $new_control = $control->replicate();
-            $new_control->observations = null;
-            $new_control->realisation_date = null;
-            $new_control->note = null;
-            $new_control->score = null;
-            $new_control->status = 0;
-            // only admin and user can update the plan_date, realisation_date and action_plan
-            if (Auth::User()->role === 1 || Auth::User()->role === 2) {
-                $new_control->plan_date = request('next_date');
-            } else {
-                $new_control->plan_date = date(
-                    'Y-m-d',
-                    strtotime(
-                        $control->periodicity . ' months',
-                        strtotime($control->plan_date)
-                    )
-                );
-            }
+        } else {
+            // set status done
+            $control->status = 2;
 
-            $new_control->save();
+            // if there is no next control and control not once
+            if (($control->next_id === null) && ($control->periodicity !== 0)) {
+                // create a new control
+                $new_control = $control->replicate();
+                $new_control->observations = null;
+                $new_control->realisation_date = null;
+                $new_control->note = null;
+                $new_control->score = null;
+                $new_control->status = 0;
+                // only admin and user can update the plan_date, realisation_date and action_plan
+                if (Auth::User()->role === 1 || Auth::User()->role === 2) {
+                    $new_control->plan_date = request('next_date');
+                } else {
+                    $new_control->plan_date = date(
+                        'Y-m-d',
+                        strtotime(
+                            $control->periodicity . ' months',
+                            strtotime($control->plan_date)
+                        )
+                    );
+                }
 
-            // Set owners
-            $new_control
-                ->owners()
-                ->sync($control->owners->pluck('id')->toArray());
+                $new_control->save();
 
-            // Set measures
-            $new_control
-                ->measures()
-                ->sync($control->measures->pluck('id')->toArray());
+                // Set owners
+                $new_control
+                    ->owners()
+                    ->sync($control->owners->pluck('id')->toArray());
 
-            // set status done
-            $control->status = 2;
+                // Set measures
+                $new_control
+                    ->measures()
+                    ->sync($control->measures->pluck('id')->toArray());
 
-            // make link
-            $control->next_id = $new_control->id;
+                // make link
+                $control->next_id = $new_control->id;
+            }
         }
 
         // update control

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
@@ -14,7 +14,7 @@
 
 class ReportController extends Controller
 {
-    public function show(Request $request)
+    public function show()
     {
         // get all frameworks
         $frameworks = DB::table('domains')

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 use Log;
@@ -30,8 +31,8 @@ public function boot()
             URL::forceScheme('https');
         }
 
-        if (true) {
-            //if (Config::get('APP_DEBUG')) {
+//        if (true) {
+        if (Config::get('APP_DEBUG')) {
             DB::listen(function ($query) {
                 Log::info(
                     $query->sql,

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
@@ -20,6 +20,7 @@
     'unplan' => 'Unplan',
     'validate' => 'Validate',
 
+    'once' => 'Once',
     'monthly' => 'Monthly',
     'quarterly' => 'Quarterly',
     'biannually' => 'Biannually',

diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php
@@ -19,6 +19,7 @@
     'unplan' => 'Déplanifier',
     'validate' => 'Valider',
 
+    'once' => 'Une fois',
     'monthly' => 'Mensuel',
     'quarterly' => 'Trimestriel',
     'biannually' => 'Bisanuel',

diff --git a/resources/views/controls/plan.blade.php b/resources/views/controls/plan.blade.php
@@ -83,6 +83,7 @@
 	    	</div>
 			<div class="cell-2">
 				<select name="periodicity" data-role="select">
+				    <option value="1" {{ $control->periodicity==0 ? "selected" : ""}}>{{ trans('common.once') }}</option>
 				    <option value="1" {{ $control->periodicity==1 ? "selected" : ""}}>{{ trans('common.monthly') }}</option>
 				    <option value="3" {{ $control->periodicity==3 ? "selected" : ""}}>{{ trans('common.quarterly') }}</option>
 				    <option value="6" {{ $control->periodicity==6 ? "selected" : ""}}>{{ trans('common.biannually') }}</option>

diff --git a/resources/views/controls/show.blade.php b/resources/views/controls/show.blade.php
@@ -204,6 +204,7 @@
 	    		<strong>{{ trans('cruds.control.fields.periodicity') }}</strong>
 	    	</div>
 			<div class="cell">
+				@if ($control->periodicity==0) {{ trans("common.once") }} @endif
 				@if ($control->periodicity==1) {{ trans("common.monthly") }} @endif
 				@if ($control->periodicity==3) {{ trans("common.quarterly") }} @endif
 				@if ($control->periodicity==6) {{ trans("common.biannually") }} @endif

diff --git a/resources/views/measures/plan.blade.php b/resources/views/measures/plan.blade.php
@@ -126,6 +126,7 @@
 	    	</div>
 			<div class="cell-3">
 				<select name="periodicity" data-role="select">
+				    <option value="0" {{ $measure->periodicity==0 ? "selected" : ""}}>{{ trans('common.once') }}</option>
 				    <option value="1" {{ $measure->periodicity==1 ? "selected" : ""}}>{{ trans('common.monthly') }}</option>
 				    <option value="3" {{ $measure->periodicity==3 ? "selected" : ""}}>{{ trans('common.quarterly') }}</option>
 				    <option value="6" {{ $measure->periodicity==6 ? "selected" : ""}}>{{ trans('common.biannually') }}</option>