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

add offers count, & minor fixes code standards

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 16:26:31 +01:00
parent e97f54f126
commit 18f1f8a13a
66 changed files with 526 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Datatables/Botanic/FamiliesDataTable.php
View File

@@ -13,7 +13,7 @@ class FamiliesDataTable extends DataTable
public function query(Family $model)
{
$model = $model::withCount(['genres','species','varieties']);
return self::buildQuery($model);
return $this->buildQuery($model);
}
protected function getColumns()
@@ -25,7 +25,7 @@ class FamiliesDataTable extends DataTable
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(),
$this->makeColumnButtons(),
];
}
}

14
app/Datatables/Botanic/GenresDataTable.php
View File

@@ -13,19 +13,17 @@ class GenresDataTable extends DataTable
public function query(Genre $model)
{
$model = $model::with('family')->withCount('species')->withCount('varieties');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'family_name', function (Genre $genre) {
return $genre->family ? $genre->family->name : '';
}
)
->editColumn('family_name', function (Genre $genre) {
return $genre->family ? $genre->family->name : '';
})
->rawColumns(['genre_name', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
protected function getColumns()
@@ -37,7 +35,7 @@ class GenresDataTable extends DataTable
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(),
$this->makeColumnButtons(),
];
}
}

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

@@ -13,19 +13,17 @@ class SpeciesDataTable extends DataTable
public function query(Specie $model)
{
$model = $model::withCount('varieties')->with('genre');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'genre_name', function (Specie $specie) {
return $specie->genre ? $specie->genre->name : '';
}
)
->editColumn('genre_name', function (Specie $specie) {
return $specie->genre ? $specie->genre->name : '';
})
->rawColumns(['genre_name', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
@@ -37,7 +35,7 @@ class SpeciesDataTable extends DataTable
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(),
$this->makeColumnButtons(),
];
}
}

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

@@ -14,23 +14,21 @@ class VarietiesDataTable extends DataTable
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with('Specie')->withCount('Articles');
return self::buildQuery($model);
return $this->buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn(
'photo', function (Variety $variety) {
$media = $variety->getFirstMedia();
// dump($media);
// return $media('thumb');
return '';
}
)
->editColumn('photo', function (Variety $variety) {
$media = $variety->getFirstMedia();
// dump($media);
// return $media('thumb');
return '';
})
->rawColumns(['photo', 'action']);
return Parent::modifier($datatables);
return parent::modifier($datatables);
}
@@ -41,7 +39,7 @@ class VarietiesDataTable extends DataTable
Column::make('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
Column::make('photo')->title('')->searchable(false)->orderable(false),
self::makeColumnButtons(),
$this->makeColumnButtons(),
];
}
}