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

Fixes after reading excel files and discuss with eric

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-03-26 15:40:53 +01:00
parent 37ffaa938b
commit 22fa3d3246
22 changed files with 456 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/DataTables/Botanic/VarietiesDataTable.php
View File

@@ -13,16 +13,16 @@ class VarietiesDataTable extends DataTable
public function query(Variety $model)
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelations('Specie')->select('botanic_varieties.*','botanic_species.name as specie_name')->withCount('Articles');
$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')->title('Espèce'),
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'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
self::makeColumnButtons(),
];
}