Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added default tab to locations #12008

Merged
merged 2 commits into from Oct 21, 2022
Merged

Added default tab to locations #12008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eed2ba
Added default tab to locations
snipe Oct 21, 2022
515b14a
Updated JS to better handle input IDs
snipe Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/Assets/BulkAssetsController.php
View file
Open in desktop
Expand Up @@ -33,7 +33,6 @@ public function edit(Request $request)

if (! $request->filled('ids')) {
return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));

}

// Figure out where we need to send the user after the update is complete, and store that in the session
Expand Down
45 changes: 45 additions & 0 deletions resources/views/locations/view.blade.php
View file
Open in desktop
Expand Up @@ -43,6 +43,19 @@
</a>
</li>

<li>
<a href="#rtd_assets" data-toggle="tab">
<span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('admin/hardware/form.default_location') }}
{!! (($location->rtd_assets) && ($location->rtd_assets()->AssetsForShow()->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($location->rtd_assets()->AssetsForShow()->count()).'</badge>' : '' !!}
</span>
</a>
</li>


<li>
<a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md">
Expand Down Expand Up @@ -144,6 +157,38 @@ class="table table-striped snipe-table"

</div><!-- /.table-responsive -->
</div><!-- /.tab-pane -->

<div class="tab-pane" id="rtd_assets">
<h2 class="box-title">{{ trans('admin/hardware/form.default_location') }}</h2>

<div class="table table-responsive">
@include('partials.asset-bulk-actions', ['id_divname' => 'RTDassetsBulkEditToolbar', 'id_formname' => 'RTDassets', 'id_button' => 'RTDbulkAssetEditButton'])
<table
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
data-cookie-id-table="RTDassetsListingTable"
data-pagination="true"
data-id-table="RTDassetsListingTable"
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
data-toolbar="#RTDassetsBulkEditToolbar"
data-bulk-button-id="#RTDbulkAssetEditButton"
data-bulk-form-id="#RTDassetsBulkEditToolbar"
data-click-to-select="true"
id="RTDassetsListingTable"
class="table table-striped snipe-table"
data-url="{{route('api.assets.index', ['rtd_location_id' => $location->id]) }}"
data-export-options='{
"fileName": "export-rtd-locations-{{ str_slug($location->name) }}-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>

</div><!-- /.table-responsive -->
</div><!-- /.tab-pane -->



Expand Down
9 changes: 5 additions & 4 deletions resources/views/partials/asset-bulk-actions.blade.php
View file
Open in desktop
@@ -1,9 +1,10 @@
<div id="assetsBulkEditToolbar" style="min-width:400px">
{{ Form::open([
<div id="{{ (isset($id_divname)) ? $id_divname : 'assetsBulkEditToolbar' }}" style="min-width:400px">
{{ Form::open([
'method' => 'POST',
'route' => ['hardware/bulkedit'],
'class' => 'form-inline',
'id' => 'assetsBulkForm']) }}
'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm',
]) }}


<label for="bulk_actions">
Expand All @@ -21,6 +22,6 @@
<option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>
</select>

<button class="btn btn-primary" id="bulkAssetEditButton" disabled>{{ trans('button.go') }}</button>
<button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
{{ Form::close() }}
</div>
20 changes: 9 additions & 11 deletions resources/views/partials/bootstrap-table.blade.php
View file
Open in desktop
Expand Up @@ -116,32 +116,30 @@ function dateRowCheckStyle(value) {
// These methods dynamically add/remove hidden input values in the bulk actions form
$('.snipe-table').on('check.bs.table .btSelectItem', function (row, $element) {
var buttonName = $(this).data('bulk-button-id');
var formName = $(this).data('bulk-form-id');
var tableId = $(this).data('id-table');

$(buttonName).removeAttr('disabled');
$(formName).prepend('<input id="' + tableId + '_checkbox_' + $element.id + '" type="hidden" name="ids[]" value="' + $element.id + '">');
$(buttonName).after('<input id="' + tableId + '_checkbox_' + $element.id + '" type="hidden" name="ids[]" value="' + $element.id + '">');
});

$('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) {
var tableId = $(this).data('id-table');
$( "#" + tableId + "_checkbox_" + $element.id).remove();
});


$('.snipe-table').on('check-all.bs.table', function (event, rowsAfter, rowsBefore) {
$('.snipe-table').on('check-all.bs.table', function (event, rowsAfter) {

var buttonName = $(this).data('bulk-button-id');
$(buttonName).removeAttr('disabled');
var formName = $(this).data('bulk-form-id');
var tableId = $(this).data('id-table');

for (var i in rowsAfter) {
$(formName).prepend('<input id="' + tableId + '_checkbox_' + rowsAfter[i].id + '" type="hidden" name="ids[]" value="' + rowsAfter[i].id + '">');
$(buttonName).after('<input id="' + tableId + '_checkbox_' + rowsAfter[i].id + '" type="hidden" name="ids[]" value="' + rowsAfter[i].id + '">');
}
});


$('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) {
var tableId = $(this).data('id-table');
$( "#" + tableId + "_checkbox_" + $element.id).remove();
});


// Handle whether or not the edit button should be disabled
$('.snipe-table').on('uncheck.bs.table', function () {

Expand Down