diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php index 513f5928..27a4fe64 100644 --- a/app/Http/Controllers/Admin/ReportController.php +++ b/app/Http/Controllers/Admin/ReportController.php @@ -56,6 +56,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Carbon\Carbon; + // PhpOffice // see : https://phpspreadsheet.readthedocs.io/en/latest/topics/recipes/ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; @@ -980,7 +982,7 @@ public function administration() public function entities() { - $path = storage_path('app/entities.xlsx'); + $path = storage_path('app/entities-'. Carbon::today()->format('Ymd') .'.xlsx'); $entities = Entity::All()->sortBy('name'); @@ -1036,7 +1038,7 @@ public function entities() public function applicationsByBlocks() { - $path = storage_path('app/applications.xlsx'); + $path = storage_path('app/applications-'. Carbon::today()->format('Ymd') .'.xlsx'); $applicationBlocks = ApplicationBlock::All()->sortBy('name'); $applicationBlocks->load('applications'); @@ -1158,7 +1160,7 @@ public function applicationsByBlocks() public function logicalServerResp() { - $path = storage_path('app/logicalServersResp.xlsx'); + $path = storage_path('app/logicalServersResp-'. Carbon::today()->format('Ymd') .'.xlsx'); $logicalServers = LogicalServer::All()->sortBy('name'); $logicalServers->load('applications', 'applications.application_block'); @@ -1231,23 +1233,25 @@ public function logicalServerResp() public function logicalServerConfigs() { - $path = storage_path('app/logicalServers.xlsx'); + $path = storage_path('app/logicalServers-'. Carbon::today()->format('Ymd') .'.xlsx'); $logicalServers = LogicalServer::All()->sortBy('name'); $logicalServers->load('applications', 'servers'); $header = [ - trans('cruds.logicalServer.fields.name'), - trans('cruds.logicalServer.fields.operating_system'), - trans('cruds.logicalServer.fields.address_ip'), - trans('cruds.logicalServer.fields.cpu'), - trans('cruds.logicalServer.fields.memory'), - trans('cruds.logicalServer.fields.disk'), - trans('cruds.logicalServer.fields.environment'), - trans('cruds.logicalServer.fields.net_services'), - trans('cruds.logicalServer.fields.configuration'), - trans('cruds.logicalServer.fields.applications'), - trans('cruds.logicalServer.fields.servers'), + trans('cruds.logicalServer.fields.name'), // A + trans('cruds.logicalServer.fields.operating_system'), // B + trans('cruds.logicalServer.fields.environment'), // C + trans('cruds.logicalServer.fields.install_date'), // D + trans('cruds.logicalServer.fields.update_date'), // E + trans('cruds.logicalServer.fields.cpu'), // F + trans('cruds.logicalServer.fields.memory'), // G + trans('cruds.logicalServer.fields.disk'), // H + trans('cruds.logicalServer.fields.net_services'), // I + trans('cruds.logicalServer.fields.address_ip'), // J + trans('cruds.logicalServer.fields.configuration'), // K + trans('cruds.logicalServer.fields.applications'), // L + trans('cruds.logicalServer.fields.servers'), // M ]; $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet(); @@ -1269,11 +1273,13 @@ public function logicalServerConfigs() $sheet->getColumnDimension('I')->setAutoSize(true); $sheet->getColumnDimension('J')->setAutoSize(true); $sheet->getColumnDimension('K')->setAutoSize(true); + $sheet->getColumnDimension('L')->setAutoSize(true); + $sheet->getColumnDimension('M')->setAutoSize(true); - // center - $sheet->getStyle('D')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); - $sheet->getStyle('E')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); + // center (CPU, Men, Disk) $sheet->getStyle('F')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); + $sheet->getStyle('G')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); + $sheet->getStyle('H')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER); // converter $html = new \PhpOffice\PhpSpreadsheet\Helper\Html(); @@ -1283,15 +1289,17 @@ public function logicalServerConfigs() foreach ($logicalServers as $logicalServer) { $sheet->setCellValue("A{$row}", $logicalServer->name); $sheet->setCellValue("B{$row}", $logicalServer->operating_system); - $sheet->setCellValue("C{$row}", $logicalServer->address_ip); - $sheet->setCellValue("D{$row}", $logicalServer->cpu); - $sheet->setCellValue("E{$row}", $logicalServer->memory); - $sheet->setCellValue("F{$row}", $logicalServer->disk); - $sheet->setCellValue("G{$row}", $logicalServer->environment); - $sheet->setCellValue("H{$row}", $logicalServer->net_services); - $sheet->setCellValue("I{$row}", $html->toRichTextObject($logicalServer->configuration)); - $sheet->setCellValue("J{$row}", $logicalServer->applications->implode('name', ', ')); - $sheet->setCellValue("K{$row}", $logicalServer->servers->implode('name', ', ')); + $sheet->setCellValue("C{$row}", $logicalServer->environment); + $sheet->setCellValue("D{$row}", $logicalServer->install_date); + $sheet->setCellValue("E{$row}", $logicalServer->update_date); + $sheet->setCellValue("F{$row}", $logicalServer->cpu); + $sheet->setCellValue("G{$row}", $logicalServer->memory); + $sheet->setCellValue("H{$row}", $logicalServer->disk); + $sheet->setCellValue("I{$row}", $logicalServer->net_services); + $sheet->setCellValue("J{$row}", $logicalServer->address_ip); + $sheet->setCellValue("K{$row}", $html->toRichTextObject($logicalServer->configuration)); + $sheet->setCellValue("L{$row}", $logicalServer->applications->implode('name', ', ')); + $sheet->setCellValue("M{$row}", $logicalServer->servers->implode('name', ', ')); $row++; } @@ -1304,7 +1312,7 @@ public function logicalServerConfigs() public function securityNeeds() { - $path = storage_path('app/securityNeeds.xlsx'); + $path = storage_path('app/securityNeeds-'. Carbon::today()->format('Ymd') .'.xlsx'); // macroprocess - process - application - base de données - information $header = [ @@ -1425,7 +1433,7 @@ public function securityNeeds() public function physicalInventory() { - $path = storage_path('app/physicalInventory.xlsx'); + $path = storage_path('app/physicalInventory-'. Carbon::today()->format('Ymd') .'.xlsx'); $inventory = []; diff --git a/app/LogicalServer.php b/app/LogicalServer.php index de7205f7..6a796e68 100644 --- a/app/LogicalServer.php +++ b/app/LogicalServer.php @@ -4,6 +4,7 @@ use App\Traits\Auditable; use DateTimeInterface; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; @@ -86,8 +87,36 @@ class LogicalServer extends Model 'created_at', 'updated_at', 'deleted_at', + 'install_date', + 'update_date' ]; + /** + * Permet d'exécuter de modifier un attribut avant que la valeurs soit récupérée du model + */ + public function getInstallDateAttribute($value) + { + return $value ? Carbon::parse($value)->format(config('panel.date_format').' '.config('panel.time_format')) : null; + } + + public function setInstallDateAttribute($value) + { + $this->attributes['install_date'] = $value ? Carbon::createFromFormat(config('panel.date_format').' '.config('panel.time_format'), $value)->format('Y-m-d H:i:s') : null; + } + + /** + * Permet d'exécuter de modifier un attribut avant que la valeurs soit récupérée du model + */ + public function getUpdateDateAttribute($value) + { + return $value ? Carbon::parse($value)->format(config('panel.date_format').' '.config('panel.time_format')) : null; + } + + public function setUpdateDateAttribute($value) + { + $this->attributes['update_date'] = $value ? Carbon::createFromFormat(config('panel.date_format').' '.config('panel.time_format'), $value)->format('Y-m-d H:i:s') : null; + } + public function applications() { return $this->belongsToMany(MApplication::class)->orderBy('name'); diff --git a/database/migrations/2022_05_02_123756_add_update_to_logical_servers.php b/database/migrations/2022_05_02_123756_add_update_to_logical_servers.php new file mode 100644 index 00000000..1b3bcb2e --- /dev/null +++ b/database/migrations/2022_05_02_123756_add_update_to_logical_servers.php @@ -0,0 +1,34 @@ +dateTime('install_date')->nullable(); + $table->dateTime('update_date')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('logical_servers', function (Blueprint $table) { + $table->dropColumn(['install_date', 'update_date']); + }); + } +} + diff --git a/mercator_data.sql b/mercator_data.sql index 01657450..43158a58 100644 --- a/mercator_data.sql +++ b/mercator_data.sql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: mercator -- ------------------------------------------------------ --- Server version 8.0.28-0ubuntu0.21.10.3 +-- Server version 8.0.28-0ubuntu0.21.10.4 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -229,7 +229,7 @@ UNLOCK TABLES; LOCK TABLES `databases` WRITE; /*!40000 ALTER TABLE `databases` DISABLE KEYS */; -INSERT INTO `databases` VALUES (1,'Database 1','

