jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add count function for images herited

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-04-16 13:58:09 +02:00
parent 2d111605f2
commit 1dc815bf39
12 changed files with 105 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Datatables/Botanic/SpeciesDataTable.php
View File

@@ -21,7 +21,7 @@ class SpeciesDataTable extends DataTable
{
$datatables
->editColumn('thumb', function (Specie $specie) {
return Species::getThumb($specie->image);
return Species::getThumb($specie->image, false);
})
->editColumn('genre_name', function (Specie $specie) {
return $specie->genre ? $specie->genre->name : '';

2
app/Datatables/Botanic/VarietiesDataTable.php
View File

@@ -22,7 +22,7 @@ class VarietiesDataTable extends DataTable
{
$datatables
->editColumn('thumb', function (Variety $variety) {
return Varieties::getThumb($variety->image);
return Varieties::getThumb($variety->image, false);
})
->editColumn('tags2', function (Variety $variety) {
$html = '';

15
app/Datatables/Shop/ArticlesDataTable.php
View File

@@ -7,6 +7,7 @@ use Yajra\DataTables\Html\Column;
use App\Datatables\ParentDataTable as DataTable;
use App\Models\Shop\Article;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Tags;
class ArticlesDataTable extends DataTable
{
@@ -75,7 +76,7 @@ class ArticlesDataTable extends DataTable
->editColumn('tags2', function (Article $article) {
$html = '';
foreach ($article->tags as $tag) {
$html .= '<span class="btn btn-xs btn-success pb-2">' . $tag->slug . '</span> ';
$html .= '<span class="btn btn-xs btn-success pb-2">' . Tags::getFullnameByTag($tag) . '</span> ';
}
return $html;
})
@@ -86,16 +87,16 @@ class ArticlesDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('visible')->title('Visible')->searchable(false),
Column::make('homepage')->title('Accueil')->searchable(false),
Column::make('visible')->title('Visible')->searchable(false)->width(50),
Column::make('homepage')->title('Accueil')->searchable(false)->width(50),
Column::make('article_nature.name')->title('Nature'),
Column::make('thumb')->title('')->searchable(false)->orderable(false)->width(40)->class('text-center'),
Column::make('name')->title('Nom'),
Column::make('tags2')->title('Tags')->searchable(false)->orderable(false),
Column::make('tags_count')->title('#Tag')->class('text-right')->searchable(false),
Column::make('categories_count')->title('#Ray')->class('text-right')->searchable(false),
Column::make('offers_count')->title('#Ofr')->class('text-right')->searchable(false),
Column::make('images_count')->title('#Pho')->class('text-right')->searchable(false),
Column::make('tags_count')->title('#Tag')->class('text-right')->searchable(false)->width(40),
Column::make('categories_count')->title('#Ray')->class('text-right')->searchable(false)->width(40),
Column::make('offers_count')->title('#Ofr')->class('text-right')->searchable(false)->width(40),
Column::make('images_count')->title('#Pho')->class('text-right')->searchable(false)->width(40),
$this->makeColumnButtons(),
];
}

4
app/Datatables/Shop/TagsDataTable.php
View File

@@ -13,7 +13,7 @@ class TagsDataTable extends DataTable
public function query(Tag $model)
{
$model = $model::with('group')->withCount(['articles', 'shelves', 'species', 'varieties']);
$model = $model::with('tag_group')->withCount(['articles', 'shelves', 'species', 'varieties']);
return $this->buildQuery($model);
}
@@ -30,7 +30,7 @@ class TagsDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('group.name')->title('Groupe')->width(200),
Column::make('tag_group.name')->title('Groupe')->width(200),
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('#Art')->class('text-right')->searchable(false)->width(60),
Column::make('species_count')->title('#Esp')->class('text-right')->searchable(false)->width(60),