Revert "Tighten PR by reverting unrelated flagged files"

This reverts commit 6d7afc9.

Author: WatchDoges101

.devcontainer/devcontainer.json

@@ -9,8 +9,6 @@ public static function icon($type) {
         switch ($type) {
             case 'checkout':
                 return 'fa-solid fa-rotate-left';
-            case 'reset':
-                return 'fa-solid fa-arrow-rotate-left';
             case 'checkin':
                 return 'fa-solid fa-rotate-right';
             case 'edit':
@@ -91,8 +89,11 @@ public static function icon($type) {
             case 'licenses':
             case 'license':
                 return 'far fa-save';
+            case 'requests':
             case 'requestable':
-                return 'fas fa-laptop';
+            case 'request':
+            case 'requested':
+                return 'fa-solid fa-bell-concierge';
             case 'reports':
                 return 'fas fa-chart-bar';
             case 'heart':
@@ -255,9 +256,13 @@ public static function icon($type) {
             case 'models':
             case 'model':
                 return 'fa-solid fa-boxes-stacked';
+            case 'replenish':
+                return 'fa-solid fa-arrows-up-to-line';
             case 'min-qty':
                 return 'fa-solid fa-chart-pie';
 
+
+
         }
     }
 }

app/Helpers/IconHelper.php

@@ -28,23 +28,41 @@ public function __construct()
      */
     public function get()
     {
+
         try {
 
             if (DB::select('select 2 + 2')) {
-                return response()->json([
-                    'status' => 'ok',
-                ]);
+                $db_status = 'ok';
+            } else {
+                $db_status = 'Could not connect to database';
             }
 
         } catch (\Exception $e) {
-            \Log::error('Could not connect to database');
+            $db_status = 'Could not connect to database';
+
+        }
+
+
+        if (is_writable(storage_path('logs'))) {
+            $filesystem_status = 'ok';
+        } else {
+            $filesystem_status = 'Could not write to storage/logs';
+        }
+
+        if (($filesystem_status!='ok') || ($db_status!='ok')) {
             return response()->json([
-                'status' => 'database connection failed',
+                'status' =>
+                    [
+                        'database' => $db_status,
+                        'filesystem' => $filesystem_status,
+                    ]
             ], 500);
-
         }
 
 
+        return response()->json([
+            'status' => 'ok',
+        ]);
 
     }
 }

app/Http/Controllers/HealthController.php

@@ -44,6 +44,7 @@ public function transformCustomField(CustomField $field)
             'db_column_name' => e($field->db_column_name()),
             'format'   =>  e($field->format),
             'field_values'   => ($field->field_values) ? e($field->field_values) : null,
+            'field_encrypted' => $field->field_encrypted,
             'field_values_array'   => ($field->field_values) ? explode("\r\n", e($field->field_values)) : null,
             'type'   =>  e($field->element),
             'required'   =>  (($field->pivot) && ($field->pivot->required=='1')) ? true : false,

app/Http/Transformers/CustomFieldsTransformer.php

@@ -271,7 +271,7 @@ public function users()
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 
     /**

app/Models/Accessory.php

@@ -242,7 +242,7 @@ public function models()
 
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 
     /**

app/Models/Category.php

@@ -320,7 +320,7 @@ private static function scopeCompanyablesDirectly($query, $column = 'company_id'
 
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 
 

app/Models/Company.php

@@ -108,7 +108,7 @@ public function assets()
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 
 

app/Models/Depreciation.php

@@ -68,7 +68,7 @@ public function users()
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 
     /**

app/Models/Group.php

@@ -24,6 +24,6 @@ class Import extends Model
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
     }
 }