From 7a9f20acb94ec37eb2b7c0ea860cbcdd8df8abaa Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Thu, 8 Apr 2021 16:57:50 +0200 Subject: [PATCH] Fix Typo --- app/DataTables/Botanic/FamiliesDataTable.php | 32 --- app/DataTables/Botanic/GenresDataTable.php | 43 ---- app/DataTables/Botanic/SpeciesDataTable.php | 43 ---- app/DataTables/Botanic/VarietiesDataTable.php | 30 --- app/DataTables/ParentDataTable.php | 204 ------------------ .../Shop/ArticleFamiliesDataTable.php | 28 --- app/DataTables/Shop/ArticlesDataTable.php | 31 --- app/DataTables/Shop/CategoriesDataTable.php | 28 --- app/DataTables/Shop/CustomersDataTable.php | 29 --- app/DataTables/Shop/InvoicesDataTable.php | 28 --- app/DataTables/Shop/OrdersDataTable.php | 26 --- app/DataTables/Shop/PackagesDataTable.php | 35 --- .../Shop/PriceGenericCategoriesDataTable.php | 28 --- .../Shop/PriceGenericsDataTable.php | 31 --- app/DataTables/Shop/TagGroupsDataTable.php | 28 --- app/DataTables/Shop/TagsDataTable.php | 30 --- app/DataTables/Shop/UnitiesDataTable.php | 36 ---- 17 files changed, 710 deletions(-) delete mode 100644 app/DataTables/Botanic/FamiliesDataTable.php delete mode 100644 app/DataTables/Botanic/GenresDataTable.php delete mode 100644 app/DataTables/Botanic/SpeciesDataTable.php delete mode 100644 app/DataTables/Botanic/VarietiesDataTable.php delete mode 100644 app/DataTables/ParentDataTable.php delete mode 100644 app/DataTables/Shop/ArticleFamiliesDataTable.php delete mode 100644 app/DataTables/Shop/ArticlesDataTable.php delete mode 100644 app/DataTables/Shop/CategoriesDataTable.php delete mode 100644 app/DataTables/Shop/CustomersDataTable.php delete mode 100644 app/DataTables/Shop/InvoicesDataTable.php delete mode 100644 app/DataTables/Shop/OrdersDataTable.php delete mode 100644 app/DataTables/Shop/PackagesDataTable.php delete mode 100644 app/DataTables/Shop/PriceGenericCategoriesDataTable.php delete mode 100644 app/DataTables/Shop/PriceGenericsDataTable.php delete mode 100644 app/DataTables/Shop/TagGroupsDataTable.php delete mode 100644 app/DataTables/Shop/TagsDataTable.php delete mode 100644 app/DataTables/Shop/UnitiesDataTable.php diff --git a/app/DataTables/Botanic/FamiliesDataTable.php b/app/DataTables/Botanic/FamiliesDataTable.php deleted file mode 100644 index aa35023d..00000000 --- a/app/DataTables/Botanic/FamiliesDataTable.php +++ /dev/null @@ -1,32 +0,0 @@ -title('Nom'), - Column::make('alias'), - Column::make('latin'), - Column::make('genres_count')->title('Nb genres')->searchable(false)->addClass('text-right'), - Column::make('species_count')->title('Nb espèces')->searchable(false)->addClass('text-right'), - Column::make('varieties_count')->title('Nb variétés')->searchable(false)->addClass('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Botanic/GenresDataTable.php b/app/DataTables/Botanic/GenresDataTable.php deleted file mode 100644 index 0d28db6c..00000000 --- a/app/DataTables/Botanic/GenresDataTable.php +++ /dev/null @@ -1,43 +0,0 @@ -withCount('species')->withCount('varieties'); - return self::buildQuery($model); - } - - public function modifier($datatables) - { - $datatables - ->editColumn('family_name', function(Genre $genre) { - return $genre->family ? $genre->family->name : ''; - }) - ->rawColumns(['genre_name', 'action']) - ; - return Parent::modifier($datatables); - } - - protected function getColumns() - { - return [ - Column::make('name')->title('Nom'), - Column::make('alias'), - Column::make('latin'), - Column::make('family.name')->data('family_name')->title('Famille'), - Column::make('species_count')->title('Nb Espèces')->searchable(false)->addClass('text-right'), - Column::make('varieties_count')->title('Nb Variétés')->searchable(false)->addClass('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Botanic/SpeciesDataTable.php b/app/DataTables/Botanic/SpeciesDataTable.php deleted file mode 100644 index babe4dfc..00000000 --- a/app/DataTables/Botanic/SpeciesDataTable.php +++ /dev/null @@ -1,43 +0,0 @@ -with('genre'); - return self::buildQuery($model); - } - - public function modifier($datatables) - { - $datatables - ->editColumn('genre_name', function(Specie $specie) { - return $specie->genre ? $specie->genre->name : ''; - }) - ->rawColumns(['genre_name', 'action']) - ; - return Parent::modifier($datatables); - } - - - protected function getColumns() - { - return [ - Column::make('name')->title('Nom'), - Column::make('alias'), - Column::make('genre.name')->data('genre_name')->title('Genre'), - Column::make('latin'), - Column::make('varieties_count')->title('Nb variétés')->searchable(false)->addClass('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Botanic/VarietiesDataTable.php b/app/DataTables/Botanic/VarietiesDataTable.php deleted file mode 100644 index 69aee4ea..00000000 --- a/app/DataTables/Botanic/VarietiesDataTable.php +++ /dev/null @@ -1,30 +0,0 @@ -withCount('Articles')->select('botanic_varieties.*'); - $model = $model::joinRelations('Specie')->select('botanic_varieties.*','botanic_species.name as specie_name')->with('Specie')->withCount('Articles'); - return self::buildQuery($model); - } - - protected function getColumns() - { - return [ - Column::make('Specie.name')->data('specie_name')->title('Espèce'), - Column::make('name')->title('Nom'), - Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/ParentDataTable.php b/app/DataTables/ParentDataTable.php deleted file mode 100644 index 399293f1..00000000 --- a/app/DataTables/ParentDataTable.php +++ /dev/null @@ -1,204 +0,0 @@ - 'tr'] - public $colReorder = false; - public $fixedColumns = false; - public $scrollX = false; - public $scrollCollapse = true; - public $sortedColumn = 0; - public $sortedOrder = 'asc'; - public $stateSave = false; - - /** - * Build DataTable class. - * - * @param mixed $query Results from query() method. - * @return \Yajra\DataTables\DataTableAbstract - */ - public function dataTable($query) - { - return $this->modifier(datatables()->eloquent($query)); - } - - public function modifier($datatables) - { - 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()); - } - - public function getHtmlButtons() - { - $buttons = ''; - - // $buttons .= ''; - // $buttons .= ''; - $buttons .= ''; - $buttons .= ''; - return $buttons; - // return view('components.datatables.buttons.row_action'); - } - - public function makeColumnButtons() - { - return Column::computed('action') - ->title('') - ->exportable(false) - ->printable(false) - ->searchable(false) - ->width("74") - ->addClass('text-center text-nowrap'); - } - - public static function isFilteredByField($field) - { - return (request()->has('filters.' . $field)) ? request()->input('filters.'. $field) : (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'; - $selector = $selector ? $selector : '#' . $this->model_name . '-filters'; - return $this->builder() - ->setTableId($table_id) - ->parameters($this->getParameters()) - ->columns($this->getColumns()) - ->ajax([ - 'data' => 'function(d) { d.filters = $("' . $selector . '").serializeJSON(); }', - 'url' => isset($this->url) ? $this->url : '' - ]) - ->dom($this->getDom()) - ->orderBy($this->sortedColumn,$this->sortedOrder) - ->buttons($this->getButtons()); - } - - public function getButtons() { - return [ - Button::make('export'), - Button::make('print'), - Button::make('colvis'), - Button::make('columnsToggle') - ]; - } - - public function getParameters() - { - $data = [ - 'pageLength' => 5, - 'scrollX' => $this->scrollX, - 'scrollCollapse' => $this->scrollCollapse, - 'searchDelay' => 500, - 'colReorder' => $this->colReorder, - 'fixedColumns' => $this->fixedColumns, - // 'autoWidth' => false, - 'stateSave' => $this->stateSave - ]; - if ($this->rowReorder) { - $data['rowReorder'] = ['selector' => $this->rowReorderSelector]; - } - return $data; - } - - public function getDom() - { - $dom = ''; - // $dom .= $this->getDatatablesHeaderDefault(); - $dom .= "rt"; - $dom .= $this->getDatatablesFooterDefault(); - return $dom; - } - - public function getDatatablesHeader() { - return view('components.datatables.header'); - } - - public function getDatatablesHeaderDefault() { - // return "
"; - /* - - $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>>'; - - } - - public function getDatatablesFooterDefault() { - return "<'row pt-3 dt-toolbar-footer'<'col-md-6'i><'col-md-6'p>>"; - } - - /** - * Get filename for export. - * - * @return string - */ - protected function filename() - { - return self::buildFilename($this->model_name); - } - - /** - * Get filename for export. - * - * @return string - */ - protected function buildFilename($name) - { - return $name . '_' . date('YmdHis'); - } -} \ No newline at end of file diff --git a/app/DataTables/Shop/ArticleFamiliesDataTable.php b/app/DataTables/Shop/ArticleFamiliesDataTable.php deleted file mode 100644 index af307353..00000000 --- a/app/DataTables/Shop/ArticleFamiliesDataTable.php +++ /dev/null @@ -1,28 +0,0 @@ -title('Nom'), - Column::make('articles_count')->title('Nb articles')->addClass('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/ArticlesDataTable.php b/app/DataTables/Shop/ArticlesDataTable.php deleted file mode 100644 index 3bb7143a..00000000 --- a/app/DataTables/Shop/ArticlesDataTable.php +++ /dev/null @@ -1,31 +0,0 @@ -select('shop_articles.*','family.name as family_name')->join('shop_article_families as family', 'family.id', '=', 'shop_articles.article_family_id')->groupBy('shop_articles.id'); - $model = $model::with('article_family')->select('shop_articles.*'); - // $model = $model::joinRelations('Family')->select('shop_articles.*','shop_article_families.name as family_name'); - return self::buildQuery($model); - } - - protected function getColumns() - { - return [ - Column::make('article_family.name')->title('Famille')->orderable(false), - Column::make('name')->title('Nom'), - self::makeColumnButtons(), - ]; - - } - -} diff --git a/app/DataTables/Shop/CategoriesDataTable.php b/app/DataTables/Shop/CategoriesDataTable.php deleted file mode 100644 index d70a2955..00000000 --- a/app/DataTables/Shop/CategoriesDataTable.php +++ /dev/null @@ -1,28 +0,0 @@ -title('Nom'), - Column::make('articles_count')->title('Nb Articles')->class('text-right')->searchable(false), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/CustomersDataTable.php b/app/DataTables/Shop/CustomersDataTable.php deleted file mode 100644 index a8fddbe0..00000000 --- a/app/DataTables/Shop/CustomersDataTable.php +++ /dev/null @@ -1,29 +0,0 @@ -title('Nom'), - Column::make('address')->title('Adresse'), - Column::make('zipcode')->title('Code postal'), - Column::make('city')->title('Ville'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/InvoicesDataTable.php b/app/DataTables/Shop/InvoicesDataTable.php deleted file mode 100644 index f13b576e..00000000 --- a/app/DataTables/Shop/InvoicesDataTable.php +++ /dev/null @@ -1,28 +0,0 @@ -select('shop_packages.*'); - $model = self::filterByFamily($model); - return self::buildQuery($model); - } - - public static function filterByFamily($model, $family_id = false) - { - $family_id = $family_id ? $family_id : self::isFilteredByField('family_id'); - return $family_id ? $model->byArticleFamily($family_id) : $model; - } - - protected function getColumns() - { - return [ - Column::make('article_family.name')->title('Famille d\'articles'), - Column::make('value')->title('Valeur'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/PriceGenericCategoriesDataTable.php b/app/DataTables/Shop/PriceGenericCategoriesDataTable.php deleted file mode 100644 index 95e21596..00000000 --- a/app/DataTables/Shop/PriceGenericCategoriesDataTable.php +++ /dev/null @@ -1,28 +0,0 @@ -withCount('price_generics'); - return self::buildQuery($model); - } - - protected function getColumns() - { - return [ - Column::make('name')->title('Nom'), - Column::make('price_generics_count')->title('Nb Tarifs')->class('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/PriceGenericsDataTable.php b/app/DataTables/Shop/PriceGenericsDataTable.php deleted file mode 100644 index 320eb3fd..00000000 --- a/app/DataTables/Shop/PriceGenericsDataTable.php +++ /dev/null @@ -1,31 +0,0 @@ -withCount('prices'); - return self::buildQuery($model); - } - - protected function getColumns() - { - return [ - Column::make('category.name')->title('Catégorie'), - Column::make('name')->title('Nom'), - Column::make('price_by_unit.price')->title('Prix HT')->class('text-right'), - Column::make('price_by_unit.price_taxed')->title('Prix TTC')->class('text-right'), - Column::make('prices_count')->title('Nb tarifs')->class('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/TagGroupsDataTable.php b/app/DataTables/Shop/TagGroupsDataTable.php deleted file mode 100644 index 93d18d1a..00000000 --- a/app/DataTables/Shop/TagGroupsDataTable.php +++ /dev/null @@ -1,28 +0,0 @@ -title('Nb de tags')->searchable(false)->addClass('text-right'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/TagsDataTable.php b/app/DataTables/Shop/TagsDataTable.php deleted file mode 100644 index 7fe2a3aa..00000000 --- a/app/DataTables/Shop/TagsDataTable.php +++ /dev/null @@ -1,30 +0,0 @@ - 'tr']; - - public function query(Tag $model) - { - $model = $model::with('group')->select(['tags.*']); - return self::buildQuery($model); - } - - protected function getColumns() - { - return [ - Column::make('group.name')->title('Groupe'), - Column::make('sort_order')->title('Ordre'), - Column::make('name')->title('Nom'), - self::makeColumnButtons(), - ]; - } - -} diff --git a/app/DataTables/Shop/UnitiesDataTable.php b/app/DataTables/Shop/UnitiesDataTable.php deleted file mode 100644 index 4d1d32ba..00000000 --- a/app/DataTables/Shop/UnitiesDataTable.php +++ /dev/null @@ -1,36 +0,0 @@ -select('shop_unities.*'); - $model = self::filterByFamily($model); - return self::buildQuery($model); - } - - public static function filterByFamily($model, $family_id = false) - { - $family_id = $family_id ? $family_id : self::isFilteredByField('family_id'); - return $family_id ? $model->byArticleFamily($family_id) : $model; - } - - protected function getColumns() - { - return [ - Column::make('package.article_family.name')->title('Famille'), - Column::make('package.value')->title('Package'), - Column::make('value')->title('Valeur'), - self::makeColumnButtons(), - ]; - } - -}