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

Fix issue 512 related to corp tracking #276

Merged
merged 4 commits into from Feb 15, 2019
Merged

Fix issue 512 related to corp tracking #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fdc734
Add warning about outdated information.
herpaderpaldent Jan 15, 2019
98fc77e
Fix Issue 512 - Corp Tracking shows people who are not in Corporation
herpaderpaldent Jan 18, 2019
f74c053
Revert "Add warning about outdated information."
herpaderpaldent Jan 18, 2019
834f8a6
Implement review feedback
herpaderpaldent Jan 20, 2019
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
15 changes: 12 additions & 3 deletions src/Http/Controllers/Corporation/TrackingController.php
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
namespace Seat\Web\Http\Controllers\Corporation;

use Seat\Eveapi\Models\Character\CharacterInfo;
use Seat\Eveapi\Models\Universe\UniverseName;
use Seat\Services\Repositories\Corporation\Members;
use Seat\Web\Http\Controllers\Controller;
use Yajra\DataTables\DataTables;
Expand Down Expand Up @@ -55,11 +56,14 @@ public function getMemberTracking(int $corporation_id)

$tracking = $this->getCorporationMemberTracking($corporation_id);

if($selected_status->contains('valid_token') && ! $selected_status->contains('invalid_token'))
if($selected_status->contains('valid_token'))
$tracking->has('user.refresh_token');

if($selected_status->contains('invalid_token') && ! $selected_status->contains('valid_token'))
$tracking->doesntHave('user')->orDoesntHave('user.refresh_token');
if($selected_status->contains('invalid_token'))
$tracking->doesntHave('user.refresh_token');

if($selected_status->contains('missing_users'))
$tracking->doesntHave('user');

return DataTables::of($tracking)
->editColumn('character_id', function ($row) {
Expand Down Expand Up @@ -99,6 +103,11 @@ public function getMemberTracking(int $corporation_id)

return view('web::partials.character', compact('character', 'character_id'));
})
->filterColumn('name_filter', function ($query, $keyword) {
$resolved_ids = UniverseName::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($resolved_id) { return $resolved_id->entity_id; });
$character_info_ids = CharacterInfo::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($character_info) { return $character_info->character_id; });
$query->whereIn('character_id', array_merge($resolved_ids->toArray(), $character_info_ids->toArray()));
})
->rawColumns(['character_id', 'main_character', 'refresh_token', 'location'])
->make(true);

Expand Down
4 changes: 2 additions & 2 deletions src/lang/en/seat.php
View file
Open in desktop
Expand Up @@ -328,8 +328,8 @@
'affiliation_removed' => 'Affiliation has been removed from this role',

// Tokens
'valid_token' => 'Valid Token',
'invalid_token' => 'Invalid Token',
'valid_token' => 'Valid Token|Valid Tokens',
'invalid_token' => 'Invalid Token|Invalid Tokens',

// Import
'api_import_title' => 'Import Eve Online API Keys',
Expand Down
4 changes: 2 additions & 2 deletions src/resources/views/configuration/users/list.blade.php
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="" data-toggle="tab" data-filter="all">{{ trans('web::seat.all') }} {{ trans_choice('web::seat.user',2) }}</a></li>
<li><a href="" data-toggle="tab" data-filter="valid">{{ trans('web::seat.valid_token') }}</a></li>
<li><a href="" data-toggle="tab" data-filter="invalid">{{ trans('web::seat.invalid_token') }}</a></li>
<li><a href="" data-toggle="tab" data-filter="valid">{{ trans_choice('web::seat.valid_token', 2) }}</a></li>
<li><a href="" data-toggle="tab" data-filter="invalid">{{ trans_choice('web::seat.invalid_token', 2) }}</a></li>
</ul>
<div class="tab-content">

