@tricoteuses/senat 3.1.9 → 3.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/rich_types/dosleg.js +5 -3
- package/lib/src/server/sens.js +15 -15
- package/package.json +1 -1
|
@@ -128,6 +128,7 @@ export function buildActesLegislatifs(dossier) {
|
|
|
128
128
|
datesSeances.sort(compareByDate);
|
|
129
129
|
const premiereSeance = datesSeances[0];
|
|
130
130
|
if (premiereSeance && premiereSeance.date) {
|
|
131
|
+
const texteAvantSeance = textesTries.find((t) => (t.origine || "").toLowerCase().includes("de la commission"));
|
|
131
132
|
actes.push({
|
|
132
133
|
code_acte: `${phasePrefix}-DEBATS-SEANCE`,
|
|
133
134
|
date: premiereSeance.date,
|
|
@@ -138,11 +139,14 @@ export function buildActesLegislatifs(dossier) {
|
|
|
138
139
|
chambre: "SN",
|
|
139
140
|
signet_dossier: loiSignet,
|
|
140
141
|
code_organisme: null,
|
|
142
|
+
texte_url: texteAvantSeance?.url ?? null,
|
|
141
143
|
});
|
|
142
144
|
}
|
|
143
145
|
}
|
|
144
146
|
const texteFinal = [...textesTries].reverse().find((t) => {
|
|
145
147
|
const origine = (t.origine || "").toLowerCase();
|
|
148
|
+
if (origine.includes("de la commission"))
|
|
149
|
+
return false;
|
|
146
150
|
return (origine.includes("adopté") ||
|
|
147
151
|
origine.includes("rejeté") ||
|
|
148
152
|
origine.includes("devenu résolution") ||
|
|
@@ -157,9 +161,7 @@ export function buildActesLegislatifs(dossier) {
|
|
|
157
161
|
else if (origine.includes("devenue résolution")) {
|
|
158
162
|
libelleStatut = "Adopté";
|
|
159
163
|
}
|
|
160
|
-
|
|
161
|
-
// On utilise COM-CAE-DEC plutôt que DEBATS-DEC pour refléter l'absence de séance plénière
|
|
162
|
-
const codeActeDecision = (texteFinal.origine || "").toLowerCase().includes("devenu résolution")
|
|
164
|
+
const codeActeDecision = origine.includes("devenu résolution")
|
|
163
165
|
? `${phasePrefix}-COM-CAE-DEC`
|
|
164
166
|
: `${phasePrefix}-DEBATS-DEC`;
|
|
165
167
|
actes.push({
|
package/lib/src/server/sens.js
CHANGED
|
@@ -83,9 +83,9 @@ export async function* findAll() {
|
|
|
83
83
|
sql `to_char(fonmemcom.fonmemcomdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
|
|
84
84
|
sql `to_char(fonmemcom.fonmemcomdatfin, 'YYYY-MM-DD')`.as("date_fin"),
|
|
85
85
|
sql `coalesce(
|
|
86
|
-
nullif(
|
|
87
|
-
nullif(
|
|
88
|
-
nullif(
|
|
86
|
+
nullif(trim(foncom.foncomlib), ''),
|
|
87
|
+
nullif(trim(foncom.foncomlil), ''),
|
|
88
|
+
nullif(trim(foncom.foncomlic), ''))`.as("libelle"),
|
|
89
89
|
"fonmemcom.fonmemcomdatdeb as order_date",
|
|
90
90
|
])
|
|
91
91
|
.whereRef("fonmemcom.memcomid", "=", "memcom.memcomid")
|
|
@@ -118,9 +118,9 @@ export async function* findAll() {
|
|
|
118
118
|
sql `to_char(fonmemdelega.fonmemdeldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
|
|
119
119
|
sql `to_char(fonmemdelega.fonmemdeldatfin, 'YYYY-MM-DD')`.as("date_fin"),
|
|
120
120
|
sql `coalesce(
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
121
|
+
nullif(trim(fondelega.fondellib), ''),
|
|
122
|
+
nullif(trim(fondelega.fondellil), ''),
|
|
123
|
+
nullif(trim(fondelega.fondellic), ''))`.as("libelle"),
|
|
124
124
|
"fonmemdelega.fonmemdeldatdeb as order_date",
|
|
125
125
|
])
|
|
126
126
|
.whereRef("fonmemdelega.memdelegaid", "=", "memdelega.memdelegaid")
|
|
@@ -153,9 +153,9 @@ export async function* findAll() {
|
|
|
153
153
|
sql `to_char(fonmemgrppol.fonmemgrppoldatdeb, 'YYYY-MM-DD')`.as("date_debut"),
|
|
154
154
|
sql `to_char(fonmemgrppol.fonmemgrppoldatfin, 'YYYY-MM-DD')`.as("date_fin"),
|
|
155
155
|
sql `coalesce(
|
|
156
|
-
nullif(
|
|
157
|
-
nullif(
|
|
158
|
-
nullif(
|
|
156
|
+
nullif(trim(fongrppol.fongrppollib), ''),
|
|
157
|
+
nullif(trim(fongrppol.fongrppollil), ''),
|
|
158
|
+
nullif(trim(fongrppol.fongrppollic), ''))`.as("libelle"),
|
|
159
159
|
"fonmemgrppol.fonmemgrppoldatdeb as order_date",
|
|
160
160
|
])
|
|
161
161
|
.whereRef("fonmemgrppol.memgrppolid", "=", "memgrppol.memgrppolid")
|
|
@@ -187,9 +187,9 @@ export async function* findAll() {
|
|
|
187
187
|
sql `to_char(fonmemorg.fonmemorgdatdeb, 'YYYY-MM-DD')`.as("date_debut"),
|
|
188
188
|
sql `to_char(fonmemorg.fonmemorgdatfin, 'YYYY-MM-DD')`.as("date_fin"),
|
|
189
189
|
sql `coalesce(
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
190
|
+
nullif(trim(fonorg.fonorglib), ''),
|
|
191
|
+
nullif(trim(fonorg.fonorglil), ''),
|
|
192
|
+
nullif(trim(fonorg.fonorglic), ''))`.as("libelle"),
|
|
193
193
|
"fonmemorg.fonmemorgdatdeb as order_date",
|
|
194
194
|
])
|
|
195
195
|
.whereRef("fonmemorg.memorgid", "=", "memorg.memorgid")
|
|
@@ -238,9 +238,9 @@ export async function* findAll() {
|
|
|
238
238
|
sql `to_char(fonmemgrpsen.fonmemgrpsendatdeb, 'YYYY-MM-DD')`.as("date_debut"),
|
|
239
239
|
sql `to_char(fonmemgrpsen.fonmemgrpsendatfin, 'YYYY-MM-DD')`.as("date_fin"),
|
|
240
240
|
sql `coalesce(
|
|
241
|
-
nullif(
|
|
242
|
-
nullif(
|
|
243
|
-
nullif(
|
|
241
|
+
nullif(trim(fongrpsen.fongrpsenlib), ''),
|
|
242
|
+
nullif(trim(fongrpsen.fongrpsenlil), ''),
|
|
243
|
+
nullif(trim(fongrpsen.fongrpsenlic), ''))`.as("libelle"),
|
|
244
244
|
"fonmemgrpsen.fonmemgrpsendatdeb as order_date",
|
|
245
245
|
])
|
|
246
246
|
.whereRef("fonmemgrpsen.memgrpsenid", "=", "memgrpsen.memgrpsenid")
|