Obs/fix-actus

public/src/app/observatoire/territoire/page.tsx

@@ -12,7 +12,7 @@ import SectionTitle from '../../../components/common/SectionTitle';
 import KeyFigures from './KeyFigures';
 import DistanceGraph from './graphs/DistanceGraph';
 import RepartitionDistanceGraph from './graphs/RepartitionDistanceGraph';
-//import RepartitionHoraireGraph from './graphs/RepartitionHoraireGraph';
+import RepartitionHoraireGraph from './graphs/RepartitionHoraireGraph';
 import FluxGraph from './graphs/FluxGraph';
 import OccupationGraph from './graphs/OccupationGraph';
 import DensiteMap from './maps/DensiteMap';
@@ -53,9 +53,9 @@ export default function Page() {
           />
           <KeyFigures params={params} />
           <div className={fr.cx('fr-grid-row', 'fr-grid-row--gutters')}>
-            {/*<div className={fr.cx('fr-col-12','fr-col-md-6')}>
+            <div className={fr.cx('fr-col-12','fr-col-md-6')}>
               <RepartitionHoraireGraph title='Trajets par horaire' params={params} />
-            </div>*/}
+            </div>
             <div className={fr.cx('fr-col-12','fr-col-md-6')}>
               <RepartitionDistanceGraph title='Répartition des trajets par distance' params={params} />
             </div>

public/src/app/ressources/page.tsx

@@ -20,7 +20,7 @@ export default async function Ressources() {
         '_eq': 'published',
       },
     },
-    sort:['-date_created'] as never[],
+    sort:['-date_publi'] as never[],
     meta:'filter_count',
   });
 
@@ -38,7 +38,7 @@ export default async function Ressources() {
                 <RessourceCard 
                   title={a.title}
                   content={a.content}
-                  date={new Date(a.date_created).toLocaleDateString('fr-FR')}
+                  date={new Date(a.date_publi).toLocaleDateString('fr-FR')}
                   link={a.link}
                   file={a.file ? `${cmsHost}/assets/${a.file}` : undefined}
                   img={`${cmsHost}/assets/${a.img.id}`}

public/src/app/ressources/page/[id]/page.tsx

@@ -41,7 +41,7 @@ export default async function RessourcePage({ params }: { params: { id: string }
         '_eq': 'published',
       },
     },
-    sort:['-date_created'] as never[],
+    sort:['-date_publi'] as never[],
     page:Number(params.id),
     meta:'filter_count',
   });
@@ -60,7 +60,7 @@ export default async function RessourcePage({ params }: { params: { id: string }
                 <RessourceCard 
                   title={a.title}
                   content={a.content}
-                  date={new Date(a.date_created).toLocaleDateString('fr-FR')}
+                  date={new Date(a.date_publi).toLocaleDateString('fr-FR')}
                   link={a.link}
                   file={a.file ? `${cmsHost}/assets/${a.file}` : undefined}
                   img={`${cmsHost}/assets/${a.img.id}`}

public/src/components/observatoire/maps/DeckMap.tsx

@@ -51,7 +51,7 @@ const DeckMap = (props: DeckMapInterface) => {
             {props.sidebar}
           </div>
         }
-        <div className={fr.cx('fr-col', mapClass)}>
+        <div className={fr.cx('fr-col', mapClass)} tabIndex={0}>
           <Map
             ref={mapRef}
             initialViewState={props.initialView ? props.initialView : defaultView}

public/src/components/observatoire/maps/Map.tsx

@@ -43,7 +43,7 @@ const AppMap = (props: MapInterface) => {
             {props.sidebar}
           </div>
         }
-        <div className={fr.cx('fr-col', mapClass)}>
+        <div className={fr.cx('fr-col', mapClass)} tabIndex={0}>
           <Map
             ref={mapRef}
             initialViewState={props.initialView ? props.initialView : defaultView}

public/src/interfaces/cms/collectionsInterface.ts

@@ -19,6 +19,7 @@ export interface Ressource {
   img_legend?:string,
   file:string,
   status:string,
+  date_publi: Date,
   date_created: Date,
   date_updated: Date,
   user_created: Date,

public/src/styles/global.scss

@@ -15,6 +15,9 @@ table {
   object-fit: contain;
   height: auto;
 }
+.fr-grid-row .fr-card {
+  z-index: 0;
+}
 .fr-content-media__img img{
   aspect-ratio: 1 !important;
 }