Update provision-request-index table filters and subtitle

upmind-automation · Oct 26, 2022 · 0336bde · 0336bde
1 parent 776d901
commit 0336bde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/resources/views/components/filter.blade.php b/resources/views/components/filter.blade.php
@@ -1,5 +1,5 @@
 @if(Request::get($filter_param) == $filter_value)
-    <strong>{{ $slot }}</strong> <a data-tooltip="Remove filter" href="{{ Request::fullUrlWithQuery([$filter_param => '']) }}"><i class="small zoom-out icon link black"></i></a>
+    <strong>{{ $slot }}</strong> <a data-tooltip="Remove filter" href="{{ Request::fullUrlWithQuery([$filter_param => '']) }}"><i class="zoom-out icon link black"></i></a>
 @else
     {{ $slot }} <a data-tooltip="Add filter" href="{{ Request::fullUrlWithQuery([$filter_param => $filter_value]) }}"><i class="small zoom-in icon link black"></i></a>
 @endif
diff --git a/resources/views/provision-request-index.blade.php b/resources/views/provision-request-index.blade.php
@@ -9,7 +9,9 @@
 
 @section('title', 'Provision Requests')
 
-@section('title-message', sprintf('%s results', $provision_requests->total()))
+@section('title-message')
+    <strong>{{ $provision_requests->total() }} results</strong>
+@endsection
 
 @section('icon')
     <i class="zoom-in icon"></i>
@@ -24,11 +26,11 @@
             <tr>
                 <th>Category</th>
                 <th>Provider</th>
-                <th>Configuration</th>
                 <th>Function</th>
+                <th>Configuration</th>
                 <th>Status</th>
                 <th>Execution Time</th>
-                <th>Updated</th>
+                <th>Executed</th>
                 <th></th>
             <tr>
             {{-- @if($filters)
@@ -47,32 +49,32 @@
                 <tr>
                     <td class="collapsing">
                         @component('components.filter', ['filter_param' => 'category_code', 'filter_value' => $provision_request->category_code])
-                            <a href="{{ route('category-show', ['category_code' => $provision_request->category_code]) }}">
+                            <a data-tooltip="View Category" style="color:black;" href="{{ route('category-show', ['category_code' => $provision_request->category_code]) }}">
                                 @if ($provision_request->getCategoryIcon()) <i class="{{ $provision_request->getCategoryIcon() }} icon"></i> @endif
                                 {{ $provision_request->getCategoryName() }}
                             </a>
                         @endcomponent
                     </td>
                     <td class="collapsing">
                         @component('components.filter', ['filter_param' => 'provider_code', 'filter_value' => $provision_request->provider_code])
-                            <a href="{{ route('provider-show', ['category_code' => $provision_request->category_code, 'provider_code' => $provision_request->provider_code]) }}">
+                            <a data-tooltip="View Provider" style="color:black;" href="{{ route('provider-show', ['category_code' => $provision_request->category_code, 'provider_code' => $provision_request->provider_code]) }}">
                                 @if ($provision_request->getProviderIcon()) <i class="{{ $provision_request->getProviderIcon() }} icon"></i> @endif
                                 {{ $provision_request->getProviderName() }}
                             </a>
                         @endcomponent
                     </td>
+                    <td class="collapsing">
+                        @component('components.filter', ['filter_param' => 'function_name', 'filter_value' => $provision_request->function_name])
+                            {{ $provision_request->getFunctionName() }}()
+                        @endcomponent
+                    </td>
                     <td>
                         @component('components.filter', ['filter_param' => 'configuration_id', 'filter_value' => $provision_request->configuration_id])
-                            <a href="{{ route('provider-configuration-show', ['configuration' => $provision_request->configuration_id]) }}">
+                            <a data-tooltip="View Configuration" style="color:black;" href="{{ route('provider-configuration-show', ['configuration' => $provision_request->configuration_id]) }}">
                                 {{ $provision_request->getConfigurationName() }}
                             </a>
                         @endcomponent
                     </td>
-                    <td class="collapsing">
-                        @component('components.filter', ['filter_param' => 'function_name', 'filter_value' => $provision_request->function_name])
-                            {{ $provision_request->getFunctionName() }}()
-                        @endcomponent
-                    </td>
                     <td class="collapsing center aligned">
                         @component('components.filter', ['filter_param' => 'result_status', 'filter_value' => $provision_request->result_status])
                             <span @if($provision_request->result_message) data-tooltip="{{ $provision_request->result_message }}" @endif class="ui small @if($provision_request->isSuccess()) green @elseif($provision_request->isError()) red @endif label" style="min-width:4rem;">