Expand Down
4 changes: 2 additions & 2 deletions src/resources/views/configuration/users/partials/refresh-token.blade.php
View file
Open in desktop
@@ -1,10 +1,10 @@
@if(!is_null($row->refresh_token))
<button data-toggle="tooltip" title="{{ trans('web::seat.valid_token') }}"
<button data-toggle="tooltip" title="{{ trans_choice('web::seat.valid_token', 1) }}"
class="btn btn-xs btn-link">
<i class="fa fa-check text-success"></i>
</button>
@else
<button data-toggle="tooltip" title="{{ trans('web::seat.invalid_token') }}"
<button data-toggle="tooltip" title="{{ trans_choice('web::seat.invalid_token', 1) }}"
class="btn btn-xs btn-link">
<i class="fa fa-exclamation-triangle text-danger"></i>
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/resources/views/corporation/partials/refresh-token.blade.php
View file
Open in desktop
@@ -1,10 +1,10 @@
@if($refresh_token)
<button data-toggle="tooltip" title="{{ trans('web::seat.valid_token') }}"
<button data-toggle="tooltip" title="{{ trans_choice('web::seat.valid_token', 1) }}"
class="btn btn-xs btn-link">
<i class="fa fa-check text-success"></i>
</button>
@else
<button data-toggle="tooltip" title="{{ trans('web::seat.invalid_token') }}"
<button data-toggle="tooltip" title="{{ trans_choice('web::seat.invalid_token', 1) }}"
class="btn btn-xs btn-link">
<i class="fa fa-exclamation-triangle text-danger"></i>
</button>
Expand Down
42 changes: 15 additions & 27 deletions src/resources/views/corporation/tracking.blade.php
View file
Open in desktop
Expand Up @@ -6,23 +6,14 @@

@section('corporation_content')

<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('web::seat.tracking') }}</h3>
</div>
<div class="box-body">

<div>
<b>{{ trans('web::seat.status') }}</b>
<div class="input-group">
<label class="checkbox-inline">
<input onchange="filterme()" type="checkbox" name="token_status" value="valid_token" checked>{{ trans('web::seat.valid_token') }}
</label>
<label class="checkbox-inline">
<input onchange="filterme()" type="checkbox" name="token_status" value="invalid_token" checked>{{ trans('web::seat.invalid_token') }}
</label>
</div>
</div>
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active"><a href="" data-toggle="tab" data-filter="all">{{ trans('web::seat.all') }} {{ trans('web::seat.tracking') }}</a></li>
<li><a href="" data-toggle="tab" data-filter="valid_token">{{ trans_choice('web::seat.valid_token', 2) }}</a></li>
<li><a href="" data-toggle="tab" data-filter="invalid_token">{{ trans_choice('web::seat.invalid_token', 2) }}</a></li>
<li><a href="" data-toggle="tab" data-filter="missing_users">{{ trans('web::seat.none') }} {{ trans('web::seat.seat_user') }}</a></li>
</ul>
<div class="tab-content">

<table id="corporation-member-tracking" class="table compact table-condensed table-hover table-responsive">
<thead>
Expand All @@ -45,15 +36,12 @@

<script>
function refreshTokenCheckboxes() {
return $('input:checkbox[name="token_status"]:checked').map(function() {
return this.value;
}).get();
}
function filterme() {
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
corporation_member_tracking_table.draw();
});
corporation_member_tracking_table.draw()
function getSelectedFilter() {
return $("div.nav-tabs-custom > ul > li.active > a").data('filter');
}
var corporation_member_tracking_table = $('table#corporation-member-tracking').DataTable({
Expand All @@ -62,12 +50,12 @@ function filterme() {
ajax : {
url : '{{ route('corporation.view.tracking.data', ['corporation_id' => $request->corporation_id]) }}',
data: function ( d ) {
d.selected_refresh_token_status = refreshTokenCheckboxes();
d.selected_refresh_token_status = getSelectedFilter();
}
},
columns : [
{data: 'refresh_token', name: 'user.refresh_token', orderable: false, searchable: false},
{data: 'character_id', name: 'user.name'},
{data: 'character_id', name: 'name_filter'},
{data: 'location', name: 'location', searchable: false},
{data: 'start_date', name: 'start_date', render: human_readable, searchable: false},
{data: 'logon_date', name: 'logon_date', render: human_readable, searchable: false}
Expand Down