From d1a306cfd8b891728197c1d1654a88cda980c6bd Mon Sep 17 00:00:00 2001 From: mtucker6784 Date: Mon, 9 Nov 2015 08:25:29 -0700 Subject: [PATCH] Yay, asset image progress! --- app/controllers/admin/AssetsController.php | 31 +++++++++++++++++++++- app/lang/en/admin/hardware/table.php | 1 + app/lang/en/general.php | 1 + app/views/backend/hardware/edit.blade.php | 28 ++++++++++++++++--- app/views/backend/hardware/index.blade.php | 1 + app/views/backend/hardware/view.blade.php | 21 ++++++++++----- 6 files changed, 72 insertions(+), 11 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index c2de106483..cc2a4e36b5 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -2,6 +2,7 @@ use AdminController; use Input; +use Image; use Lang; use Asset; use Supplier; @@ -29,6 +30,7 @@ use Paginator; use Manufacturer; //for embedded-create use Artisan; use Symfony\Component\Console\Output\BufferedOutput; +use Symfony\Component\HttpFoundation\JsonResponse; class AssetsController extends AdminController @@ -169,6 +171,18 @@ class AssetsController extends AdminController $asset->physical = '1'; $asset->depreciate = '0'; + // Create the image (if one was chosen.) + if (Input::file('image')) { + $image = Input::file('image'); + $file_name = str_random(25).".".$image->getClientOriginalExtension(); + $path = public_path('uploads/assets/'.$file_name); + Image::make($image->getRealPath())->resize(300, null, function ($constraint) { + $constraint->aspectRatio(); + $constraint->upsize(); + })->save($path); + $asset->image = $file_name; + + // Was the asset created? if($asset->save()) { @@ -181,7 +195,7 @@ class AssetsController extends AdminController $logaction->note = e(Input::get('note')); $log = $logaction->logaction('checkout'); } - + } // Redirect to the asset listing page return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success')); } @@ -308,6 +322,20 @@ class AssetsController extends AdminController $asset->notes = e(Input::get('notes')); $asset->physical = '1'; + // Update the image + if (Input::file('image')) { + $image = Input::file('image'); + $file_name = str_random(25).".".$image->getClientOriginalExtension(); + $path = public_path('uploads/assets/'.$file_name); + Image::make($image->getRealPath())->resize(300, null, function ($constraint) { + $constraint->aspectRatio(); + $constraint->upsize(); + })->save($path); + $asset->image = $file_name; + } + + + // Was the asset updated? if($asset->save()) { // Redirect to the new asset page @@ -1208,6 +1236,7 @@ class AssetsController extends AdminController $rows[] = array( 'checkbox' =>'
', 'id' => $asset->id, + 'image' => ($asset->image!='') ? '' : (($asset->model->image!='') ? '' : ''), 'name' => ''.$asset->name.'', 'asset_tag' => ''.$asset->asset_tag.'', 'serial' => $asset->serial, diff --git a/app/lang/en/admin/hardware/table.php b/app/lang/en/admin/hardware/table.php index 62dbc28ce1..e8baa09d5a 100755 --- a/app/lang/en/admin/hardware/table.php +++ b/app/lang/en/admin/hardware/table.php @@ -18,6 +18,7 @@ return array( 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance' ); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index c9ddda5ab5..bc35d9e3ef 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -140,4 +140,5 @@ 'years' => 'years', 'yes' => 'Yes', 'zip' => 'Zip', + 'noimage' => 'No image uploaded or image not found.', ]; diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index d313f3e418..6402f2207a 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -113,9 +113,9 @@
@if ($asset->id) -
+ @else - + @endif @@ -300,11 +300,33 @@
+ + @if ($asset->image) +
+ +
+ {{ Form::checkbox('image_delete') }} + + {{ $errors->first('image_delete', '
:message') }} +
+
+ @endif + +
+ +
+ {{ Form::file('image') }} + {{ $errors->first('image', '
:message') }} +
+
+ + +
- @lang('button.cancel') + @lang('button.cancel')
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 128a9bd262..9d05ee5421 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -67,6 +67,7 @@
@lang('general.id') + @lang('admin/hardware/table.image') @lang('admin/hardware/form.name') @lang('admin/hardware/table.asset_tag') @lang('admin/hardware/table.serial') diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index a146644c38..3b3ffa607a 100755 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -38,8 +38,6 @@
  • @lang('admin/hardware/general.clone')
    • - - @@ -47,7 +45,6 @@
    - @if ($asset->model->deleted_at!='')
    @@ -144,6 +141,7 @@ @endif + @if ($asset->model->eol)
    @lang('admin/hardware/form.eol_rate'): @@ -178,10 +176,11 @@
    +
    Software Assigned
    -
    - + + @if (count($asset->licenses) > 0) @@ -295,8 +294,6 @@ @else {{{ $file->filename }}} @endif - -
    @if ($file->filename) @@ -408,6 +405,14 @@ @endif + + @if ($asset->image) +
    + @else +

    @lang('general.noimage')


    + @endif + + @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))

    @lang('admin/hardware/form.checkedout_to')
    @@ -415,6 +420,8 @@


  • {{ $asset->assigneduser->fullName() }}
    • +
    + @if (isset($asset->userloc))