Ticket 1219 Fix actu paginator + order by descending created_at
This commit is contained in:
parent
bdb44ab3a7
commit
e793ce664e
2 changed files with 59 additions and 35 deletions
|
|
@ -5,26 +5,36 @@ namespace App\Http\Controllers;
|
|||
use App\Enums\GeneralConfigType;
|
||||
use App\Models\Actu;
|
||||
use App\Models\Tag;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
||||
class ActuController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\View
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$tags = Tag::has('actus')->get();
|
||||
$actus = Actu::where('status', true)
|
||||
/** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Tag> */
|
||||
$tags = Tag::query()->whereHas('actus', function (Builder $q) {
|
||||
$q->where('status', true);
|
||||
})->get();
|
||||
/** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Actu> */
|
||||
$actus = Actu::query()->where('status', true)
|
||||
->with('tags:id')
|
||||
->orderBy('created_at', 'DESC')
|
||||
->get(['id'])
|
||||
->mapWithKeys(function ($actu) {
|
||||
->map(function ($actu) {
|
||||
return [
|
||||
$actu->id => [
|
||||
'id' => $actu->id,
|
||||
'tags' => $actu->tags->mapWithKeys(function ($tag) {
|
||||
return [$tag->id => $tag->id];
|
||||
})->all()
|
||||
]
|
||||
'id' => $actu->id,
|
||||
'tags' => $actu->tags->map(function ($tag) {
|
||||
return $tag->id;
|
||||
})->all()
|
||||
];
|
||||
})->all();
|
||||
|
||||
$generalConfig = app()->view->getShared()['GeneralConfigGlobal'] ?? null;
|
||||
$generalConfig = $generalConfig ? $generalConfig->where('type', GeneralConfigType::actu())->first() : null;
|
||||
return view('front.actu.index', [
|
||||
|
|
@ -35,6 +45,12 @@ class ActuController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a news
|
||||
*
|
||||
* @param \App\Models\Actu $actu
|
||||
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
|
||||
*/
|
||||
public function view(Actu $actu)
|
||||
{
|
||||
$relatedActus = Actu::whereHas('tags', function ($q) use ($actu) {
|
||||
|
|
@ -50,6 +66,12 @@ class ActuController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Render a news for JS usage (ajax)
|
||||
*
|
||||
* @param \App\Models\Actu $actu
|
||||
* @return string Base64 rendered view.
|
||||
*/
|
||||
public function renderActu(Actu $actu)
|
||||
{
|
||||
if (!request()->wantsJson()) {
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
<button :class="'tag ' + (!selectedTag ? 'active' : '')" @click="selectTag(null)">
|
||||
{{ __('Toutes les actus') }}
|
||||
</button>
|
||||
<button :class="'tag ' + (selectedTag == tag.id ? 'active' : '')" v-for="tag in tags" :key="tag.id" @click="selectTag(tag.id)">
|
||||
<button :class="'tag ' + (selectedTag == tag.id ? 'active' : '')" v-for="tag of tags" :key="tag.id" @click="selectTag(tag.id)">
|
||||
{{ tag.name }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="paginator" v-if="lastPage > 1 && Object.keys(showedActus).length > 3">
|
||||
<div class="paginator" v-if="lastPage > 1 && showedActus.length > 3">
|
||||
<nav>
|
||||
<ul class="pagination">
|
||||
<li class="page-item" v-if="currentPage > firstPage" @click="showPrevPage(false, $event)">
|
||||
<a href="#" rel="prev" aria-label="« Précédent" class="page-link">‹</a>
|
||||
</li>
|
||||
<li v-for="pageNumber in pagesNumber" :key="pageNumber" :class="'page-item ' + (pageNumber==currentPage ? 'active' : '')" @click="showPage(pageNumber, false, $event)">
|
||||
<li v-for="pageNumber of pagesNumber" :key="pageNumber" :class="'page-item ' + (pageNumber==currentPage ? 'active' : '')" @click="showPage(pageNumber, false, $event)">
|
||||
<a href="#" class="page-link" >{{ pageNumber }}</a>
|
||||
</li>
|
||||
<li class="page-item" v-if="currentPage < lastPage" @click="showNextPage(false, $event)">
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
</nav>
|
||||
</div>
|
||||
<div class="articles">
|
||||
<div class="item" v-for="actu in showedActus" :key="actu.id">
|
||||
<div class="item" v-for="actu of showedActus" :key="actu.id">
|
||||
<div class="placeholder" v-if="actu.loading">
|
||||
<div class="image">
|
||||
<content-placeholders>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<li class="page-item" v-if="currentPage > firstPage" @click="showPrevPage(true, $event);">
|
||||
<a href="#" rel="prev" aria-label="« Précédent" class="page-link">‹</a>
|
||||
</li>
|
||||
<li v-for="pageNumber in pagesNumber" :key="pageNumber" :class="'page-item ' + (pageNumber==currentPage ? 'active' : '')" @click="showPage(pageNumber, true, $event)">
|
||||
<li v-for="pageNumber of pagesNumber" :key="pageNumber" :class="'page-item ' + (pageNumber==currentPage ? 'active' : '')" @click="showPage(pageNumber, true, $event)">
|
||||
<a href="#" class="page-link" >{{ pageNumber }}</a>
|
||||
</li>
|
||||
<li class="page-item" v-if="currentPage < lastPage" @click="showNextPage(true, $event);">
|
||||
|
|
@ -80,12 +80,12 @@ export default {
|
|||
props: ["pageLinks", "actusData", "tagsData", "paginateData", "currentTag"],
|
||||
data() {
|
||||
return {
|
||||
links: {},
|
||||
actus: {},
|
||||
showedActus: {},
|
||||
tags: {},
|
||||
actus: [],
|
||||
showedActus: [],
|
||||
tags: [],
|
||||
maxPagesToShow: 2,
|
||||
paginate: 10,
|
||||
/** Articles per page */
|
||||
paginate: 3,
|
||||
firstPage: 1,
|
||||
lastPage: 1,
|
||||
currentPage: 1,
|
||||
|
|
@ -139,41 +139,43 @@ export default {
|
|||
},
|
||||
loadPage(page) {
|
||||
// reset showed actu
|
||||
this.$set(this, 'showedActus', {})
|
||||
this.$set(this, 'showedActus', [])
|
||||
this.$set(this, 'currentPage', page)
|
||||
let actusPage = this.filterActuByTag()
|
||||
// Per page
|
||||
let perPage = this.paginate
|
||||
let start = perPage * page - perPage + 1
|
||||
let start = perPage * page - perPage
|
||||
let stop = perPage * page
|
||||
|
||||
let actus = this.filterActuByTag()
|
||||
console.log(start)
|
||||
console.log(stop)
|
||||
|
||||
let k = 1
|
||||
for (let id in actus) {
|
||||
if(k < start) {
|
||||
k++
|
||||
let k = 0
|
||||
for (let actu of actusPage) {
|
||||
if(k++ < start) {
|
||||
continue
|
||||
}
|
||||
if(k > stop) {
|
||||
break
|
||||
}
|
||||
let actu = Object.assign({}, actus[id])
|
||||
actu.loading = true;
|
||||
this.$set(this.showedActus, k++, actu)
|
||||
this.showedActus.push(actu)
|
||||
this.loadActu(actu);
|
||||
}
|
||||
this.lastPage = Math.ceil(Object.keys(actus).length / this.paginate)
|
||||
this.lastPage = Math.ceil(actusPage.length / this.paginate)
|
||||
this.genPagesNumbers()
|
||||
},
|
||||
filterActuByTag() {
|
||||
let actus = {}
|
||||
for(let id in this.actus) {
|
||||
let actu = this.actus[id]
|
||||
let containTag = Object.values(actu.tags).filter(tag => { return tag === this.selectedTag}).length
|
||||
let actusFiltered = []
|
||||
for(let actu of this.actus) {
|
||||
let containTag = actu.tags.filter(tagId => {
|
||||
return tagId === this.selectedTag
|
||||
}).length
|
||||
if(!this.selectedTag || containTag) {
|
||||
actus[id] = Object.assign({}, actu)
|
||||
actusFiltered.push(Object.assign({}, actu))
|
||||
}
|
||||
}
|
||||
return actus
|
||||
return actusFiltered
|
||||
},
|
||||
loadActu(actu) {
|
||||
axios
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue