regardscitoyens · alexfauquette · Jun 13, 2024 · Jun 13, 2024
diff --git a/app/[legislature]/dossier/[id]/[tab]/page.tsx b/app/[legislature]/dossier/[id]/[tab]/page.tsx
@@ -51,6 +51,7 @@ export default async function Page({
             amendements={amendements}
             documents={dossier?.documents}
             amendementCount={dossier?.amendementCount}
+            dossierRefUid={params.id}
           />
         </Suspense>
       );

diff --git a/components/folders/AmendementTab/AmendementCard.tsx b/components/folders/AmendementTab/AmendementCard.tsx
@@ -1,6 +1,8 @@
 "use client";
 import * as React from "react";
 
+import Link from "next/link";
+
 import { Amendement } from "@/repository/types";
 import Typography from "@mui/material/Typography";
 import Stack from "@mui/material/Stack";
@@ -44,6 +46,9 @@ export default function AmendementCard(props: Amendement) {
     uid,
     group_color,
     group_libelle,
+    seanceRefUid,
+    dossierRefUid,
+    numeroOrdreDepot,
   } = props;
 
   // TODO: utiliser la base cosignataires amendement pour avoir le nombre et les noms
@@ -103,12 +108,18 @@ export default function AmendementCard(props: Amendement) {
             dangerouslySetInnerHTML={{ __html: dispositif }}
           />
 
-          <Typography fontWeight="light" variant="body2">
-            Examiné par:&nbsp;
-            <Typography component="a" variant="body2">
-              Le nom d&apos;une commission parlementaire
+          {dossierRefUid && seanceRefUid && (
+            // <Typography fontWeight="light" variant="body2">
+            //   Examiné par:&nbsp;
+            <Typography
+              component={Link}
+              href={`/16/dossier/${dossierRefUid}/debat?compteRenduRef=${seanceRefUid}#adt-${numeroOrdreDepot}`}
+              variant="body2"
+            >
+              Voire le debat associé
             </Typography>
-          </Typography>
+            // </Typography>
+          )}
           <Stack direction="row" justifyContent="space-between" flexBasis={0}>
             <Typography fontWeight="light" variant="body2">
               Déposé par:&nbsp;

diff --git a/components/folders/AmendementTab/AmendementList.tsx b/components/folders/AmendementTab/AmendementList.tsx
@@ -7,14 +7,21 @@ import AmendementCard from "./AmendementCard";
 import { AmendementTabProps } from ".";
 
 export default function AmendementsList(
-  props: Pick<AmendementTabProps, "amendements"> & {
+  props: Pick<AmendementTabProps, "amendements" | "dossierRefUid"> & {
     numero: string;
     selectedDocument: string;
     depute: string;
     status: string;
   }
 ) {
-  const { amendements, numero, depute, status, selectedDocument } = props;
+  const {
+    amendements,
+    numero,
+    depute,
+    status,
+    selectedDocument,
+    dossierRefUid,
+  } = props;
 
   const filteredAmendements = amendements
     .filter((amendement) => {
@@ -50,7 +57,11 @@ export default function AmendementsList(
   return (
     <Stack>
       {filteredAmendements.map((amendement) => (
-        <AmendementCard {...amendement} key={amendement.uid} />
+        <AmendementCard
+          {...amendement}
+          key={amendement.uid}
+          dossierRefUid={dossierRefUid}
+        />
       ))}
     </Stack>
   );

diff --git a/components/folders/AmendementTab/index.tsx b/components/folders/AmendementTab/index.tsx
@@ -18,12 +18,14 @@ export type AmendementTabProps = Pick<
   "amendementCount" | "documents"
 > & {
   amendements: (Amendement & Acteur)[];
+  dossierRefUid: string;
 };
 
 export const AmendementTab = ({
   amendements,
   documents,
   amendementCount,
+  dossierRefUid,
 }: AmendementTabProps) => {
   const [numero, handleNumero] = useFilterSearch("numero");
   const [document, handleDocument] = useFilterSearch("document");
@@ -65,6 +67,7 @@ export const AmendementTab = ({
         </Typography>
         <AmendementList
           amendements={amendements}
+          dossierRefUid={dossierRefUid}
           numero={numero}
           selectedDocument={document}
           depute={depute}

diff --git a/components/folders/DebatTab/SubSectionItem.tsx b/components/folders/DebatTab/SubSectionItem.tsx
@@ -11,14 +11,15 @@ import { cleanText } from "./cleanText";
 
 interface ParoleItemProps {
   title: string | null;
+  id?: string;
   withoutConnector?: boolean;
 }
 
 export default function SubSectionItem(props: ParoleItemProps) {
-  const { title, withoutConnector } = props;
+  const { title, withoutConnector, id } = props;
 
   return (
-    <TimelineItem>
+    <TimelineItem id={id}>
       <TimelineSeparator sx={{ minWidth: 50 }}>
         <TimelineDot />
         {!withoutConnector && <TimelineConnector />}

diff --git a/components/folders/DebateTimeline.tsx b/components/folders/DebateTimeline.tsx
@@ -43,6 +43,7 @@ export const DebateTimeline = ({ paragraphs }: DebateTimelineProps) => (
         group_libelle_short,
         roleDebat,
         texte,
+        adt,
         ...other
       }) => {
         switch (codeGrammaire) {
@@ -70,6 +71,10 @@ export const DebateTimeline = ({ paragraphs }: DebateTimelineProps) => (
             return <SectionItem id={hash} title={texte} />;
 
           case "TITRE_TEXTE_DISCUSSION":
+            console.log(codeGrammaire);
+            console.log(texte);
+            console.log(other);
+
             return (
               <Typography
                 variant="h1"
@@ -78,6 +83,10 @@ export const DebateTimeline = ({ paragraphs }: DebateTimelineProps) => (
               />
             );
           case "SOUS_TITRE_TEXTE_DISCUSSION":
+            console.log(codeGrammaire);
+            console.log(texte);
+            console.log(other);
+
             return (
               <Typography
                 variant="h3"
@@ -86,16 +95,25 @@ export const DebateTimeline = ({ paragraphs }: DebateTimelineProps) => (
               />
             );
           case "ODJ_APPEL_DISCUSSION":
+            console.log(codeGrammaire);
+            console.log(texte);
+            console.log(other);
+
             return (
               <Typography
                 component="p"
                 dangerouslySetInnerHTML={{ __html: cleanText(texte) }}
               />
             );
           default:
+            console.log(codeGrammaire);
+            console.log(texte);
+            console.log(other);
+
             return texte ? (
               <SubSectionItem
                 title={texte}
+                id={adt ? `adt-${adt}` : undefined}
                 withoutConnector={codeGrammaire === "FIN_SEAN_1_0"}
               />
             ) : null;

diff --git a/repository/database.ts b/repository/database.ts
@@ -491,6 +491,15 @@ export async function getDeputeAmendement(slug: string) {
       .select("*")
       .from("Amendement")
       .where("acteurRefUid", "=", depute[0].uid)
+      .rightJoin(
+        function () {
+          this.select(["texteAssocieRefUid", "dossierRefUid"])
+            .from("ActeLegislatif")
+            .as("acte");
+        },
+        "Amendement.texteLegislatifRefUid",
+        "acte.texteAssocieRefUid"
+      )
       .options({ nestTables: true });
 
     return {