3.0.x (#284)

* fix(contracts): Remove non-existing variable from contract index (#272)

* Fix corp killmails table header missarrangement (#275)

* Fix eveseat/seat#509

* Use correct order of headers and data:

# date
# ship
# location
# victim
# zKB link

* Fix issue 512 related to corp tracking (#276)

* Add warning about outdated information.

* Fix Issue 512 - Corp Tracking shows people who are not in Corporation
* Don't show non-corp members in member-tracking
* Remove checkbox
* Introduce tabs: Valid, Invalid and Missing on Seat

* Revert "Add warning about outdated information."

This reverts commit 0fdc734

* Implement review feedback

* Used wrong attribute for filterColumn (#277)

* Fix character contracts (#279)

* change `is_nan` to `is_null`

* Don't be to precise

* fix filter column

src/Http/Controllers/Character/ContactsController.php

@@ -122,7 +122,7 @@ public function getContacts(int $character_id)
                 return $user_group->intersect(collect($row->contact_id))->isNotEmpty();
             })
             ->filterColumn('name', function ($query, $keyword) {
-                $resolved_ids = UniverseName::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($resolved_id) { return $resolved_id->id; });
+                $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; });
                 $corporation_info_ids = CorporationInfo::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($corporation_info) { return $corporation_info->corproation_id; });
 

src/Http/Controllers/Character/ContractsController.php

@@ -185,7 +185,7 @@ public function getContractsData(int $character_id)
                         return $character_info->character_id;
                     });
 
-                $query->whereIn('a.assignee_id', array_merge($resolved_ids->toArray(), $character_info_ids->toArray()));
+                $query->whereIn('a.issuer_id', array_merge($resolved_ids->toArray(), $character_info_ids->toArray()));
             })
             ->filterColumn('assignee_id', function ($query, $keyword) {
                 $resolved_ids = UniverseName::where('name', 'like', '%' . $keyword . '%')

src/Http/Controllers/Corporation/TrackingController.php

@@ -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;
@@ -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) {
@@ -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);
 

src/Http/Controllers/Support/SearchController.php

@@ -160,13 +160,13 @@ public function getSearchMailData(Request $request)
                 return view('web::search.partials.mailrecipient', compact('recipients'));
             })
             ->filterColumn('from', function ($query, $keyword) {
-                $resolved_ids = UniverseName::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($resolved_id) { return $resolved_id->id; });
+                $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('from', array_merge($resolved_ids->toArray(), $character_info_ids->toArray()));
             })
             ->filterColumn('recipients', function ($query, $keyword) {
-                $resolved_ids = UniverseName::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($resolved_id) { return $resolved_id->id; });
+                $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; });
                 $corporation_info_ids = CorporationInfo::where('name', 'like', '%' . $keyword . '%')->get()->map(function ($corporation_info) { return $corporation_info->corproation_id; });
                 $query->whereIn('from', array_merge($resolved_ids->toArray(), $character_info_ids->toArray(), $corporation_info_ids->toArray()));

src/lang/en/seat.php

@@ -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',

src/resources/views/configuration/users/list.blade.php

@@ -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">
 

src/resources/views/configuration/users/partials/refresh-token.blade.php

@@ -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>

src/resources/views/corporation/partials/refresh-token.blade.php

@@ -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>

src/resources/views/corporation/tracking.blade.php

@@ -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>
@@ -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({
@@ -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}