Description Database 1

','Paul','MySQL',1,'Interne','2020-06-17 14:18:48','2021-05-14 10:19:45',NULL,7,2,3,4),(3,'Database 2','

Description database 2

','Paul','MySQL',1,'Interne','2020-06-17 14:19:24','2021-05-14 10:29:47',NULL,1,1,1,1),(4,'MainDB','

description de la base de données

','Paul','Oracle',2,'Interne','2020-07-01 15:08:57','2021-08-20 01:52:23',NULL,1,2,2,2),(5,'DB Compta','

Base de donnée de la compta

','Paul','MariaDB',2,'Interne','2020-08-24 15:58:23','2022-03-21 17:13:10',NULL,18,2,2,2),(6,'Data Warehouse','

Base de données du datawarehouse

','Jean','Oracle',2,'Interne','2021-05-14 10:24:02','2022-03-21 17:13:24',NULL,1,2,2,2); +INSERT INTO `databases` VALUES (1,'Database 1','

Description Database 1

','Paul','MySQL',1,'Interne','2020-06-17 14:18:48','2021-05-14 10:19:45',NULL,2,2,3,4),(3,'Database 2','

Description database 2

','Paul','MySQL',1,'Interne','2020-06-17 14:19:24','2021-05-14 10:29:47',NULL,1,1,1,1),(4,'MainDB','

description de la base de données

','Paul','Oracle',2,'Interne','2020-07-01 15:08:57','2021-08-20 01:52:23',NULL,1,2,2,2),(5,'DB Compta','

Base de donnée de la compta

','Paul','MariaDB',2,'Interne','2020-08-24 15:58:23','2022-03-21 17:13:10',NULL,18,2,2,2),(6,'Data Warehouse','

Base de données du datawarehouse

','Jean','Oracle',2,'Interne','2021-05-14 10:24:02','2022-03-21 17:13:24',NULL,1,2,2,2); /*!40000 ALTER TABLE `databases` ENABLE KEYS */; UNLOCK TABLES; @@ -279,7 +279,7 @@ UNLOCK TABLES; LOCK TABLES `entities` WRITE; /*!40000 ALTER TABLE `entities` DISABLE KEYS */; -INSERT INTO `entities` VALUES (1,'MegaNet System','

ISO 27001

','

Helpdek
27, Rue des poire 
12043 Mire-en-Mare le Bains

helpdes@menetsys.org

','

Fournisseur équipement réseau

