Moves more indexes to blade components

app/Helpers/IconHelper.php

@@ -131,9 +131,12 @@ public static function icon($type) {
                 return 'fa-regular fa-clipboard';
             case 'paperclip':
                 return 'fas fa-paperclip';
+            case 'contact-card':
+                return 'fa-regular fa-id-card';
             case 'files':
                 return 'fa-regular fa-file';
             case 'more-info':
+            case 'support':
                 return 'far fa-life-ring';
             case 'calendar':
                 return 'fas fa-calendar';
@@ -144,7 +147,7 @@ public static function icon($type) {
             case 'more-files':
                 return 'fa-solid fa-laptop-file';
             case 'maintenances':
-                return 'fas fa-wrench';
+                return 'fa-solid fa-screwdriver-wrench';
             case 'seats':
                 return 'far fa-list-alt';
             case 'globe-us':
@@ -203,6 +206,12 @@ public static function icon($type) {
                 return 'fa-solid fa-lightbulb';
             case 'highlight':
                 return 'fa-solid fa-highlighter';
+            case 'manager':
+                return 'fa-solid fa-building-user';
+            case 'company':
+                return 'fa-regular fa-building';
+            case 'parent':
+                return 'fa-solid fa-building-flag';
         }
     }
 }

app/Presenters/AccessoryPresenter.php

@@ -22,6 +22,13 @@ public static function dataTableLayout()
                 'title' => trans('general.id'),
                 'visible' => false,
                 'printIgnore' => true,
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'formatter' => 'accessoriesLinkFormatter',
             ], [
                 'field' => 'image',
                 'searchable' => false,
@@ -38,14 +45,7 @@ public static function dataTableLayout()
                 'title' => trans('admin/companies/table.title'),
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
-            ], [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('general.name'),
-                'formatter' => 'accessoriesLinkFormatter',
-            ], [
+            ],  [
                 'field' => 'category',
                 'searchable' => true,
                 'sortable' => true,
@@ -172,6 +172,7 @@ public static function dataTableLayout()
                 'visible' => true,
                 'title' => trans('general.change'),
                 'formatter' => 'accessoriesInOutFormatter',
+                'printIgnore' => true,
             ], [
                 'field' => 'available_actions',
                 'searchable' => false,

app/Presenters/ComponentPresenter.php

@@ -21,6 +21,13 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'componentsLinkFormatter',
             ],
             [
                 'field' => 'company',
@@ -31,14 +38,7 @@ public static function dataTableLayout()
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
             ],
-            [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'title' => trans('general.name'),
-                'visible' => true,
-                'formatter' => 'componentsLinkFormatter',
-            ], [
+             [
                 'field' => 'image',
                 'searchable' => false,
                 'sortable' => true,

app/Presenters/ConsumablePresenter.php

@@ -21,25 +21,24 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-            ],
-            [
-                'field' => 'company',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.company'),
-                'visible' => false,
-                'formatter' => 'companiesLinkObjFormatter',
-            ],
-            [
+            ], [
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'consumablesLinkFormatter',
+            ], [
+                'field' => 'company',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => false,
+                'formatter' => 'companiesLinkObjFormatter',
             ],
+
             [
                 'field' => 'image',
                 'searchable' => false,
@@ -172,6 +171,7 @@ public static function dataTableLayout()
                 'visible' => true,
                 'title' => trans('general.change'),
                 'formatter' => 'consumablesInOutFormatter',
+                'printIgnore' => true,
             ], [
                 'field' => 'actions',
                 'searchable' => false,

app/Presenters/DepartmentPresenter.php

@@ -22,24 +22,22 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-            ],
-            [
-                'field' => 'company',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.company'),
-                'visible' => false,
-                'formatter' => 'companiesLinkObjFormatter'
-            ],
-            [
+            ], [
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => false,
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'departmentsLinkFormatter',
+            ], [
+                'field' => 'company',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => false,
+                'formatter' => 'companiesLinkObjFormatter'
             ], [
                 'field' => 'image',
                 'searchable' => false,
@@ -112,6 +110,7 @@ public static function dataTableLayout()
                 'title' => trans('table.actions'),
                 'visible' => true,
                 'formatter' => 'departmentsActionsFormatter',
+                'printIgnore' => true,
             ],
         ];
 

