diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7611c..7b4eff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Ajouter dans le fichier .env du frontend * [#256] Créer une nouvelle réception (étape 3 - bovin) * [#314] Création d'une page d'administration : listing des utilisateurs * [#313] Admin modification creation fournisseur +* [#275] Lister les expéditions en attente * [#276] Lister les expéditions terminées ### Changed diff --git a/config/version.yaml b/config/version.yaml index 9d3fb98..a227f6e 100644 --- a/config/version.yaml +++ b/config/version.yaml @@ -1,2 +1,2 @@ parameters: - app.version: '0.0.40' + app.version: '0.0.41' diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index 6a06e55..67079c2 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -6,7 +6,7 @@ - + diff --git a/frontend/pages/shipment/waiting-shipment.vue b/frontend/pages/shipment/waiting-shipment.vue new file mode 100644 index 0000000..4a35459 --- /dev/null +++ b/frontend/pages/shipment/waiting-shipment.vue @@ -0,0 +1,73 @@ + + + + + listes des expéditions en attente + + + + + + + Client + Adresse + Type d'expéditions + Transporteur + Immatriculation + + + {{ shipment.customer?.label }} + {{ shipment.address?.fullAddress }} + + + + {{ line }} + + + + {{ shipment.carrier?.name }} + {{ shipment.licencePlate }} + + + + + + diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php index 8bcaed4..91b6f4e 100644 --- a/src/Entity/Shipment.php +++ b/src/Entity/Shipment.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace App\Entity; +use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; +use ApiPlatform\Metadata\ApiFilter; use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\Get; @@ -26,6 +28,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer; #[ORM\Entity] #[ORM\HasLifecycleCallbacks] #[ORM\Table(name: 'shipment')] +#[ApiFilter(BooleanFilter::class, properties: ['isValid'])] #[ApiResource( operations: [ new Get(