','2020-05-21 02:30:59','2021-10-27 09:28:17',NULL),(2,'Entité1','

Néant

','','

Entité de tests1

','2020-05-21 02:31:17','2021-05-23 12:59:11',NULL),(3,'CHdN','3','RSSI du CHdN','

Centre Hospitalier du Nord

','2020-05-21 02:43:41','2021-05-13 08:20:32','2021-05-13 08:20:32'),(4,'Entité3','

ISO 9001

','

Point de contact de la troisième entité

','

Description de la troisième entité.

','2020-05-21 02:44:03','2021-07-20 19:20:37',NULL),(5,'entité6','

Néant

','

support_informatque@entite6.fr

','

Description de l\'entité six

','2020-05-21 02:44:18','2021-05-23 13:03:15',NULL),(6,'Entité4','

ISO 27001

','

Pierre Pinon
Tel: 00 34 392 484 22

','

Description de l\'entté quatre

','2020-05-21 02:45:14','2021-05-23 13:01:17',NULL),(7,'Entité5','

Néant

','

Servicdesk@entite5.fr

','

Description de l\'entité 5

','2020-05-21 03:38:41','2021-05-23 13:02:16',NULL),(8,'Entité2','

ISO 27001

','

Point de contact de l\'entité 2

','

Description de l\'entité 2

','2020-05-21 03:54:22','2021-05-23 13:00:03',NULL),(9,'NetworkSys','

ISO 27001

','

support@networksys.fr

','

Description de l’entité NetworkSys

','2020-05-21 06:25:15','2021-05-23 13:04:06',NULL),(10,'Agence eSanté','

Néant

','

helpdesk@esante.lu

','

Agence Nationale des information partagées dans le domaine de la santé

+-------+
+ TOTO +
+-------+

<<<<<< >>>>>>>>>>>>

','2020-05-21 06:25:26','2021-05-13 08:20:32','2021-05-13 08:20:32'),(11,'Test','4',NULL,'

Test

','2020-07-02 15:37:29','2020-07-02 15:37:44','2020-07-02 15:37:44'),(12,'Entité de test','

Certifications : 
- ISO 9001
- ISO 27001
- ISO 31000

','

Paul Pierre
Gérant
00 33 4943 432 423

','

Description de l\'entité de test

','2020-07-06 13:37:54','2021-05-25 14:35:44',NULL),(13,'Nestor','

Haut niveau

','

Paul, Pierre et Jean

','

Description de Nestor

','2020-08-12 16:11:31','2020-08-12 16:12:13',NULL),(14,'0001',NULL,NULL,'

rrzerze

','2021-06-15 15:16:31','2021-06-15 15:17:08','2021-06-15 15:17:08'),(15,'002',NULL,NULL,'

sdqsfsd

','2021-06-15 15:16:41','2021-06-15 15:17:08','2021-06-15 15:17:08'),(16,'003',NULL,NULL,'

dsqdsq

','2021-06-15 15:16:51','2021-06-15 15:17:08','2021-06-15 15:17:08'),(17,'004',NULL,NULL,'

dqqqsdqs

','2021-06-15 15:17:01','2021-06-15 15:17:08','2021-06-15 15:17:08'),(18,'Acme cop.','

None sorry...

','

Do not call me, I will call you back.

','

That\'s all folk !!

','2021-09-07 18:07:16','2022-01-04 20:39:22',NULL),(19,'HAL','

Top security certification

','

hal@corp.com

','

Very big HAL corporation

','2021-09-07 18:08:56','2021-09-07 18:09:17',NULL); +INSERT INTO `entities` VALUES (1,'MegaNet System','

ISO 27001

','

Helpdek
27, Rue des poire 
12043 Mire-en-Mare le Bains

helpdes@menetsys.org

','

Fournisseur équipement réseau

','2020-05-21 02:30:59','2021-10-27 09:28:17',NULL),(2,'Entité1','

Néant

','','

Entité de tests1

','2020-05-21 02:31:17','2021-05-23 12:59:11',NULL),(3,'CHdN','3','RSSI du CHdN','

Centre Hospitalier du Nord

','2020-05-21 02:43:41','2021-05-13 08:20:32','2021-05-13 08:20:32'),(4,'Entité3','

ISO 9001

','

Point de contact de la troisième entité

','

Description de la troisième entité.

','2020-05-21 02:44:03','2021-07-20 19:20:37',NULL),(5,'entité6','

Néant

','

support_informatque@entite6.fr

','

Description de l\'entité six

','2020-05-21 02:44:18','2021-05-23 13:03:15',NULL),(6,'Entité4','

ISO 27001

','

Pierre Pinon
Tel: 00 34 392 484 22

','

Description de l\'entté quatre

','2020-05-21 02:45:14','2021-05-23 13:01:17',NULL),(7,'Entité5','

Néant

','

Servicdesk@entite5.fr

','

Description de l\'entité 5

','2020-05-21 03:38:41','2021-05-23 13:02:16',NULL),(8,'Entité2','

ISO 27001

','

Point de contact de l\'entité 2

','

Description de l\'entité 2

','2020-05-21 03:54:22','2021-05-23 13:00:03',NULL),(9,'NetworkSys','

ISO 27001

','

support@networksys.fr

','

Description de l’entité NetworkSys

','2020-05-21 06:25:15','2021-05-23 13:04:06',NULL),(10,'Agence eSanté','

Néant

','

helpdesk@esante.lu

','

Agence Nationale des information partagées dans le domaine de la santé

+-------+
+ TOTO +
+-------+

<<<<<< >>>>>>>>>>>>

','2020-05-21 06:25:26','2021-05-13 08:20:32','2021-05-13 08:20:32'),(11,'Test','4',NULL,'

