From cdbf8e98e4ecc555d13ba0159c3c0ed607e8b5c6 Mon Sep 17 00:00:00 2001 From: SourceDoctor Date: Fri, 17 Apr 2020 22:49:59 +0200 Subject: [PATCH] correct getTypes - remove change to lower case --- .../Controllers/Table/EventlogController.php | 2 +- app/Models/Sensor.php | 36 +++++++++---------- app/Providers/AppServiceProvider.php | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/Table/EventlogController.php b/app/Http/Controllers/Table/EventlogController.php index c42fcef457..8f4e744a17 100644 --- a/app/Http/Controllers/Table/EventlogController.php +++ b/app/Http/Controllers/Table/EventlogController.php @@ -89,7 +89,7 @@ class EventlogController extends TableController return '' . Url::portLink($port, $port->getShortLabel()) . ''; } } - } elseif (in_array(strtolower($eventlog->type), \App\Models\Sensor::getTypes())) { + } elseif (in_array($eventlog->type, \App\Models\Sensor::getTypes())) { if (is_numeric($eventlog->reference)) { $sensor = $eventlog->related; if (isset($sensor)) { diff --git a/app/Models/Sensor.php b/app/Models/Sensor.php index 5a5ca21404..e4a482f180 100644 --- a/app/Models/Sensor.php +++ b/app/Models/Sensor.php @@ -6,7 +6,6 @@ class Sensor extends DeviceRelatedModel { public $timestamps = false; protected $primaryKey = 'sensor_id'; - protected static $icons = array( 'airflow' => 'angle-double-right', 'ber' => 'sort-amount-desc', @@ -56,31 +55,32 @@ class Sensor extends DeviceRelatedModel public static function getTypes() { - return ['airflow', + return ['Airflow', 'ber', + 'Battery Charge', 'chromatic_dispersion', - 'cooling', + 'Cooling', 'count', - 'current', - 'dbm', + 'Current', + 'dBm', 'delay', - 'eer', - 'fanspeed', - 'frequency', - 'humidity', - 'load', + 'Energy Efficiency Ratio', + 'Fanspeed', + 'Frequency', + 'Humidity', + 'Load', 'power_consumed', 'power_factor', - 'power', - 'pressure', + 'Power', + 'Pressure', 'quality_factor', - 'runtime', - 'signal', + 'Runtime', + 'Wireless', 'snr', - 'state', - 'temperature', - 'voltage', - 'waterflow', + 'State', + 'Temperature', + 'Voltage', + 'Water Flow Rate', ]; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e194634226..96740d103e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -76,8 +76,8 @@ class AppServiceProvider extends ServiceProvider private function configureMorphAliases() { $sensor_types = []; - foreach (Sensor::getTypes() as $type) { - $sensor_types[ucwords($type)] = \App\Models\Sensor::class; + foreach (Sensor::getTypes() as $sensor_type) { + $sensor_types[$sensor_type] = \App\Models\Sensor::class; }; Relation::morphMap(array_merge([ 'interface' => \App\Models\Port::class,