Skip to content

Commit

Permalink
Fixes #836
Browse files Browse the repository at this point in the history
  • Loading branch information
@snipe
snipe committed Jun 9, 2015
1 parent 5939e46 commit c69038d
Showing 1 changed file with 78 additions and 78 deletions.
156 changes: 78 additions & 78 deletions app/controllers/admin/AssetsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function postCreate()
} else {
$asset->rtd_location_id = e(Input::get('rtd_location_id'));
}

$checkModel = Config::get('app.url').'/api/models/'.e(Input::get('model_id')).'/check';
$asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL;

Expand Down Expand Up @@ -293,7 +293,7 @@ public function postEdit($assetId = null)
} else {
$asset->rtd_location_id = e(Input::get('rtd_location_id'));
}

$checkModel = Config::get('app.url').'/api/models/'.e(Input::get('model_id')).'/check';
$asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL;

Expand Down Expand Up @@ -441,20 +441,20 @@ public function postCheckout($assetId)
$data['first_name'] = $user->first_name;
$data['item_name'] = $asset->showAssetName();
$data['require_acceptance'] = $asset->requireAcceptance();

$settings = Setting::getSettings();

if ($settings->slack_endpoint) {


$slack_settings = [
'username' => $settings->botname,
'channel' => $settings->slack_channel,
'link_names' => true
];

$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);

try {
$client->attach([
'color' => 'good',
Expand All @@ -468,13 +468,13 @@ public function postCheckout($assetId)
'value' => e($logaction->note)
],



]
])->send('Asset Checked Out');

} catch (Exception $e) {

}

}
Expand Down Expand Up @@ -563,18 +563,18 @@ public function postCheckin($assetId = null, $backto = null)
$log = $logaction->logaction('checkin from');

$settings = Setting::getSettings();

if ($settings->slack_endpoint) {


$slack_settings = [
'username' => $settings->botname,
'channel' => $settings->slack_channel,
'link_names' => true
];

$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);

try {
$client->attach([
'color' => 'good',
Expand All @@ -587,16 +587,16 @@ public function postCheckin($assetId = null, $backto = null)
'title' => 'Note:',
'value' => e($logaction->note)
],

]
])->send('Asset Checked In');

} catch (Exception $e) {

}

}

if ($backto=='user') {
return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/hardware/message.checkin.success'));
} else {
Expand Down Expand Up @@ -872,51 +872,51 @@ public function displayFile($assetID = null, $fileId = null)
**/
public function postBulkEdit($assets = null)
{

if (!Input::has('edit_asset')) {
return Redirect::back()->with('error', 'No assets selected');
} else {
$asset_raw_array = Input::get('edit_asset');
$asset_raw_array = Input::get('edit_asset');
foreach ($asset_raw_array as $asset_id => $value) {
$asset_ids[] = $asset_id;
$asset_ids[] = $asset_id;

}

}

if (Input::has('bulk_actions')) {


// Create labels
if (Input::get('bulk_actions')=='labels') {
$assets = Asset::find($asset_ids);
$assetcount = count($assets);
$count = 0;
$settings = Setting::getSettings();

$settings = Setting::getSettings();
return View::make('backend/hardware/labels')->with('assets',$assets)->with('settings',$settings)->with('count',$count);

// Bulk edit

// Bulk edit
} elseif (Input::get('bulk_actions')=='edit') {

$assets = Input::get('edit_asset');

$supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
$statuslabel_list = array('' => '') + Statuslabel::lists('name', 'id');
$location_list = array('' => '') + Location::lists('name', 'id');

return View::make('backend/hardware/bulk')->with('assets',$assets)->with('supplier_list',$supplier_list)->with('statuslabel_list',$statuslabel_list)->with('location_list',$location_list);


}

} else {
return Redirect::back()->with('error', 'No action selected');
return Redirect::back()->with('error', 'No action selected');
}



}


Expand Down Expand Up @@ -991,7 +991,7 @@ public function getDatatable($status = null)
{

$assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at'));


switch ($status) {
case 'Pending':
Expand All @@ -1015,95 +1015,95 @@ public function getDatatable($status = null)
case 'Deleted':
$assets->withTrashed()->Deleted();
break;
}
}


$assets = $assets->orderBy('asset_tag', 'ASC')->get();
$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets)
{


$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets)
{
if ($assets->deleted_at=='') {
return '<a href="'.route('update/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
} elseif ($assets->model->deleted_at=='') {
return '<a href="'.route('restore/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
}

});
$inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets)
{

$inout = new \Chumper\Datatable\Columns\FunctionColumn('inout', function ($assets)
{
if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) {
return '<a href="'.route('checkin/hardware', $assets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
} else {
return '<a href="'.route('checkout/hardware', $assets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
}
});



return Datatable::collection($assets)
->addColumn('',function($assets)
{
return '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';
{
return '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';
})
->addColumn('name',function($assets)
{
return '<a title="'.$assets->name.'" href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
})
})
->addColumn('asset_tag',function($assets)
{
return '<a title="'.$assets->asset_tag.'" href="hardware/'.$assets->id.'/view">'.$assets->asset_tag.'</a>';
})
})

->showColumns('serial')

->addColumn('model',function($assets)
{
return $assets->model->name;
})

->addColumn('status',function($assets)
{
{
if ($assets->assigned_to!='') {
return link_to('../admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
} else {
return $assets->assetstatus->name;
return $assets->assetstatus->name;
}

})
->addColumn('location',function($assets)
{
if ($assets->assigned_to && $assets->assigneduser->userloc) {
return link_to('admin/location/'.$assets->assigneduser->userloc->id.'/edit', $assets->assigneduser->userloc->name);
if ($assets->assigned_to && $assets->assigneduser->userloc) {
return link_to('admin/settings/locations/'.$assets->assigneduser->userloc->id.'/edit', $assets->assigneduser->userloc->name);
} elseif ($assets->defaultLoc){
return link_to('admin/location/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
return link_to('admin/settings/locations/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
}
})
->addColumn('category',function($assets)
{
return $assets->model->category->name;

})
})

->addColumn('eol',function($assets)
{
return $assets->eol_date();
})
})


->addColumn('checkout_date',function($assets)
{
{
if (($assets->assigned_to!='') && ($assets->assetlog->first())) {
return $assets->assetlog->first()->created_at->format('Y-m-d');
}
})
->addColumn($inout)
->addColumn($actions)
}

})
->addColumn($inout)
->addColumn($actions)
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category')
->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
->make();

}
}

0 comments on commit c69038d

Please sign in to comment.