|
@@ -70,21 +70,7 @@ class DataTablesController extends Controller
|
|
|
$columnHeaders = json_decode($datatableConfig->column_headers, true);
|
|
$columnHeaders = json_decode($datatableConfig->column_headers, true);
|
|
|
$columnConfig = json_decode($datatableConfig->columns_config, true);
|
|
$columnConfig = json_decode($datatableConfig->columns_config, true);
|
|
|
|
|
|
|
|
- //Get Data for Dropdown header columns
|
|
|
|
|
- $dropdownData = new Collection();
|
|
|
|
|
- foreach ($columnHeaders as $index => $columnHeader) {
|
|
|
|
|
- if($columnHeader['searchtype'] === 'dropdown')
|
|
|
|
|
- {
|
|
|
|
|
- $ddColumnConfig = $columnConfig[$index];
|
|
|
|
|
- $columnSnapshot = (clone $query)
|
|
|
|
|
- ->select($ddColumnConfig['name'])
|
|
|
|
|
- ->distinct()->orderBy($ddColumnConfig['name'])
|
|
|
|
|
- ->pluck($ddColumnConfig['name']);
|
|
|
|
|
-
|
|
|
|
|
- $dropdownData[$index] = $columnSnapshot;
|
|
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
//Apply search filters
|
|
//Apply search filters
|
|
|
$searchTerms = $request->input('searchTerms', []);
|
|
$searchTerms = $request->input('searchTerms', []);
|
|
|
foreach ($searchTerms as $index => $value) {
|
|
foreach ($searchTerms as $index => $value) {
|
|
@@ -116,6 +102,21 @@ class DataTablesController extends Controller
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //Get Data for Dropdown header columns
|
|
|
|
|
+ $dropdownData = new Collection();
|
|
|
|
|
+ foreach ($columnHeaders as $index => $columnHeader) {
|
|
|
|
|
+ if($columnHeader['searchtype'] === 'dropdown')
|
|
|
|
|
+ {
|
|
|
|
|
+ $ddColumnConfig = $columnConfig[$index];
|
|
|
|
|
+ $columnSnapshot = (clone $query)
|
|
|
|
|
+ ->select($ddColumnConfig['name'])
|
|
|
|
|
+ ->distinct()->orderBy($ddColumnConfig['name'])
|
|
|
|
|
+ ->pluck($ddColumnConfig['name']);
|
|
|
|
|
+
|
|
|
|
|
+ $dropdownData[$index] = $columnSnapshot;
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// Apply sorting
|
|
// Apply sorting
|
|
|
$sorting = $request->order[0] ?? json_decode($datatableConfig->default_sorting, true)[0];
|
|
$sorting = $request->order[0] ?? json_decode($datatableConfig->default_sorting, true)[0];
|