Skip to content

Commit 23dc95c

Browse files
fix: fix display pieces justifivatives on intructeur (#673)
1 parent 3d98272 commit 23dc95c

9 files changed

Lines changed: 426 additions & 52 deletions

File tree

.env.development

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/components/Dossier.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
.insideWrapper {
1515
margin-top: 28px;
1616
display: grid;
17-
grid-template-columns: 2fr 2fr 3fr 3fr 1.2fr;
17+
grid-template-columns: 2fr 2fr 3fr 4fr;
1818
grid-column-gap: 1rem;
1919
}
2020

src/components/Dossier.tsx

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Foldable from "src/components/Foldable";
1313
import IconLoader from "src/components/IconLoader";
1414
import Info from "src/components/Info";
1515
import InfoSociete from "src/components/InfoSociete";
16-
import { JustificatifsDossier } from "src/components/Justificatifs";
16+
import { DossierJustificatifs } from "src/components/DossierJustificatifs";
1717
import logoArrowUp from "src/images/arrow-up.svg";
1818
import { useDossier } from "src/lib/api";
1919
import type { Comments } from "src/lib/fetching/comments";
@@ -40,7 +40,6 @@ import CountPieces from "./CountPieces";
4040
import InputComments from "./inputComments";
4141
import ListComments from "./ListComments";
4242
import Table from "./Table";
43-
import { ValidationJustificatifsDossier } from "./ValidationJustificatifs";
4443
import { getUsersById } from "src/lib/fetching/users";
4544

4645
interface Props {
@@ -254,17 +253,14 @@ const Dossier: React.FC<Props> = ({ dossierId, dataLinks }) => {
254253
dossier.scenesSensibles.filter(scene => scene !== null).join(", ")}
255254
</Info>
256255
</div>
257-
<Info title="PIECES JUSTIFICATIVES">
256+
<Info title="PIECES JUSTIFICATIVES & VALIDATION">
258257
{dossier.source === "FORM_EDS" && (
259-
<JustificatifsDossier dossier={dossier} dataLinks={dataLinks} />
258+
<DossierJustificatifs
259+
dossier={dossier}
260+
showValidation={true}
261+
/>
260262
)}
261263
</Info>
262-
<Info title="VALIDATION">
263-
<ValidationJustificatifsDossier
264-
dossier={dossier}
265-
dataLinks={dataLinks}
266-
/>
267-
</Info>
268264
</div>
269265
<div style={{ marginTop: "36px" }}>
270266
<div
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.justificatifRow {
2+
display: flex;
3+
justify-content: space-between;
4+
align-items: center;
5+
margin-bottom: 10px;
6+
width: 100%;
7+
}
8+
9+
.documentInfo {
10+
flex: 1;
11+
display: flex;
12+
align-items: center;
13+
}
14+
15+
.validationControls {
16+
flex: 1;
17+
display: flex;
18+
justify-content: flex-end;
19+
}
20+
21+
.compactSelect {
22+
:global {
23+
.fr-select {
24+
height: 2rem;
25+
min-height: auto;
26+
font-size: 0.875rem;
27+
}
28+
29+
.fr-select-group {
30+
margin-bottom: 0;
31+
}
32+
33+
.fr-label {
34+
display: none; // Hide the label to save space
35+
}
36+
}
37+
}
38+
39+
.statusIcon {
40+
margin-right: 11px;
41+
font-size: 18px;
42+
font-weight: bold;
43+
}
44+
45+
.documentLink {
46+
text-decoration: none;
47+
&:hover {
48+
text-decoration: underline;
49+
}
50+
}

0 commit comments

Comments
 (0)