drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
drkthunder02
2019-08-06 12:28:55 -05:00
parent 0328f969dc
commit fd9fda9f47
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Dashboard/DashboardController.php
View File

@@ -68,7 +68,7 @@ class DashboardController extends Controller
$open = SRPShip::where([ $open = SRPShip::where([
'character_id' => auth()->user()->character_id, 'character_id' => auth()->user()->character_id,
'approved' => 'Under Review' 'approved' => 'Under Review'
])->get(); ])->get()->toArray();
} }
//See if we can get all of the closed and approved SRP requests //See if we can get all of the closed and approved SRP requests
@@ -80,7 +80,7 @@ class DashboardController extends Controller
$approved = SRPShip::where([ $approved = SRPShip::where([
'character_id' => auth()->user()->character_id, 'character_id' => auth()->user()->character_id,
'approved' => 'Approved', 'approved' => 'Approved',
])->take(10)->get(); ])->take(10)->get()->toArray();
} }
//See if we can get all of the closed and denied SRP requests //See if we can get all of the closed and denied SRP requests
@@ -92,7 +92,7 @@ class DashboardController extends Controller
$denied = SRPShip::where([ $denied = SRPShip::where([
'character_id' => auth()->user()->character_id, 'character_id' => auth()->user()->character_id,
'approved' => 'Denied', 'approved' => 'Denied',
])->take(10)->get(); ])->take(10)->get()->toArray();
} }
//Process all types of srp requests for the alt of the main and add to the main's page //Process all types of srp requests for the alt of the main and add to the main's page
@@ -111,7 +111,7 @@ class DashboardController extends Controller
$altOpen = SRPShip::where([ $altOpen = SRPShip::where([
'character_id' => $alt->character_id, 'character_id' => $alt->character_id,
'approved' => 'Under Review', 'approved' => 'Under Review',
])->get(); ])->get()->toArray();
//Add the alt's open requests to the open requests array //Add the alt's open requests to the open requests array
array_push($open, $altOpen); array_push($open, $altOpen);
} }
@@ -125,7 +125,7 @@ class DashboardController extends Controller
$altApproved = SRPShip::where([ $altApproved = SRPShip::where([
'character_id' => $alt->character_id, 'character_id' => $alt->character_id,
'approved' => 'Approved', 'approved' => 'Approved',
])->take(5)->get(); ])->take(5)->get()->toArray();
array_push($approved, $altApproved); array_push($approved, $altApproved);
} }
@@ -139,7 +139,7 @@ class DashboardController extends Controller
$altDenied = SRPShip::where([ $altDenied = SRPShip::where([
'character_id' => $alt->character_id, 'character_id' => $alt->character_id,
'approved' => 'Denied', 'approved' => 'Denied',
])->take(5)->get(); ])->take(5)->get()->toArray();
array_push($denied, $altDenied); array_push($denied, $altDenied);
} }

26
resources/views/dashboard.blade.php
View File

@@ -48,10 +48,10 @@
<tbody> <tbody>
@foreach($open as $o) @foreach($open as $o)
<tr> <tr>
<td>{{ $o->fleet_commander_name }}</td> <td>{{ $o['fleet_commander_name'] }}</td>
<td>{{ $o->ship_type }}</td> <td>{{ $o['ship_type'] }}</td>
<td>{{ $o->loss_value }}</td> <td>{{ $o['loss_value'] }}</td>
<td>{{ $o->approved }}</td> <td>{{ $o['approved'] }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -86,11 +86,11 @@
<tbody> <tbody>
@foreach($denied as $d) @foreach($denied as $d)
<tr> <tr>
<td>{{ $d->fleet_commander_name }}</td> <td>{{ $d['fleet_commander_name'] }}</td>
<td>{{ $d->ship_type }}</td> <td>{{ $d['ship_type'] }}</td>
<td>{{ $d->loss_value }}</td> <td>{{ $d['loss_value'] }}</td>
<td>{{ $d->approved }}</td> <td>{{ $d['approved'] }}</td>
<td>{{ $d->notes }}</td> <td>{{ $d['notes'] }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -124,10 +124,10 @@
<tbody> <tbody>
@foreach($approved as $a) @foreach($approved as $a)
<tr> <tr>
<td>{{ $a->fleet_commander_name }}</td> <td>{{ $a['fleet_commander_name'] }}</td>
<td>{{ $a->ship_type }}</td> <td>{{ $a['ship_type'] }}</td>
<td>{{ $a->loss_value }}</td> <td>{{ $a['loss_value'] }}</td>
<td>{{ $a->approved }}</td> <td>{{ $a['approved'] }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>