fix devops error
This commit is contained in:
@@ -30,12 +30,6 @@ class ParentDataTable extends DataTable
|
||||
|
||||
public $stateSave = true;
|
||||
|
||||
/**
|
||||
* Build DataTable class.
|
||||
*
|
||||
* @param mixed $query Results from query() method.
|
||||
* @return \Yajra\DataTables\DataTableAbstract
|
||||
*/
|
||||
public function dataTable($query)
|
||||
{
|
||||
return $this->modifier(datatables()->eloquent($query));
|
||||
@@ -46,12 +40,6 @@ class ParentDataTable extends DataTable
|
||||
return $this->addButtons($datatables->setRowId('{{$id}}'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Add buttons DataTable class.
|
||||
*
|
||||
* @param mixed $query Results from query() method.
|
||||
* @return \Yajra\DataTables\DataTableAbstract
|
||||
*/
|
||||
public function addButtons($datatables)
|
||||
{
|
||||
return $datatables->addColumn('action', $this->getHtmlButtons());
|
||||
@@ -59,12 +47,7 @@ class ParentDataTable extends DataTable
|
||||
|
||||
public function getHtmlButtons()
|
||||
{
|
||||
$buttons = '';
|
||||
$buttons .= self::getButtonEdit();
|
||||
$buttons .= self::getButtonDel();
|
||||
|
||||
return $buttons;
|
||||
// return view('components.datatables.buttons.row_action');
|
||||
return self::getButtonEdit().self::getButtonDel();
|
||||
}
|
||||
|
||||
public function getButtonEdit()
|
||||
@@ -95,35 +78,23 @@ class ParentDataTable extends DataTable
|
||||
|
||||
public static function isFilteredByField($field)
|
||||
{
|
||||
return (request()->has('filters.'.$field)) ? request()->input('filters.'.$field) : (request()->has($field) ? request()->input($field) : false);
|
||||
if (request()->has('filters.'.$field)) {
|
||||
return request()->input('filters.'.$field);
|
||||
}
|
||||
|
||||
return request()->has($field) ? request()->input($field) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get query source of dataTable.
|
||||
*
|
||||
* @param \App\Family $model
|
||||
* @return \Illuminate\Database\Eloquent\Builder
|
||||
*/
|
||||
public function buildQuery($model)
|
||||
{
|
||||
return $model->newQuery();
|
||||
}
|
||||
|
||||
/**
|
||||
* Optional method if you want to use html builder.
|
||||
*
|
||||
* @return \Yajra\DataTables\Html\Builder
|
||||
*/
|
||||
public function html()
|
||||
{
|
||||
return $this->buildHtml(strtolower($this->model_name).'-table');
|
||||
}
|
||||
|
||||
/**
|
||||
* Optional method if you want to use html builder.
|
||||
*
|
||||
* @return \Yajra\DataTables\Html\Builder
|
||||
*/
|
||||
public function buildHtml($table_id = false, $selector = false)
|
||||
{
|
||||
$table_id = $table_id ? $table_id : strtolower($this->model_name).'-table';
|
||||
@@ -135,7 +106,7 @@ class ParentDataTable extends DataTable
|
||||
->columns($this->getColumns())
|
||||
->ajax([
|
||||
'data' => 'function(d) { d.filters = $("'.$selector.'").serializeJSON(); }',
|
||||
'url' => isset($this->url) ? $this->url : '',
|
||||
'url' => $this->url ?? '',
|
||||
])
|
||||
->dom($this->getDom())
|
||||
->orderBy($this->sortedColumn, $this->sortedOrder)
|
||||
@@ -145,7 +116,6 @@ class ParentDataTable extends DataTable
|
||||
public function getButtons()
|
||||
{
|
||||
return [
|
||||
// Button::make('export'),
|
||||
Button::make('print'),
|
||||
Button::make('colvis'),
|
||||
Button::make('columnsToggle'),
|
||||
@@ -174,12 +144,7 @@ class ParentDataTable extends DataTable
|
||||
|
||||
public function getDom()
|
||||
{
|
||||
$dom = '';
|
||||
// $dom .= $this->getDatatablesHeaderDefault();
|
||||
$dom .= 'rt';
|
||||
$dom .= $this->getDatatablesFooterDefault();
|
||||
|
||||
return $dom;
|
||||
return 'rt'.$this->getDatatablesFooterDefault();
|
||||
}
|
||||
|
||||
public function getDatatablesHeader()
|
||||
@@ -189,23 +154,7 @@ class ParentDataTable extends DataTable
|
||||
|
||||
public function getDatatablesHeaderDefault()
|
||||
{
|
||||
// return "<div class'row'><div class='col'></div></div>";
|
||||
/*
|
||||
|
||||
$dom = 't<"row datatable-pager light"<"col-md-12"'
|
||||
. '<"datatable-more-export-buttons filter-buttons pull-left">'
|
||||
. '<"datatable-more-export-favorites-buttons filter-buttons pull-left">'
|
||||
. '<"datatable-more-export-basket-buttons filter-buttons pull-left">'
|
||||
. '<"datatable-download-buttons filter-buttons pull-left">'
|
||||
. '>>'
|
||||
. '<"dt-toolbar-footer"<"col"i><"col pull-right datatable-pager light nopadding-right"p>>';
|
||||
|
||||
*/
|
||||
|
||||
$dom = "<'row dt-toolbar-header'<'col-lg-4'l><'col-lg-4'B><'col-lg-4 text-right add'f>>";
|
||||
|
||||
return $dom;
|
||||
// return 't<"row datatable-pager light"<"col-md-12"<"datatable-more-export-buttons filter-buttons pull-left"><"datatable-more-export-favorites-buttons filter-buttons pull-left"><"datatable-more-export-basket-buttons filter-buttons pull-left"><"datatable-download-buttons filter-buttons pull-left">>><"dt-toolbar-footer"<"col-md-6"i><"col-md-6 pull-right datatable-pager light nopadding-right"p>>';
|
||||
return "<'row dt-toolbar-header'<'col-lg-4'l><'col-lg-4'B><'col-lg-4 text-right add'f>>";
|
||||
}
|
||||
|
||||
public function getDatatablesFooterDefault()
|
||||
@@ -213,19 +162,11 @@ class ParentDataTable extends DataTable
|
||||
return "<'row pt-3 dt-toolbar-footer'<'col-md-6'i><'col-md-6'p>>";
|
||||
}
|
||||
|
||||
/**
|
||||
* Get filename for export.
|
||||
*/
|
||||
protected function filename(): string
|
||||
{
|
||||
return self::buildFilename($this->model_name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get filename for export.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function buildFilename($name)
|
||||
{
|
||||
return $name.'_'.date('YmdHis');
|
||||
|
||||
Reference in New Issue
Block a user