@tricoteuses/senat 2.7.1 → 2.8.1

package/lib/loaders.d.ts

@@ -69,6 +69,7 @@ export declare function iterLoadSenatDossiersLegislatifsDocuments(dataDir: strin
 export declare function iterLoadSenatDossiersLegislatifsRapports(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
 export declare function iterLoadSenatDossiersLegislatifsTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
 export declare function loadSenatTexteContent(dataDir: string, textePathFromDataset: string): IterItem<FlatTexte | null>;
+export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AgendaEvent[]>>;
 export declare function iterLoadSenatEvenements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AgendaEvent>>;
 export declare function iterLoadSenatCirconscriptions(dataDir: string, options?: {}): Generator<IterItem<CirconscriptionResult>>;
 export declare function iterLoadSenatOrganismes(dataDir: string, options?: {}): Generator<IterItem<OrganismeResult>>;

package/lib/loaders.js

@@ -144,6 +144,11 @@ export function loadSenatTexteContent(dataDir, textePathFromDataset) {
     const texteJson = fs.readFileSync(fullTextePath, { encoding: "utf8" });
     return { item: JSON.parse(texteJson) };
 }
+export function* iterLoadSenatAgendas(dataDir, session, options = {}) {
+    for (const evenementsItem of iterLoadSenatItems(dataDir, AGENDA_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
+        yield evenementsItem;
+    }
+}
 export function* iterLoadSenatEvenements(dataDir, session, options = {}) {
     for (const evenementsItem of iterLoadSenatItems(dataDir, AGENDA_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
         for (const evenement of evenementsItem.item) {

package/lib/model/agenda.js

@@ -3,6 +3,9 @@ import { DateTime } from "luxon";
 import path from "path";
 import { ID_DATE_FORMAT, STANDARD_DATE_FORMAT } from "../scripts/datautil";
 const FR_TZ = "Europe/Paris";
+function eventIsSeance(eventElement) {
+    return eventElement.classList.contains("evt-seance");
+}
 function getEventType(eventClasses) {
     const typeClass = [...eventClasses]
         .find(className => className.startsWith("evt-"))
@@ -27,27 +30,25 @@ function getUrlDossierSenat(lienElements) {
     return urlElement ? urlElement.getAttribute("href") : null;
 }
 function getQuantieme(eventElement, seancesElements) {
-    if (eventElement.classList.contains("evt-seance")) {
-        const seanceIndex = seancesElements.indexOf(eventElement);
-        if (seancesElements.length === 1 && seanceIndex === 0) {
-            return "Unique";
-        }
-        else {
-            switch (seanceIndex) {
-                case 0:
-                    return "Première";
-                case 1:
-                    return "Deuxième";
-                case 2:
-                    return "Troisième";
-                case 3:
-                    return "Quatrième";
-                case 4:
-                    return "Cinquième";
-            }
+    const seanceIndex = seancesElements.indexOf(eventElement);
+    if (seancesElements.length === 1 && seanceIndex === 0) {
+        return "Unique";
+    }
+    else {
+        switch (seanceIndex) {
+            case 0:
+                return "Première";
+            case 1:
+                return "Deuxième";
+            case 2:
+                return "Troisième";
+            case 3:
+                return "Quatrième";
+            case 4:
+                return "Cinquième";
         }
     }
-    return null;
+    return "Non défini";
 }
 /**
  * Normalize time string to become a simple start time ("H'h'mm") or a duration ("'de 'H'h'mm' à 'H'h'mm").
@@ -85,8 +86,7 @@ function getStartAndEndTimes(timeStr) {
 function transformAgenda(document, fileName) {
     const agendaEvents = [];
     const eventElements = document.querySelectorAll(".evt");
-    const seanceElements = Array.from(eventElements)
-        .filter(eventElement => eventElement.classList.contains("evt-seance"));
+    const seanceElements = Array.from(eventElements).filter(eventElement => eventIsSeance(eventElement));
     for (const eventElement of eventElements) {
         const id = eventElement.previousElementSibling?.getAttribute("name") || null;
         if (!id) {
@@ -118,7 +118,7 @@ function transformAgenda(document, fileName) {
             lieu,
             captationVideo: videoElement !== null,
             urlDossierSenat: urlDossierSenat,
-            quantieme: getQuantieme(eventElement, seanceElements),
+            quantieme: eventIsSeance(eventElement) ? getQuantieme(eventElement, seanceElements) : null,
         });
     }
     return agendaEvents;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.7.1",
+  "version": "2.8.1",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",