Test

','2020-07-02 15:37:29','2020-07-02 15:37:44','2020-07-02 15:37:44'),(12,'Pierre et fils','

Certifications : 
- ISO 9001
- ISO 27001
- ISO 31000

','

Paul Pierre
Gérant
00 33 4943 432 423

','

Description de l\'entité de test

','2020-07-06 13:37:54','2022-04-19 14:58:37',NULL),(13,'Nestor','

Haut niveau

','

Paul, Pierre et Jean

','

Description de Nestor

','2020-08-12 16:11:31','2020-08-12 16:12:13',NULL),(14,'0001',NULL,NULL,'

rrzerze

','2021-06-15 15:16:31','2021-06-15 15:17:08','2021-06-15 15:17:08'),(15,'002',NULL,NULL,'

sdqsfsd

','2021-06-15 15:16:41','2021-06-15 15:17:08','2021-06-15 15:17:08'),(16,'003',NULL,NULL,'

dsqdsq

','2021-06-15 15:16:51','2021-06-15 15:17:08','2021-06-15 15:17:08'),(17,'004',NULL,NULL,'

dqqqsdqs

','2021-06-15 15:17:01','2021-06-15 15:17:08','2021-06-15 15:17:08'),(18,'Acme cop.','

None sorry...

','

Do not call me, I will call you back.

','

That\'s all folk !!

','2021-09-07 18:07:16','2022-01-04 20:39:22',NULL),(19,'HAL','

Top security certification

','

hal@corp.com

','

Very big HAL corporation

','2021-09-07 18:08:56','2021-09-07 18:09:17',NULL),(20,'ATest1',NULL,NULL,NULL,'2022-04-25 12:43:46','2022-04-25 12:44:02','2022-04-25 12:44:02'),(21,'ATest2',NULL,NULL,NULL,'2022-04-25 12:43:56','2022-04-25 12:44:02','2022-04-25 12:44:02'); /*!40000 ALTER TABLE `entities` ENABLE KEYS */; UNLOCK TABLES; @@ -409,7 +409,7 @@ UNLOCK TABLES; LOCK TABLES `logical_server_m_application` WRITE; /*!40000 ALTER TABLE `logical_server_m_application` DISABLE KEYS */; -INSERT INTO `logical_server_m_application` VALUES (2,1),(2,2),(3,2),(1,1),(18,4),(15,3),(4,2); +INSERT INTO `logical_server_m_application` VALUES (2,1),(2,2),(3,2),(1,1),(18,4),(15,3),(4,2),(4,5); /*!40000 ALTER TABLE `logical_server_m_application` ENABLE KEYS */; UNLOCK TABLES; @@ -419,7 +419,7 @@ UNLOCK TABLES; LOCK TABLES `logical_server_physical_server` WRITE; /*!40000 ALTER TABLE `logical_server_physical_server` DISABLE KEYS */; -INSERT INTO `logical_server_physical_server` VALUES (2,1),(2,2),(1,1),(1,7),(3,8),(4,7); +INSERT INTO `logical_server_physical_server` VALUES (2,1),(2,2),(1,1),(1,7),(3,8),(4,7),(5,8); /*!40000 ALTER TABLE `logical_server_physical_server` ENABLE KEYS */; UNLOCK TABLES; @@ -429,7 +429,7 @@ UNLOCK TABLES; LOCK TABLES `logical_servers` WRITE; /*!40000 ALTER TABLE `logical_servers` DISABLE KEYS */; -INSERT INTO `logical_servers` VALUES (1,'SRV-1','

Description du serveur 1

','DNS, HTTP, HTTPS','

Configuration du serveur 1

','2020-07-12 16:57:42','2021-08-17 13:13:21',NULL,'Windows 3.1','10.10.1.1, 10.10.10.1','2','8','PROD',60),(2,'SRV-2','

Description du serveur 2

','HTTPS, SSH','

Configuration par défaut

','2020-07-30 10:00:16','2021-08-17 18:17:41',NULL,'Windows 10','10.50.1.2','2','5','PROD',100),(3,'SRV-3','

Description du serveur 3

','HTTP, HTTPS',NULL,'2021-08-26 14:33:03','2021-08-26 14:33:38',NULL,'Ubuntu 20.04','10.70.8.3','4','16','PROD',80),(4,'SRV-42','

The Ultimate Question of Life, the Universe and Everything

',NULL,'

Full configuration

','2021-11-15 16:03:59','2022-03-20 11:39:54',NULL,'OS 42','10.0.0.42','42','42 G','PROD',42); +INSERT INTO `logical_servers` VALUES (1,'SRV-1','

Description du serveur 1

','DNS, HTTP, HTTPS','

Configuration du serveur 1

','2020-07-12 16:57:42','2021-08-17 13:13:21',NULL,'Windows 3.1','10.10.1.1, 10.10.10.1','2','8','PROD',60,NULL,NULL),(2,'SRV-2','

Description du serveur 2

','HTTPS, SSH','

Configuration par défaut

','2020-07-30 10:00:16','2021-08-17 18:17:41',NULL,'Windows 10','10.50.1.2','2','5','PROD',100,NULL,NULL),(3,'SRV-3','

Description du serveur 3

','HTTP, HTTPS',NULL,'2021-08-26 14:33:03','2021-08-26 14:33:38',NULL,'Ubuntu 20.04','10.70.8.3','4','16','PROD',80,NULL,NULL),(4,'SRV-42','

The Ultimate Question of Life, the Universe and Everything

',NULL,'

Full configuration

','2021-11-15 16:03:59','2022-03-20 11:39:54',NULL,'OS 42','10.0.0.42','42','42 G','PROD',42,NULL,NULL),(5,'SRV-4','

