Skip to content

Commit

Permalink
[TRA-tra-8351] Ne pas doubler les quantités restantes à regrouper lor…
Browse files Browse the repository at this point in the history
…squ'on modifie un bordereau de groupement (#3760)
  • Loading branch information
benoitguigal authored Nov 26, 2024
2 parents dcbc80a + 7726b41 commit 93587bd
Show file tree
Hide file tree
Showing 7 changed files with 842 additions and 296 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ Les changements importants de Trackdéchets sont documentés dans ce fichier.
Le format est basé sur [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
et le projet suit un schéma de versionning inspiré de [Calendar Versioning](https://calver.org/).

# [2024.12.1] 17/12/2024

#### :bug: Corrections de bugs

- Ne pas doubler les quantités restantes à regrouper lorsqu'on modifie un bordereau de groupement [PR 3760](https://github.com/MTES-MCT/trackdechets/pull/3760)

# [2024.11.1] 19/11/2024

#### :rocket: Nouvelles fonctionnalités
Expand Down
1 change: 1 addition & 0 deletions front/src/Apps/common/queries/fragments/bsdd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ const mutableFieldsFragment = gql`
}
signedAt
quantityReceived
quantityAccepted
quantityGrouped
processingOperationDone
}
Expand Down
13 changes: 9 additions & 4 deletions front/src/form/bsdd/StepList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,15 @@ export default function StepsList(props: Props) {
...(ecoOrganisme?.siret ? { ecoOrganisme } : { ecoOrganisme: null }),
...(grouping?.length
? {
grouping: grouping.map(({ form, quantity }) => ({
form: { id: form.id },
quantity
}))
grouping: grouping
.map(({ form, quantity }) => ({
form: { id: form.id },
// quantity peut être égal à "" dans le
// cas où l'input est laissé vide dans le sélecteur
// d'annexes 2
quantity: Number(quantity)
}))
.filter(g => g.quantity > 0)
}
: {}),
transporters: transporterIds
Expand Down
6 changes: 4 additions & 2 deletions front/src/form/bsdd/WasteInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
PROCESSING_OPERATIONS_GROUPEMENT_CODES
} from "@td/constants";
import React, { useEffect } from "react";
import Appendix2MultiSelect from "./components/appendix/Appendix2MultiSelect";
import Packagings from "./components/packagings/Packagings";
import { ParcelNumbersSelector } from "./components/parcel-number/ParcelNumber";
import {
Expand All @@ -19,6 +18,7 @@ import {
import "./WasteInfo.scss";
import EstimatedQuantityTooltip from "../../common/components/EstimatedQuantityTooltip";
import ToggleSwitch from "@codegouvfr/react-dsfr/ToggleSwitch";
import Appendix2MultiSelectWrapper from "./components/appendix/Appendix2MultiSelectWrapper";

type Values = {
wasteDetails: {
Expand Down Expand Up @@ -185,7 +185,9 @@ export default connect<{ disabled }, Values>(function WasteInfo({
traitement de type{" "}
{PROCESSING_OPERATIONS_GROUPEMENT_CODES.join(", ")}.
</p>
<Appendix2MultiSelect />
<Appendix2MultiSelectWrapper
emitterCompanySiret={values.emitter?.company?.siret}
/>
</>
)}

Expand Down
Loading

0 comments on commit 93587bd

Please sign in to comment.