app/Presenters/GroupPresenter.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class GroupPresenter
+ */
+class GroupPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'groupsAdminLinkFormatter',
+            ],
+            [
+                'field' => 'users_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/groups/table.users'),
+                'visible' => true,
+                'class' => 'css-users',
+            ],  [
+                'field' => 'notes',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => true,
+                'title' => trans('general.notes'),
+            ], [
+                'field' => 'created_by',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => true,
+                'formatter' => 'usersLinkObjFormatter',
+            ],  [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'visible' => true,
+                'formatter' => 'groupsActionsFormatter',
+                'printIgnore' => true,
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
+}

app/Presenters/LicensePresenter.php

@@ -21,6 +21,13 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
+            ],  [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'company',
                 'searchable' => true,
@@ -29,13 +36,6 @@ public static function dataTableLayout()
                 'title' => trans('admin/companies/table.title'),
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
-            ], [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('general.name'),
-                'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'product_key',
                 'searchable' => true,

app/Presenters/LocationPresenter.php

@@ -333,6 +333,7 @@ public static function assignedAccessoriesDataTableLayout()
                 'switchable' => false,
                 'title' => trans('table.actions'),
                 'formatter' => 'accessoriesInOutFormatter',
+                'printIgnore' => true,
             ],
         ];
 

app/Presenters/Presenter.php

@@ -21,6 +21,35 @@ public function __construct(SnipeModel $model)
         $this->model = $model;
     }
 
+    public function displayAddress() {
+        $address = '';
+        if ($this->model->address) {
+            $address .= e($this->model->address)."\n";
+        }
+
+        if ($this->model->address2) {
+            $address .= e($this->model->address2)."\n";
+        }
+
+        if ($this->model->city) {
+            $address .= e($this->model->city).', ';
+        }
+
+        if ($this->model->state) {
+            $address .= e($this->model->state).' ';
+        }
+
+        if ($this->model->zip) {
+            $address .= e($this->model->zip).' ';
+        }
+
+        if ($this->model->country) {
+            $address .= e($this->model->country).' ';
+        }
+
+        return $address;
+    }
+
     // Convenience functions for datatables stuff
     public function categoryUrl()
     {
@@ -70,30 +99,7 @@ public function manufacturerUrl()
         return '';
     }
 
-//    public function name()
-//    {
-//        return $this->model->name;
-//    }
-//
-//    public function display_name()
-//    {
-//        return $this->model->display_name;
-//    }
-
-
-//    protected function displayName(): Attribute
-//    {
-//        // This override should only kick in if the model has a display_name prope
-//        if ($this->getRawOriginal('display_name')) {
-//            return Attribute:: make (
-//                get: fn(mixed $value) => 'Poop:'.$this->display_name
-//            );
-//        }
-//
-//        return Attribute:: make(
-//            get: fn(mixed $value) => 'Fart: '.$this->name,
-//        );
-//    }
+
 
     public function __get($property)
     {
@@ -108,4 +114,6 @@ public function __call($method, $args)
     {
         return $this->model->$method($args);
     }
+
+
 }

app/Presenters/SupplierPresenter.php

@@ -3,7 +3,7 @@
 namespace App\Presenters;
 
 /**
- * Class LocationPresenter
+ * Class SupplierPresenter
  */
 class SupplierPresenter extends Presenter
 {

app/Presenters/UploadedFilesPresenter.php

@@ -92,6 +92,7 @@ public static function dataTableLayout()
                 'title' => trans('table.actions'),
                 'visible' => true,
                 'formatter' => 'deleteUploadFormatter',
+                'printIgnore' => true,
             ],
         ];