filter gdpr

asiffer · Apr 30, 2023 · a238845 · a238845
1 parent 3cd7187
commit a238845
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 112 deletions.
diff --git a/resources/views/admin/dataProcessing/index.blade.php b/resources/views/admin/dataProcessing/index.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.admin')
 @section('content')
-@can('data_processing_registe_create')
+@can('data_processing_register_create')
     <div style="margin-bottom: 10px;" class="row">
         <div class="col-lg-12">
             <a class="btn btn-success" href="{{ route('admin.data-processing.create') }}">
@@ -123,8 +123,6 @@ class="table-warning"
     </div>
 </div>
 
-
-
 @endsection
 @section('scripts')
 @parent

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -4,7 +4,7 @@
     <div class="col-md-6">
         <div class="card mx-4">
             <div class="card-body p-4">
-                <h1>{{ trans('panel.site_title') }}</h1>
+                <h1>{{ (env('APP_NAME') === null) || (env('APP_NAME') === "Laravel") ? "Mercator" : env('APP_NAME') }}</h1>
 
                 <p class="text-muted">{{ trans('global.login') }}</p>
 

diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
@@ -6,10 +6,6 @@
 
         <title>@yield('title')</title>
 
-        <!-- Fonts -->
-        <link rel="preconnect" href="https://fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css2?family=Nunito&display=swap" rel="stylesheet">
-
         <!-- Styles -->
         <style>
             html, body {

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -205,232 +205,237 @@
       data: {
         mode: 'single',
         labels: [
-            "{!! trans('cruds.menu.gdpr.title_short') !!}", 
+          @can('gdpr_access') 
             "{!! trans('cruds.menu.ecosystem.title_short') !!}", 
+          @endcan
             "{!! trans('cruds.menu.metier.title_short') !!}", 
             "{!! trans('cruds.menu.application.title_short') !!}", 
             "{!! trans('cruds.menu.administration.title_short') !!}", 
             "{!! trans('cruds.menu.logical_infrastructure.title_short') !!}", 
             "{!! trans('cruds.menu.physical_infrastructure.title_short') !!}", 
             ],
-        datasets: [{
+        datasets: [
+        @can('gdpr_access')
+        {
           label: "{!! trans('cruds.dataProcessing.title') !!}",
-          data: [{!! $data_processing !!}, 0, 0, 0, 0, 0, 0],
+          data: [ {!! $data_processing !!}, 0, 0, 0, 0, 0, 0],
           value: {!! $data_processing !!},
           url: "/admin/data-processing"
         }, {
           label: "{!! trans('cruds.securityControl.title_short') !!}",
           data: [{!! $security_controls !!}, 0, 0, 0, 0, 0, 0],
           value: {!! $security_controls !!},
           url: "/admin/security-controls"
-        }, {
+        },
+        @endcan 
+        {
           label: "{!! trans('cruds.entity.title') !!}",
-          data: [0, {!! $entities !!}, 0, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan {!! $entities !!}, 0, 0, 0, 0, 0],
           value: {!! $entities !!},
           url: "/admin/entities"
         }, {
           label: "{!! trans('cruds.relation.title') !!}",
-          data: [0, {!! $relations !!}, 0, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan {!! $relations !!}, 0, 0, 0, 0, 0],
           value: {!! $relations !!},
           url: "/admin/relations"
         }, {
           label: "{!! trans('cruds.macroProcessus.title') !!}",
-          data: [0, 0, {!! $macroProcessuses !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $macroProcessuses !!}, 0, 0, 0, 0],
           value: {!! $macroProcessuses !!},
           url: "/admin/macro-processuses"
         }, {
           label: "{!! trans('cruds.process.title') !!}",
-          data: [0, 0, {!! $processes !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $processes !!}, 0, 0, 0, 0],
           value: {!! $processes !!},
           url: "/admin/processes"
         }, {
           label: "{!! trans('cruds.activity.title') !!}",
-          data: [0, 0, {!! $activities !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $activities !!}, 0, 0, 0, 0],
           value: {!! $activities !!},
           url: "/admin/activities"
         }, {
           label: "{!! trans('cruds.operation.title') !!}",
-          data: [0, 0, {!! $operations !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $operations !!}, 0, 0, 0, 0],
           value: {!! $operations !!},
           url: "/admin/operations"
         }, {
           label: "{!! trans('cruds.task.title') !!}",
-          data: [0, 0, {!! $tasks !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $tasks !!}, 0, 0, 0, 0],
           value: {!! $tasks !!},
           url: "admin/tasks"
         }, {
           label: "{!! trans('cruds.actor.title') !!}",
-          data: [0, 0, {!! $actors !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $actors !!}, 0, 0, 0, 0],
           value: {!! $actors !!},
           url: "/admin/actors"
         }, {
           label: "{!! trans('cruds.information.title') !!}",
-          data: [0, 0, {!! $informations !!}, 0, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $informations !!}, 0, 0, 0, 0],
           value: {!! $informations !!},
           url: "/admin/information"
         }, {
           label: "{!! trans('cruds.applicationBlock.title') !!}",
-          data: [0, 0, 0, {!! $applicationBlocks !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, {!! $applicationBlocks !!}, 0, 0, 0],
           value: {!! $applicationBlocks !!},
           url: "/admin/application-blocks"
         }, {
           label: "{!! trans('cruds.application.title') !!}",
-          data: [0, 0, 0, {!! $applications !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, {!! $applications !!}, 0, 0, 0],
           value: {!! $applications !!},
           url: "/admin/applications"
         }, {
           label: "{!! trans('cruds.applicationService.title_short') !!}",
-          data: [0, 0, 0, {!! $applicationServices !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, {!! $applicationServices !!}, 0, 0, 0],
           value: {!! $applicationServices !!},
           url: "/admin/application-services"
         }, {
           label: "{!! trans('cruds.applicationModule.title_short') !!}",
-          data: [0, 0, 0, {!! $applicationModules !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, {!! $applicationModules !!}, 0, 0, 0],
           value: {!! $applicationModules !!},
           url: "/admin/application-modules"
         }, {
           label: "{!! trans('cruds.database.title') !!}",
-          data: [0, 0, 0, {!! $databases !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, {!! $databases !!}, 0, 0, 0],
           value: {!! $databases !!},
           url: "/admin/databases"
         }, {
           label: "{!! trans('cruds.flux.title') !!}",
-          data: [0, 0, 0, {!! $fluxes !!}, 0, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, {!! $fluxes !!}, 0, 0, 0],
           value: {!! $fluxes !!},
           url: "/admin/fluxes",
         }, {
           label: "{!! trans('cruds.zoneAdmin.title_short') !!}",
-          data: [0, 0, 0, 0, {!!$zones!!}, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, {!!$zones!!}, 0, 0],
           value: {!!$zones!!},
           url: "/admin/zone-admins"
         }, {
           label: "{!! trans('cruds.annuaire.title_short') !!}",
-          data: [0, 0, 0, 0, {!!$annuaires!!}, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, {!!$annuaires!!}, 0, 0],
           value: {!!$annuaires!!},
           url: "/admin/annuaires"
         }, {
           label: "{!! trans('cruds.forestAd.title_short') !!}",
-          data: [0, 0, 0, 0, {!!$forests!!}, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, {!!$forests!!}, 0, 0],
           value: {!!$forests!!},
           url: "/admin/forest-ads"
         }, {
           label: "{!! trans('cruds.domaineAd.title_short') !!}",
-          data: [0, 0, 0, 0, {!!$domaines!!}, 0, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, {!!$domaines!!}, 0, 0],
           value:  {!!$domaines!!},
           url: "/admin/domaine-ads"
         }, {
           label: "{!! trans('cruds.network.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $networks !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $networks !!}, 0],
           value: {!! $networks !!},
           url: "/admin/networks"
         }, {
           label: "{!! trans('cruds.subnetwork.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $subnetworks !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $subnetworks !!}, 0],
           value: {!! $subnetworks !!},
           url: "/admin/subnetworks"
         }, {
           label: "{!! trans('cruds.gateway.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $gateways !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $gateways !!}, 0],
           value: {!! $gateways !!},
           url: "/admin/gateways"
         }, {
           label: "{!! trans('cruds.externalConnectedEntity.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $externalConnectedEntities !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $externalConnectedEntities !!}, 0],
           value: {!! $externalConnectedEntities !!},
           url: "/admin/external-connected-entities"
         }, {
           label: "{!! trans('cruds.networkSwitch.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $switches !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $switches !!}, 0],
           value: {!! $switches !!},
           url: "/admin/network-switches"
         }, {
           label: "{!! trans('cruds.router.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $routers !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $routers !!}, 0],
           value: {!! $routers !!},
           url: "/admin/routers"
         }, {
           label: "{!! trans('cruds.securityDevice.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $securityDevices !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $securityDevices !!}, 0],
           value: {!! $securityDevices !!},
           url: "/admin/security-devices"
         }, {
           label: "{!! trans('cruds.logicalServer.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $logicalServers !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $logicalServers !!}, 0],
           value: {!! $logicalServers !!},
           url: "/admin/logical-servers"
         }, {
           label: "{!! trans('cruds.certificate.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $certificates !!}, 0],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $certificates !!}, 0],
           value: {!! $certificates !!},
           url: "/admin/certificates"
         }, {
           label: "{!! trans('cruds.site.title') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $sites !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $sites !!}],
           value: {!! $sites !!},
           url: "/admin/sites"
         }, {
           label: "{!! trans('cruds.building.title') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $buildings !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $buildings !!}],
           value: {!! $buildings !!},
           url: "/admin/buildings"
         }, {
           label: "{!! trans('cruds.bay.title') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $bays !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $bays !!}],
           value: {!! $bays !!},
           url: "/admin/bays"
         }, {
           label: "{!! trans('cruds.physicalServer.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $physicalServers !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $physicalServers !!}],
           value: {!! $physicalServers !!},
           url: "/admin/physical-servers"          
         }, {
           label: "{!! trans('cruds.workstation.title') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $workstations !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $workstations !!}],
           value: {!! $workstations !!},
           url: "/admin/workstations"
         }, {
           label: "{!! trans('cruds.storageDevice.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $storageDevices !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $storageDevices !!}],
           value: {!! $storageDevices !!},
           url: "/admin/storage-devices"
         }, {
           label: "{!! trans('cruds.physicalSwitch.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $physicalSwitchs !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $physicalSwitchs !!}],
           value: {!! $physicalSwitchs !!},
           url: "/admin/physical-switches"
         }, {
           label: "{!! trans('cruds.physicalRouter.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $physicalRouters !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $physicalRouters !!}],
           value: {!! $physicalRouters !!},
           url: "/admin/physical-routers"
         }, {
           label: "{!! trans('cruds.wifiTerminal.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $wifiTerminals !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $wifiTerminals !!}],
           value: {!! $wifiTerminals !!},
           url: "/admin/wifi-terminals"
         }, {
           label: "{!! trans('cruds.physicalSecurityDevice.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $securityDevices !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $securityDevices !!}],
           value: {!! $securityDevices !!},
           url: "/admin/physical-security-devices"
         }, {
           label: "{!! trans('cruds.wan.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $wans !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $wans !!}],
           value: {!! $wans !!},
           url: "/admin/wans"
         }, {
           label: "{!! trans('cruds.man.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $mans !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $mans !!}],
           value: {!! $mans !!},
           url: "/admin/mans"
         }, {
           label: "{!! trans('cruds.lan.title_short') !!}",
-          data: [0, 0, 0, 0, 0, 0, {!! $lans !!}],
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, 0, {!! $lans !!}],
           value: {!! $lans !!},
           url: "/admin/lans"
         }, {
           label: "{!! trans('cruds.vlan.title_short') !!}",
-          data: [0, 0, 0, 0, 0, {!! $vlans !!}, 0], 
+          data: [@can('gdpr_access') 0, @endcan 0, 0, 0, 0, {!! $vlans !!}, 0], 
           value: {!! $vlans !!},
           url: "/admin/vlans"
         }
@@ -509,7 +514,7 @@
 
 
     // Normalize data (%)
-    for (let i = 0; i < 7; i++) {
+    for (let i = 0; i < cnf4.data.datasets[0].data.length; i++) {
       var sum=0;
       for (let j = 0; j < cnf4.data.datasets.length; j++) 
         sum += cnf4.data.datasets[j].data[i];
@@ -645,7 +650,7 @@
       new Chart(ctx2, cnf2);
       new Chart(ctx3, cnf3);      
       //
-      window.barchart=new Chart(ctx4, cnf4);      
+      window.barchart=new Chart(ctx4, cnf4);
       window.treemap=new Chart(ctx5, cnf5);
     };