diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 8ac4307a5573ea0a7953254595af9b9b5bdf8212..20f8db1f23823388e9348d5584a25c377d6571b3 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -1,6 +1,7 @@ <?php namespace App\Http\Controllers\Api; +use App\Events\CheckoutableCheckedIn; use Illuminate\Support\Facades\Gate; use App\Helpers\Helper; use App\Http\Controllers\Controller; @@ -782,6 +783,8 @@ class AssetsController extends Controller if ($asset->save()) { $asset->logCheckin($target, e($request->input('note'))); + event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'))); + return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success'))); } diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 567159c58fd52109839f829232b7d29dd1f328ce..0e5b6cb53639a1dd381580e973fbc83d56fe452c 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -167,10 +167,7 @@ class StatuslabelsController extends Controller { $this->authorize('view', Statuslabel::class); - $statuslabels = Statuslabel::with('assets') - ->groupBy('id') - ->withCount('assets as assets_count') - ->get(); + $statuslabels = Statuslabel::withCount('assets')->get(); $labels=[]; $points=[]; diff --git a/docker/startup.sh b/docker/startup.sh index 726aafd16b8d0602e446621993ea14223260b690..a9b8cb5fa084df02ee7123d8bc2f8b3f56f79247 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -54,7 +54,7 @@ then cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ fi -if [ $SESSION_DRIVER = "database" ] +if [ "$SESSION_DRIVER" = "database" ] then cp -ax /var/www/html/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub /var/www/html/database/migrations/2021_05_06_0000_create_sessions_table.php fi diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 5608c3bd139f52e6390fb17e82f4f68e23369ab1..ae6c2406cc21b1873ee185b198e9a0ad0f006fd3 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -87,7 +87,7 @@ {{ $asset->last_checkout }}</td> <td> @if ($asset->assetlog->first()) - <img height="20%" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"> + <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"> @endif </td> </tr> @@ -106,7 +106,7 @@ <td>{{ $asset->serial }}</td> <td> {{ $asset->last_checkout }}</td> - <td><img height="20%" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></img></td> + <td><img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></td> </tr> @php $assignedCounter++