From 47186b0abe7940d843eb9f12fa8bc0bf355b44e0 Mon Sep 17 00:00:00 2001
From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Sun, 22 Oct 2023 16:28:44 +0200
Subject: [PATCH 1/2] [FIX] Custom report - date fields error

Custom report in v6.2.3 give Error if selected are fields:
Purchase Date, Checkout Date, Last Checkin Date, Expected Checkin Date
Reason is: date field format
---
 app/Http/Requests/CustomAssetReportRequest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Http/Requests/CustomAssetReportRequest.php b/app/Http/Requests/CustomAssetReportRequest.php
index a34d1b8ae..2a8fbe7fa 100644
--- a/app/Http/Requests/CustomAssetReportRequest.php
+++ b/app/Http/Requests/CustomAssetReportRequest.php
@@ -22,9 +22,6 @@ class CustomAssetReportRequest extends Request
     public function rules()
     {
         return [
-            'purchase_date'         => 'date|date_format:Y-m-d|nullable',
-            'checkout_date'         => 'date|date_format:Y-m-d|nullable',
-            'checkin_date'          => 'date|date_format:Y-m-d|nullable',
             'purchase_start'        => 'date|date_format:Y-m-d|nullable',
             'purchase_end'          => 'date|date_format:Y-m-d|nullable',
             'created_start'         => 'date|date_format:Y-m-d|nullable',

From 7571d45d44a8053950692d158996a02e3d7c0ce7 Mon Sep 17 00:00:00 2001
From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Sun, 22 Oct 2023 17:41:33 +0200
Subject: [PATCH 2/2] [Improvement[ Dashboard

If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.
In other way if multicompanies option is disabled then locations are displayed.
---
 resources/views/dashboard.blade.php | 183 +++++++++++++++++++---------
 1 file changed, 128 insertions(+), 55 deletions(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 296a940b3..274494687 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -274,63 +274,136 @@
 </div> <!--/row-->
 <div class="row">
     <div class="col-md-6">
-         <!-- Locations -->
-         <div class="box box-default">
-            <div class="box-header with-border">
-                <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.locations') }}</h2>
-                <div class="box-tools pull-right">
-                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
-                        <i class="fas fa-minus" aria-hidden="true"></i>
-                        <span class="sr-only">{{ trans('general.collapse') }}</span>
-                    </button>
-                </div>
-            </div>
-            <!-- /.box-header -->
-            <div class="box-body">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="table-responsive">
-                        <table
-                                data-cookie-id-table="dashLocationSummary"
-                                data-height="400"
-                                data-pagination="true"
-                                data-side-pagination="server"
-                                data-sort-order="desc"
-                                data-sort-field="assets_count"
-                                id="dashLocationSummary"
-                                class="table table-striped snipe-table"
-                                data-url="{{ route('api.locations.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
 
-                            <thead>
-                            <tr>
-                                <th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
-                                
-                                <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
-                                    <i class="fas fa-barcode" aria-hidden="true"></i>
-                                    <span class="sr-only">{{ trans('general.asset_count') }}</span>
-                                </th>
-                                <th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
-                                    
-                                    {{ trans('general.assigned') }}
-                                </th>
-                                <th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
-                                    <i class="fas fa-users" aria-hidden="true"></i>
-                                    <span class="sr-only">{{ trans('general.people') }}</span>
-                                    
-                                </th>
-                                
-                            </tr>
-                            </thead>
-                        </table>
-                        </div>
-                    </div> <!-- /.col -->
-                    <div class="text-center col-md-12" style="padding-top: 10px;">
-                        <a href="{{ route('locations.index') }}" class="btn btn-primary btn-sm" style="width: 100%">{{ trans('general.viewall') }}</a>
-                    </div>
-                </div> <!-- /.row -->
+		@if ($snipeSettings->full_multiple_companies_support=='1')
+			 <!-- Companies -->	
+			<div class="box box-default">
+				<div class="box-header with-border">
+					<h2 class="box-title">{{ trans('general.companies') }}</h2>
+					<div class="box-tools pull-right">
+						<button type="button" class="btn btn-box-tool" data-widget="collapse">
+							<i class="fas fa-minus" aria-hidden="true"></i>
+							<span class="sr-only">{{ trans('general.collapse') }}</span>
+						</button>
+					</div>
+				</div>
+				<!-- /.box-header -->
+				<div class="box-body">
+					<div class="row">
+						<div class="col-md-12">
+							<div class="table-responsive">
+							<table
+									data-cookie-id-table="dashCompanySummary"
+									data-height="400"
+									data-pagination="true"
+									data-side-pagination="server"
+									data-sort-order="desc"
+									data-sort-field="assets_count"
+									id="dashCompanySummary"
+									class="table table-striped snipe-table"
+									data-url="{{ route('api.companies.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
 
-            </div><!-- /.box-body -->
-        </div> <!-- /.box -->
+								<thead>
+								<tr>
+									<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
+									<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
+										<i class="fas fa-users" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.people') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
+										<i class="fas fa-barcode" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.asset_count') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
+										<i class="far fa-keyboard" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.accessories_count') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
+										<i class="fas fa-tint" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.consumables_count') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
+										<i class="far fa-hdd" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.components_count') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
+										<i class="far fa-save" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.licenses_count') }}</span>
+									</th>
+								</tr>
+								</thead>
+							</table>
+							</div>
+						</div> <!-- /.col -->
+						<div class="text-center col-md-12" style="padding-top: 10px;">
+							<a href="{{ route('companies.index') }}" class="btn btn-primary btn-sm" style="width: 100%">{{ trans('general.viewall') }}</a>
+						</div>
+					</div> <!-- /.row -->
+
+				</div><!-- /.box-body -->
+			</div> <!-- /.box -->
+		
+		@else
+			 <!-- Locations -->
+			 <div class="box box-default">
+				<div class="box-header with-border">
+					<h2 class="box-title">{{ trans('general.locations') }}</h2>
+					<div class="box-tools pull-right">
+						<button type="button" class="btn btn-box-tool" data-widget="collapse">
+							<i class="fas fa-minus" aria-hidden="true"></i>
+							<span class="sr-only">{{ trans('general.collapse') }}</span>
+						</button>
+					</div>
+				</div>
+				<!-- /.box-header -->
+				<div class="box-body">
+					<div class="row">
+						<div class="col-md-12">
+							<div class="table-responsive">
+							<table
+									data-cookie-id-table="dashLocationSummary"
+									data-height="400"
+									data-pagination="true"
+									data-side-pagination="server"
+									data-sort-order="desc"
+									data-sort-field="assets_count"
+									id="dashLocationSummary"
+									class="table table-striped snipe-table"
+									data-url="{{ route('api.locations.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
+
+								<thead>
+								<tr>
+									<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
+									
+									<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
+										<i class="fas fa-barcode" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.asset_count') }}</span>
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
+										
+										{{ trans('general.assigned') }}
+									</th>
+									<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
+										<i class="fas fa-users" aria-hidden="true"></i>
+										<span class="sr-only">{{ trans('general.people') }}</span>
+										
+									</th>
+									
+								</tr>
+								</thead>
+							</table>
+							</div>
+						</div> <!-- /.col -->
+						<div class="text-center col-md-12" style="padding-top: 10px;">
+							<a href="{{ route('locations.index') }}" class="btn btn-primary btn-sm" style="width: 100%">{{ trans('general.viewall') }}</a>
+						</div>
+					</div> <!-- /.row -->
+
+				</div><!-- /.box-body -->
+			</div> <!-- /.box -->
+
+		@endif
+			
     </div>
     <div class="col-md-6">