Description du serveur 4

',NULL,NULL,'2022-05-02 16:43:02','2022-05-02 16:49:34',NULL,'Ubunti 22.04 LTS','10.10.3.2','4','2','Dev',NULL,'2022-05-01 20:47:41','2022-05-02 20:47:47'); /*!40000 ALTER TABLE `logical_servers` ENABLE KEYS */; UNLOCK TABLES; @@ -458,7 +458,7 @@ UNLOCK TABLES; LOCK TABLES `m_applications` WRITE; /*!40000 ALTER TABLE `m_applications` DISABLE KEYS */; -INSERT INTO `m_applications` VALUES (1,'Application 1','

Description de l\'application 1

',1,'RSSI',NULL,'logiciel','Microsoft',NULL,'> 20',NULL,'2020-06-14 09:20:15','2022-03-20 17:53:29',NULL,1,3,'//Documentation/application1.docx',1,1,1,'1.2',NULL,NULL),(2,'Application 2','

Description de l\'application 2

',2,'RSSI',NULL,'progiciel','martian','SaaS','>100',NULL,'2020-06-14 09:31:16','2022-02-06 15:52:36',NULL,18,1,'None',2,2,2,'1.0',NULL,NULL),(3,'Application 3','

Test application 3

',1,'RSSI',NULL,'progiciel','Microsoft','Interne','>100',NULL,'2020-06-17 17:33:41','2021-05-15 08:06:53',NULL,7,2,'Aucune',2,3,3,NULL,NULL,NULL),(4,'Application 4','

Description app4

',2,'RSSI',NULL,'logiciel','Microsoft','Internl','>100',NULL,'2020-08-11 14:13:02','2021-07-11 08:59:57',NULL,1,2,'None',2,3,2,NULL,NULL,NULL),(5,'CUST AP01','

Customer appication

',0,NULL,NULL,NULL,'web',NULL,NULL,NULL,'2020-08-22 04:58:18','2020-08-26 14:56:20','2020-08-26 14:56:20',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'totototo',NULL,0,NULL,NULL,NULL,'totottoo',NULL,NULL,NULL,'2020-08-22 04:59:26','2020-08-22 04:59:43','2020-08-22 04:59:43',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'Windows Word','

Description de l\'application

',3,'Nestor',NULL,'artificiel','client lourd',NULL,'>100',NULL,'2020-08-23 08:20:34','2020-08-26 14:56:23','2020-08-26 14:56:23',10,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'Application 99',NULL,1,'André',NULL,'progiciel','client lourd','SaaS','>100',NULL,'2020-08-23 10:08:02','2020-08-26 14:56:13','2020-08-26 14:56:13',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,'Test33','

fsfsdfsd

',0,'Nestor',NULL,'progiciel','martian',NULL,NULL,NULL,'2020-08-26 14:54:05','2020-08-26 14:54:35','2020-08-26 14:54:35',10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'Test33R','

fsfsdfsd

',0,'Nestor',NULL,'progiciel','martian',NULL,NULL,NULL,'2020-08-26 14:54:28','2020-08-26 14:54:39','2020-08-26 14:54:39',10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'SuperApp','

Supper application

',0,'RSSI',NULL,'logiciel','martian',NULL,NULL,NULL,'2021-04-12 14:54:57','2021-04-12 17:10:44','2021-04-12 17:10:44',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'SuperApp','

Super super application !

',1,'RSSI',NULL,'Web','Oracle','Interne',NULL,NULL,'2021-04-12 17:10:59','2021-06-23 19:33:15',NULL,1,2,NULL,1,1,1,NULL,NULL,NULL),(13,'test application',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2021-05-07 08:23:59','2021-05-07 08:24:03','2021-05-07 08:24:03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'Windows Calc','

Calculatrice windows

',2,'RSSI',NULL,'logiciel','Microsoft','Internl',NULL,NULL,'2021-05-13 08:15:27','2022-03-20 17:53:29',NULL,1,3,NULL,0,0,0,NULL,NULL,NULL),(15,'Compta','

Application de comptabilité

',3,'RSSI',NULL,'progiciel','Microsoft','Interne','>100',NULL,'2021-05-15 07:53:15','2021-05-15 07:53:15',NULL,1,2,NULL,4,2,3,NULL,NULL,NULL),(16,'Queue Manager','

Queue manager

',4,'RSSI',NULL,'logiciel','Internal Dev','Interne','>100',NULL,'2021-08-02 15:17:11','2021-08-02 15:18:32',NULL,1,1,'//Portal/QueueManager.doc',4,4,4,NULL,NULL,NULL),(17,'test',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2021-10-10 11:03:24','2021-10-10 11:03:24',NULL,NULL,NULL,NULL,0,0,0,NULL,NULL,NULL),(18,'Application 42','

The Ultimate Question of Life, the Universe and Everything

',-1,'Nestor',NULL,NULL,NULL,NULL,NULL,NULL,'2021-11-15 16:03:20','2021-12-11 10:06:18',NULL,NULL,NULL,NULL,-1,-1,0,NULL,NULL,NULL); +INSERT INTO `m_applications` VALUES (1,'Application 1','

Description de l\'application 1

',1,'RSSI',NULL,'logiciel','Microsoft',NULL,'> 20',NULL,'2020-06-14 09:20:15','2022-03-20 17:53:29',NULL,2,3,'//Documentation/application1.docx',1,1,1,'1.2',NULL,NULL),(2,'Application 2','

Description de l\'application 2

',2,'RSSI',NULL,'progiciel','martian','SaaS','>100',NULL,'2020-06-14 09:31:16','2022-02-06 15:52:36',NULL,18,1,'None',2,2,2,'1.0',NULL,NULL),(3,'Application 3','

