Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

added date filter

Browse Source
This commit is contained in:
Luca Haid
2026-01-27 10:55:10 +01:00
parent d883d72b4a
commit 9b6ed35ddc
3 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/Preorderlogistics/PreorderlogisticsController.php
View File

@@ -337,6 +337,16 @@ class PreorderlogisticsController extends mfBaseController {
}
}
// Date filter for sent date (Versanddatum range)
if (!empty($filter['sent_date']) && is_array($filter['sent_date'])) {
if (!empty($filter['sent_date']['from'])) {
$new_filter['add-where'] .= " AND Preorderlogistics.sent >= " . intval($filter['sent_date']['from']);
}
if (!empty($filter['sent_date']['to'])) {
$new_filter['add-where'] .= " AND Preorderlogistics.sent <= " . intval($filter['sent_date']['to']);
}
}
$new_filter["status_code"] = 140;
$new_filter["deleted"] = 0;
$new_filter["unit_count<="] = 2;

29
public/js/pages/PreorderLogistics/PreorderLogistics.css
View File

@@ -10,4 +10,33 @@
.col-form-label {
padding-top: 0 !important
}
/* Filter panel styles */
.filter-panel {
padding: 1rem !important;
}
.filter-panel .header-title {
font-size: 1.1rem;
margin-bottom: 0.75rem !important;
}
.filter-panel .row.g-2 > [class*="col-"] {
padding-left: 0.5rem;
padding-right: 0.5rem;
}
.filter-panel .form-group {
margin-bottom: 0;
}
.filter-actions {
display: flex;
gap: 0.5rem;
flex-wrap: wrap;
}
.filter-actions .btn {
margin-right: 0;
}

34
public/js/pages/PreorderLogistics/PreorderLogistics.js
View File

@@ -2,35 +2,38 @@ Vue.component('preorder-logistics', {
template: `
<tt-card>
<div class="card mb-3">
<div class="card-body">
<h4 class="header-title mb-3">Filter</h4>
<div class="row">
<div class="col-md-3">
<div class="card-body filter-panel">
<h4 class="header-title mb-2">Filter</h4>
<div class="row g-2 align-items-end">
<div class="col-lg-2 col-md-4">
<tt-select label="Kampagne" :options="campaigns" v-model="filters.preordercampaign_id" sm multiple/>
</div>
<div class="col-md-3">
<div class="col-lg-2 col-md-4">
<tt-select label="FCP" :options="fcps" v-model="filters.fcp" sm multiple searchable/>
</div>
<div class="col-md-2">
<div class="col-lg-2 col-md-4">
<tt-select label="Versandstatus" :options="sentStatusOptions" v-model="filters.sent" sm/>
</div>
<div class="col-md-2">
<div class="col-lg-2 col-md-4">
<tt-input label="Bestellcode" v-model="filters.ucode" sm/>
</div>
<div class="col-md-2">
<div class="col-lg-2 col-md-4">
<tt-input label="OAID" v-model="filters.oaid" sm/>
</div>
<div class="col-lg-2 col-md-4">
<tt-date-picker label="Versanddatum" v-model="filters.sent_date" sm :time-picker="false"/>
</div>
</div>
<div class="row mt-2">
<div class="col-md-6">
<div class="row g-2 mt-1 align-items-end">
<div class="col-lg-4 col-md-6">
<tt-input label="Anschlussadresse" v-model="filters.address" sm/>
</div>
<div class="col-md-6">
<div class="col-lg-4 col-md-6">
<tt-input label="Kunde" v-model="filters.kunde" sm/>
</div>
</div>
<div class="row mt-3">
<div class="col">
<div class="row mt-2">
<div class="col filter-actions">
<tt-button text="Filter anwenden" @click="applyFilters" icon="fas fa-filter"
additional-class="btn-primary"/>
<tt-button text="Filter zurücksetzen" @click="resetFilters" icon="fas fa-undo"
@@ -91,7 +94,8 @@ Vue.component('preorder-logistics', {
sent: 'no',
address: '',
kunde: '',
fcp: []
fcp: [],
sent_date: null
},
tableConfig: {
key: 'preorderlogistics',
@@ -155,7 +159,7 @@ Vue.component('preorder-logistics', {
},
resetFilters() {
this.filters = {
preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: []
preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: [], sent_date: null
};
this.applyFilters();
},