Merge pull request #1156 from dbarzin/dev

Dev
dbarzin · Mar 3, 2025 · af361b9 · af361b9
2 parents 637cbb5 + 405041e
commit af361b9
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 22 deletions.
diff --git a/app/Http/Controllers/API/ApplicationBlockController.php b/app/Http/Controllers/API/ApplicationBlockController.php
@@ -29,7 +29,6 @@ public function store(StoreApplicationBlockRequest $request)
         abort_if(Gate::denies('application_block_create'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $applicationBlock = ApplicationBlock::create($request->all());
-        // $applicationblock->applications()->sync($request->input('applications', []));
         MApplication::whereIn('id', $request->input('applications', []))
             ->update(['application_block_id' => $applicationBlock->id]);
 

diff --git a/app/Http/Controllers/API/MacroProcessusController.php b/app/Http/Controllers/API/MacroProcessusController.php
@@ -8,6 +8,7 @@
 use App\Http\Requests\UpdateMacroProcessusRequest;
 use App\Http\Resources\Admin\MacroProcessusResource;
 use App\MacroProcessus;
+use App\Process;
 use Gate;
 use Illuminate\Http\Response;
 
@@ -27,8 +28,8 @@ public function store(StoreMacroProcessusRequest $request)
         abort_if(Gate::denies('macro_processus_create'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $macroProcessus = MacroProcessus::create($request->all());
-        // syncs
-        // $macroprocessus->roles()->sync($request->input('roles', []));
+        Process::whereIn('id', $request->input('processes', []))
+            ->update(['macroprocess_id' => $macroProcessus->id]);
 
         return response()->json($macroProcessus, 201);
     }
@@ -45,8 +46,9 @@ public function update(UpdateMacroProcessusRequest $request, MacroProcessus $mac
         abort_if(Gate::denies('macro_processus_edit'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $macroProcessus->update($request->all());
-        // syncs
-        // $macroProcessus->roles()->sync($request->input('roles', []));
+        if ($request->has('processes'))
+            Process::whereIn('id', $request->input('processes', []))
+                ->update(['macroprocess_id' => $macroProcessus->id]);
 
         return response()->json();
     }

diff --git a/app/Http/Controllers/API/ProcessController.php b/app/Http/Controllers/API/ProcessController.php
@@ -29,7 +29,7 @@ public function store(StoreProcessRequest $request)
         $process = Process::create($request->all());
         $process->activities()->sync($request->input('activities', []));
         $process->entities()->sync($request->input('entities', []));
-        $process->processInformation()->sync($request->input('informations', []));
+        $process->information()->sync($request->input('informations', []));
         $process->applications()->sync($request->input('applications', []));
 
         return response()->json($process, 201);
@@ -47,10 +47,14 @@ public function update(UpdateProcessRequest $request, Process $process)
         abort_if(Gate::denies('process_edit'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $process->update($request->all());
-        $process->activities()->sync($request->input('activities', []));
-        $process->entities()->sync($request->input('entities', []));
-        $process->processInformation()->sync($request->input('informations', []));
-        $process->applications()->sync($request->input('applications', []));
+        if ($request->has('activities'))
+            $process->activities()->sync($request->input('activities', []));
+        if ($request->has('entities'))
+            $process->entities()->sync($request->input('entities', []));
+        if ($request->has('informations'))
+            $process->information()->sync($request->input('informations', []));
+        if ($request->has('applications'))
+            $process->applications()->sync($request->input('applications', []));
 
         return response()->json();
     }

diff --git a/app/Http/Controllers/Admin/CartographyController.php b/app/Http/Controllers/Admin/CartographyController.php
@@ -297,7 +297,7 @@ public function cartography(Request $request)
                             $graph .= ' P'.$process->id . '->A'. $activity->id;
                         }
                     }
-                    foreach ($process->processInformation as $information) {
+                    foreach ($process->information as $information) {
                         $graph .= ' P'. $process->id .'->I'. $information->id;
                     }
                 }

diff --git a/app/Http/Controllers/Admin/ProcessController.php b/app/Http/Controllers/Admin/ProcessController.php
@@ -22,7 +22,7 @@ public function index()
     {
         abort_if(Gate::denies('process_access'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
-        $processes = Process::with('operations', 'activities', 'processInformation', 'macroProcess')->orderBy('name')->get();
+        $processes = Process::with('operations', 'activities', 'information', 'macroProcess')->orderBy('name')->get();
 
         return view('admin.processes.index', compact('processes'));
     }
@@ -53,7 +53,7 @@ public function store(StoreProcessRequest $request)
         $process = Process::create($request->all());
         $process->activities()->sync($request->input('activities', []));
         $process->entities()->sync($request->input('entities', []));
-        $process->processInformation()->sync($request->input('informations', []));
+        $process->information()->sync($request->input('informations', []));
         $process->applications()->sync($request->input('applications', []));
 
         // Save icon
@@ -96,7 +96,7 @@ public function edit(Process $process)
         // lists
         $owner_list = Process::select('owner')->where('owner', '<>', null)->distinct()->orderBy('owner')->pluck('owner');
 
-        $process->load('activities', 'entities', 'processInformation', 'applications');
+        $process->load('activities', 'entities', 'information', 'applications');
 
         return view(
             'admin.processes.edit',
@@ -141,7 +141,7 @@ public function update(UpdateProcessRequest $request, Process $process)
         $process->update($request->all());
         $process->activities()->sync($request->input('activities', []));
         $process->entities()->sync($request->input('entities', []));
-        $process->processInformation()->sync($request->input('informations', []));
+        $process->information()->sync($request->input('informations', []));
         $process->applications()->sync($request->input('applications', []));
 
         return redirect()->route('admin.processes.index');
@@ -151,7 +151,7 @@ public function show(Process $process)
     {
         abort_if(Gate::denies('process_show'), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
-        $process->load('activities', 'entities', 'processInformation', 'applications', 'macroProcess');
+        $process->load('activities', 'entities', 'information', 'applications', 'macroProcess');
 
         return view('admin.processes.show', compact('process'));
     }

diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php
@@ -379,7 +379,7 @@ public function informationSystem(Request $request)
             $informations = Information::All()->sortBy('name')
                 ->filter(function ($item) use ($processes) {
                     foreach ($processes as $process) {
-                        foreach ($process->processInformation as $information) {
+                        foreach ($process->information as $information) {
                             if ($item->id === $information->id) {
                                 return true;
                             }

diff --git a/app/Process.php b/app/Process.php
@@ -46,7 +46,7 @@ class Process extends Model
         'deleted_at',
     ];
 
-    public function processInformation()
+    public function information()
     {
         return $this->belongsToMany(Information::class)->orderBy('name');
     }

diff --git a/resources/views/admin/processes/edit.blade.php b/resources/views/admin/processes/edit.blade.php
@@ -220,8 +220,8 @@ class="recommended"
                             <span class="btn btn-info btn-xs deselect-all" style="border-radius: 0">{{ trans('global.deselect_all') }}</span>
                         </div>
                         <select class="form-control select2 {{ $errors->has('informations') ? 'is-invalid' : '' }}" name="informations[]" id="informations" multiple>
-                            @foreach($informations as $id => $informations)
-                                <option value="{{ $id }}" {{ (in_array($id, old('informations', [])) || $process->processInformation->contains($id)) ? 'selected' : '' }}>{{ $informations }}</option>
+                            @foreach($informations as $id => $info)
+                                <option value="{{ $id }}" {{ (in_array($id, old('informations', [])) || $process->information->contains($id)) ? 'selected' : '' }}>{{ $info }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('informations'))

diff --git a/resources/views/admin/processes/index.blade.php b/resources/views/admin/processes/index.blade.php
@@ -93,7 +93,7 @@ class="table-warning"
                             </td>
                             <td>
                                 {!!
-                                    $process->processInformation->map(function ($information) {
+                                    $process->information->map(function ($information) {
                                         return '<a href="' . route('admin.information.show', $information->id) . '">' . $information->name . '</a>';
                                     })->implode(', ');
                                 !!}

diff --git a/resources/views/admin/processes/show.blade.php b/resources/views/admin/processes/show.blade.php
@@ -98,6 +98,21 @@
                             @endforeach
                         </td>
                     </tr>
+                    <tr>
+                        <th>
+                            {{ trans('cruds.process.fields.informations') }}
+                        </th>
+                        <td colspan="2">
+                            @foreach($process->information as $info)
+                                <a href="{{ route('admin.information.show', $info->id) }}">
+                                {{ $info->name }}
+                                </a>
+                                @if (!$loop->last)
+                                ,
+                                @endif
+                            @endforeach
+                        </td>
+                    </tr>
                     <tr>
                         <th>
                             {{ trans('cruds.process.fields.security_need') }}

diff --git a/resources/views/admin/reports/information_system.blade.php b/resources/views/admin/reports/information_system.blade.php
@@ -599,7 +599,7 @@
                 P{{$process->id}} -> A{{$activity->id}}
             @endforeach
         @endif
-        @foreach($process->processInformation as $information)
+        @foreach($process->information as $information)
             P{{ $process->id }} -> I{{ $information->id }}
         @endforeach
         @if (auth()->user()->granularity>=2)