Test application 3

',1,'RSSI',NULL,'progiciel','Microsoft','Interne','>100',NULL,'2020-06-17 17:33:41','2021-05-15 08:06:53',NULL,12,2,'Aucune',2,3,3,NULL,NULL,NULL),(4,'Application 4','

Description app4

',2,'RSSI',NULL,'logiciel','Microsoft','Internl','>100',NULL,'2020-08-11 14:13:02','2021-07-11 08:59:57',NULL,1,2,'None',2,3,2,NULL,NULL,NULL),(5,'CUST AP01','

Customer appication

',0,NULL,NULL,NULL,'web',NULL,NULL,NULL,'2020-08-22 04:58:18','2020-08-26 14:56:20','2020-08-26 14:56:20',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'totototo',NULL,0,NULL,NULL,NULL,'totottoo',NULL,NULL,NULL,'2020-08-22 04:59:26','2020-08-22 04:59:43','2020-08-22 04:59:43',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'Windows Word','

Description de l\'application

',3,'Nestor',NULL,'artificiel','client lourd',NULL,'>100',NULL,'2020-08-23 08:20:34','2020-08-26 14:56:23','2020-08-26 14:56:23',10,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'Application 99',NULL,1,'André',NULL,'progiciel','client lourd','SaaS','>100',NULL,'2020-08-23 10:08:02','2020-08-26 14:56:13','2020-08-26 14:56:13',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,'Test33','

fsfsdfsd

',0,'Nestor',NULL,'progiciel','martian',NULL,NULL,NULL,'2020-08-26 14:54:05','2020-08-26 14:54:35','2020-08-26 14:54:35',10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'Test33R','

fsfsdfsd

',0,'Nestor',NULL,'progiciel','martian',NULL,NULL,NULL,'2020-08-26 14:54:28','2020-08-26 14:54:39','2020-08-26 14:54:39',10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'SuperApp','

Supper application

',0,'RSSI',NULL,'logiciel','martian',NULL,NULL,NULL,'2021-04-12 14:54:57','2021-04-12 17:10:44','2021-04-12 17:10:44',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'SuperApp','

Super super application !

',1,'RSSI',NULL,'Web','Oracle','Interne',NULL,NULL,'2021-04-12 17:10:59','2021-06-23 19:33:15',NULL,1,2,NULL,1,1,1,NULL,NULL,NULL),(13,'test application',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2021-05-07 08:23:59','2021-05-07 08:24:03','2021-05-07 08:24:03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'Windows Calc','

Calculatrice windows

',2,'RSSI',NULL,'logiciel','Microsoft','Internl',NULL,NULL,'2021-05-13 08:15:27','2022-03-20 17:53:29',NULL,1,3,NULL,0,0,0,NULL,NULL,NULL),(15,'Compta','

Application de comptabilité

',3,'RSSI',NULL,'progiciel','Microsoft','Interne','>100',NULL,'2021-05-15 07:53:15','2021-05-15 07:53:15',NULL,1,2,NULL,4,2,3,NULL,NULL,NULL),(16,'Queue Manager','

Queue manager

',4,'RSSI',NULL,'logiciel','Internal Dev','Interne','>100',NULL,'2021-08-02 15:17:11','2021-08-02 15:18:32',NULL,1,1,'//Portal/QueueManager.doc',4,4,4,NULL,NULL,NULL),(17,'test',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2021-10-10 11:03:24','2021-10-10 11:03:24',NULL,NULL,NULL,NULL,0,0,0,NULL,NULL,NULL),(18,'Application 42','

The Ultimate Question of Life, the Universe and Everything

',-1,'Nestor',NULL,NULL,NULL,NULL,NULL,NULL,'2021-11-15 16:03:20','2021-12-11 10:06:18',NULL,NULL,NULL,NULL,-1,-1,0,NULL,NULL,NULL); /*!40000 ALTER TABLE `m_applications` ENABLE KEYS */; UNLOCK TABLES; @@ -488,7 +488,7 @@ UNLOCK TABLES; LOCK TABLES `mans` WRITE; /*!40000 ALTER TABLE `mans` DISABLE KEYS */; -INSERT INTO `mans` VALUES (1,'MAN_1','2020-08-22 04:17:20','2020-08-22 04:17:20',NULL),(2,'MAN_2','2021-05-07 08:14:27','2021-05-07 08:23:23',NULL); +INSERT INTO `mans` VALUES (1,'MAN_1','2020-08-22 04:17:20','2020-08-22 04:17:20',NULL),(2,'MAN_2','2021-05-07 08:14:27','2021-05-07 08:23:23',NULL),(3,'Test1','2022-04-25 12:43:02','2022-04-25 12:52:49','2022-04-25 12:52:49'),(4,'Test2','2022-04-25 12:43:09','2022-04-25 12:52:49','2022-04-25 12:52:49'); /*!40000 ALTER TABLE `mans` ENABLE KEYS */; UNLOCK TABLES; @@ -507,7 +507,7 @@ UNLOCK TABLES; LOCK TABLES `network_switches` WRITE; /*!40000 ALTER TABLE `network_switches` DISABLE KEYS */; -INSERT INTO `network_switches` VALUES (1,'Switch de test','123.4.5.6','

Test

','2020-07-13 17:30:37','2020-07-13 17:30:37',NULL); +INSERT INTO `network_switches` VALUES (1,'Switch de test','123.4.5.6','

Test

','2020-07-13 17:30:37','2020-07-13 17:30:37',NULL),(2,'Second switch','10.1.1.1','

Second commutateur de test

