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

fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-07 19:58:38 +01:00
parent c7c8e18cbc
commit 63c6671c97
22 changed files with 143 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,7 @@ class VarietiesDataTable extends DataTable
public function query(Variety $model)
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with(['image', 'Specie'])->withCount(['Articles', 'tags']);
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with(['image', 'Specie', 'tags'])->withCount(['Articles', 'tags', 'images']);
return $this->buildQuery($model);
}
@@ -25,7 +24,14 @@ class VarietiesDataTable extends DataTable
->editColumn('thumb', function (Variety $variety) {
return Varieties::getThumb($variety->image);
})
->rawColumns(['thumb', 'action']);
->editColumn('tags2', function (Variety $variety) {
$html = '';
foreach ($variety->tags as $tag) {
$html .= '<span class="btn btn-xs btn-secondary pb-2">' . $tag->slug . '</span> ';
}
return $html;
})
->rawColumns(['thumb', 'tags2', 'action']);
return parent::modifier($datatables);
}
@@ -36,8 +42,10 @@ class VarietiesDataTable extends DataTable
Column::make('Specie.name')->data('specie_name')->title('Espèce'),
Column::make('thumb')->title('')->searchable(false)->orderable(false)->width(40)->class('text-center'),
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
Column::make('tags_count')->title('Nb tags')->class('text-right')->searchable(false),
Column::make('tags2')->title('Tags')->searchable(false)->orderable(false),
Column::make('articles_count')->title('#Art')->class('text-right')->searchable(false),
Column::make('tags_count')->title('#Tag')->class('text-right')->searchable(false),
Column::make('images_count')->title('#Pho')->class('text-right')->searchable(false),
$this->makeColumnButtons(),
];
}