','2022-04-25 12:55:44','2022-04-25 12:55:44',NULL); /*!40000 ALTER TABLE `network_switches` ENABLE KEYS */; UNLOCK TABLES; @@ -675,7 +675,7 @@ UNLOCK TABLES; LOCK TABLES `physical_switches` WRITE; /*!40000 ALTER TABLE `physical_switches` DISABLE KEYS */; -INSERT INTO `physical_switches` VALUES (1,'Switch de test','

Master test switch

','Nortel A39','2020-07-17 13:29:09','2022-01-19 17:08:52',NULL,1,2,4),(2,'Switch 2','

Description switch 2

','Alcatel 430','2020-07-17 13:31:41','2020-07-17 13:31:41',NULL,1,1,1),(3,'Switch 1','

Desription du premier switch 

','Nortel 2300','2020-07-25 05:27:27','2021-06-03 10:43:35',NULL,2,3,5),(4,'Switch 3','

Desciption du switch 3

','Alcatel 3500','2020-07-25 07:42:51','2020-07-25 07:43:21',NULL,3,5,6),(5,'AB','

Test 2 chars switch

',NULL,'2020-08-22 04:19:45','2020-08-27 16:04:20','2020-08-27 16:04:20',NULL,NULL,NULL); +INSERT INTO `physical_switches` VALUES (1,'Switch de test','

Master test switch.

','Nortel A39','2020-07-17 13:29:09','2022-04-25 16:22:02',NULL,1,2,4),(2,'Switch 2','

Description switch 2

','Alcatel 430','2020-07-17 13:31:41','2020-07-17 13:31:41',NULL,1,1,1),(3,'Switch 1','

Desription du premier switch.

','Nortel 2300','2020-07-25 05:27:27','2022-04-25 12:55:06',NULL,2,3,5),(4,'Switch 3','

Desciption du switch 3

','Alcatel 3500','2020-07-25 07:42:51','2020-07-25 07:43:21',NULL,3,5,6),(5,'AB','

Test 2 chars switch

',NULL,'2020-08-22 04:19:45','2020-08-27 16:04:20','2020-08-27 16:04:20',NULL,NULL,NULL); /*!40000 ALTER TABLE `physical_switches` ENABLE KEYS */; UNLOCK TABLES; @@ -828,4 +828,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-04-13 0:53:25 +-- Dump completed on 2022-05-02 21:16:35 diff --git a/resources/lang/en/cruds.php b/resources/lang/en/cruds.php index 68c9922a..67211fba 100644 --- a/resources/lang/en/cruds.php +++ b/resources/lang/en/cruds.php @@ -104,9 +104,9 @@ "editor" => "Editor", "editor_helper" => "Application's editor", "install_date" => "Installation date", - "install_date_helper" => "", + "install_date_helper" => "Application installation date", "update_date" => "Last update", - "update_date_helper" => "", + "update_date_helper" => "Last application update", ], 'title' => 'Applications', 'title_short' => 'Applications', @@ -509,6 +509,10 @@ 'operating_system_helper' => 'OS name and version', 'servers' => 'Physical servers', 'servers_helper' => 'Support physical server', + 'install_date' => 'Installation date', + 'install_date_helper' => 'Logical server installation date', + 'update_date' => 'Update date', + 'update_date_helper' => 'Last logical server update', ], 'title' => 'Logical Servers', 'title_short' => 'Servers', diff --git a/resources/lang/fr/cruds.php b/resources/lang/fr/cruds.php index a3fc0fb2..565e8f25 100644 --- a/resources/lang/fr/cruds.php +++ b/resources/lang/fr/cruds.php @@ -104,9 +104,9 @@ "editor" => "Éditeur", "editor_helper" => "L'éditeur de l'application", "install_date" => "Date d'installation", - "install_date_helper" => "", - "update_date" => "Dernière de dernière mise à jour", - "update_date_helper" => "", + "install_date_helper" => "Date d'installation de l'application", + "update_date" => "Date de mise à jour", + "update_date_helper" => "Date de dernière de dernière mise à jour", ], 'title' => 'Applications', 'title_short' => 'Applications', @@ -500,15 +500,19 @@ 'environment' => 'Environnement', 'environment_helper' => 'Prod, Préprod, Test, Dev, Integration, ...', 'memory' => 'Mémoire', - 'memory_helper' => 'Quantité de mémoire allouée', + 'memory_helper' => 'Quantité de mémoire allouée (GB)', 'name' => 'Nom', 'name_helper' => '', 'net_services' => 'Services réseau actifs', 'net_services_helper' => '', - 'operating_system' => 'Operating Système', + 'operating_system' => 'Système d\'exploitation', 'operating_system_helper' => "Nom et version de l'OS", 'servers' => 'Serveurs physiques', 'servers_helper' => 'Serveur physique de support', + "install_date" => "Date d'installation", + "install_date_helper" => "Date d'installation du système d'exploitation", + "update_date" => "Date de mise à jour", + "update_date_helper" => "Date de dernière de dernière mise à jour du système d'exploitation", ], 'title' => 'Serveurs logiques', 'title_short' => 'Serveurs', diff --git a/resources/views/admin/applications/create.blade.php b/resources/views/admin/applications/create.blade.php index 53a844c3..03ef9091 100644 --- a/resources/views/admin/applications/create.blade.php +++ b/resources/views/admin/applications/create.blade.php @@ -115,6 +115,13 @@ @endif {{ trans('cruds.application.fields.functional_referent_helper') }} + +
+ + + {{ trans('cruds.application.fields.install_date_helper') }} +
+
@@ -192,6 +199,11 @@ @endif {{ trans('cruds.application.fields.editor_helper') }}
+
+ + + {{ trans('cruds.application.fields.update_date_helper') }} +
@@ -236,24 +248,7 @@
-
-
-
- - - {{ trans('cruds.application.fields.install_date_helper') }} -
-
-
-
- - - {{ trans('cruds.application.fields.update_date_helper') }} -
-
-
- -
+
diff --git a/resources/views/admin/applications/edit.blade.php b/resources/views/admin/applications/edit.blade.php index f9fd10af..f0b6f28f 100644 --- a/resources/views/admin/applications/edit.blade.php +++ b/resources/views/admin/applications/edit.blade.php @@ -116,6 +116,11 @@ @endif {{ trans('cruds.application.fields.functional_referent_helper') }} +
+ + + {{ trans('cruds.application.fields.install_date_helper') }} +
@@ -192,6 +197,11 @@ @endif {{ trans('cruds.application.fields.editor_helper') }}
+
+ + + {{ trans('cruds.application.fields.update_date_helper') }} +
@@ -269,22 +279,6 @@
-
-
-
- - - {{ trans('cruds.application.fields.install_date_helper') }} -
-
-
-
- - - {{ trans('cruds.application.fields.update_date_helper') }} -
-
-
diff --git a/resources/views/admin/logicalServers/create.blade.php b/resources/views/admin/logicalServers/create.blade.php index 2e34c939..b56960ca 100644 --- a/resources/views/admin/logicalServers/create.blade.php +++ b/resources/views/admin/logicalServers/create.blade.php @@ -48,21 +48,23 @@ {{ $errors->first('operating_system') }}
@endif - {{ trans('cruds.logicalServer.fields.environment') }} + {{ trans('cruds.logicalServer.fields.operating_system_helper') }}
- - - @if($errors->has('address_ip')) -
- {{ $errors->first('address_ip') }} -
- @endif - {{ trans('cruds.logicalServer.fields.address_ip_helper') }} + + + {{ trans('cruds.logicalServer.fields.install_date_helper') }} +
+ +
+ + + {{ trans('cruds.logicalServer.fields.update_date_helper') }}
+
@@ -118,7 +120,18 @@ {{ $errors->first('environment') }}
@endif - {{ trans('cruds.logicalServer.fields.environment') }} + {{ trans('cruds.logicalServer.fields.environment_helper') }} + + +
+ + + @if($errors->has('address_ip')) +
+ {{ $errors->first('address_ip') }} +
+ @endif + {{ trans('cruds.logicalServer.fields.address_ip_helper') }}
diff --git a/resources/views/admin/logicalServers/edit.blade.php b/resources/views/admin/logicalServers/edit.blade.php index daaa867e..b18c2716 100644 --- a/resources/views/admin/logicalServers/edit.blade.php +++ b/resources/views/admin/logicalServers/edit.blade.php @@ -53,14 +53,15 @@
- - - @if($errors->has('address_ip')) -
- {{ $errors->first('address_ip') }} -
- @endif - {{ trans('cruds.logicalServer.fields.address_ip_helper') }} + + + {{ trans('cruds.logicalServer.fields.install_date_helper') }} +
+ +
+ + + {{ trans('cruds.logicalServer.fields.update_date_helper') }}
@@ -120,6 +121,17 @@ {{ trans('cruds.logicalServer.fields.environment_helper') }} +
+ + + @if($errors->has('address_ip')) +
+ {{ $errors->first('address_ip') }} +
+ @endif + {{ trans('cruds.logicalServer.fields.address_ip_helper') }} +
+
diff --git a/site/admin/index.html b/site/admin/index.html index 472d12cd..44799c90 100644 --- a/site/admin/index.html +++ b/site/admin/index.html @@ -189,7 +189,7 @@

Gestion des utilisateurs

-

Les mots de passes sont hashés par la fonction fournie en standard dans Laravel.

+

Les mots de passe sont hashés par la fonction fournie en standard dans Laravel.

Il est possible de connecter Mercator à un annuaire LDAP (voir LoginController.php).

Gestion des rôles

Pour chaque objet de la cartographie, il existe un droit en :

@@ -202,16 +202,16 @@

Gestion des rôles

Trois rôles sont encodés par défaut :

    -
  • Utilisateur : les utilisateur ont tous les droits sur tous les object à l'exception des utilisateurs et de la configuation.
  • -
  • Auditeur : l'auditeur à le droit d'accéder et d'afficher tous les objets à l'exception des utilisateurs et de la configutation.
  • +
  • Utilisateur : les utilisateurs ont tous les droits sur tous les objets à l'exception des utilisateurs et de la configuation.
  • +
  • Auditeur : l'auditeur a le droit d'accéder et d'afficher tous les objets à l'exception des utilisateurs et de la configutation.
  • Administrateur : l'administrateur a tous les droits sans exception.

Il est possible de créer de nouveaux rôles selon les besoins.

Gestion des certificats

-

Des notifications d'expiration des certificats peuvent être envoyés à des pérides définies.

+

Des notifications d'expiration des certificats peuvent être envoyés à des périodes définies.

L'écran de configuration est accessible via le menu "Préférences" -> "Configuration".

-

Le bouton "Test"permet d'nvoyer un mail de test à l'adresse de notification spécifiées.

+

Le bouton "Test" permet d'envoyer un mail de test à l'adresse de notification spécifiée.

diff --git a/site/application/index.html b/site/application/index.html index a6758a96..1169219a 100644 --- a/site/application/index.html +++ b/site/application/index.html @@ -133,7 +133,7 @@

Page principale

  • La carte proportionnelle globale des objets de la cartographie
  • -

    Chaque élément est sélectonnable et donne accès à la liste des objets de la cartographie sélectionnés.

    +

    Chaque élément est sélectionnable et donne accès à la liste des objets de la cartographie sélectionnées.

    Les menus