@tricoteuses/senat 1.1.1 → 1.3.1

package/lib/src/scripts/retrieve_senateurs_photos.js

@@ -0,0 +1,147 @@
+import assert from "assert";
+import { execSync } from "child_process";
+import commandLineArgs from "command-line-args";
+import fs from "fs-extra";
+// import fetch from "node-fetch"
+import path from "path";
+// import stream from "stream"
+// import util from "util"
+import { findActif as findActifSenateurs } from "../model/sens";
+import { slugify } from "../strings";
+import { commonOptions } from "./shared/cli_helpers";
+const optionsDefinitions = [
+    ...commonOptions,
+    {
+        alias: "f",
+        help: "fetch sénateurs' pictures instead of retrieving them from files",
+        name: "fetch",
+        type: Boolean,
+    },
+];
+const options = commandLineArgs(optionsDefinitions);
+// const pipeline = util.promisify(stream.pipeline)
+async function retrievePhotosSenateurs() {
+    const dataDir = options.dataDir;
+    assert(dataDir, "Missing argument: data directory");
+    const photosDir = path.join(dataDir, "photos_senateurs");
+    const missingPhotoFilePath = path.resolve(__dirname, "images", "transparent_155x225.jpg");
+    const sens = await Array.fromAsync(findActifSenateurs());
+    // Download photos.
+    fs.ensureDirSync(photosDir);
+    if (options.fetch) {
+        for (const sen of sens) {
+            const photoStem = `${slugify(sen.sennomuse, "_")}_${slugify(sen.senprenomuse, "_")}${slugify(sen.senmat, "_")}`;
+            const photoFilename = photoStem + ".jpg";
+            const photoFilePath = path.join(photosDir, photoFilename);
+            const photoTempFilename = photoStem + "_temp.jpg";
+            const photoTempFilePath = path.join(photosDir, photoTempFilename);
+            const urlPhoto = `https://www.senat.fr/senimg/${photoFilename}`;
+            if (!options.silent) {
+                console.log(`Loading photo ${urlPhoto} for ${sen.senprenomuse} ${sen.sennomuse}…`);
+            }
+            // Fetch fails with OpenSSL error: dh key too small.
+            // (so does "curl").
+            // for (let retries = 0; retries < 3; retries++) {
+            //   const response = await fetch(urlPhoto)
+            //   if (response.ok) {
+            //     await pipeline(response.body, fs.createWriteStream(photoTempFilePath))
+            //     fs.renameSync(photoTempFilePath, photoFilePath)
+            //     break
+            //   }
+            //   if (retries >= 2) {
+            //     console.warn(`Fetch failed: ${urlPhoto} (${sen.senprenomuse} ${sen.sennomuse})`)
+            //     console.warn(response.status, response.statusText)
+            //     console.warn(await response.text())
+            //     if (fs.existsSync(photoFilePath)) {
+            //       console.warn("  => Reusing existing image")
+            //     } else {
+            //       console.warn("  => Using blank image")
+            //       fs.copyFileSync(missingPhotoFilePath, photoFilePath)
+            //     }
+            //     break
+            //   }
+            // }
+            try {
+                execSync(`wget --quiet -O ${photoTempFilename} ${urlPhoto}`, {
+                    cwd: photosDir,
+                    env: process.env,
+                    encoding: "utf-8",
+                    // stdio: ["ignore", "ignore", "pipe"],
+                });
+                fs.renameSync(photoTempFilePath, photoFilePath);
+            }
+            catch (error) {
+                if (typeof error === "object" && error && "status" in error && error.status === 8) {
+                    console.error(`Unable to load photo for ${sen.senprenomuse} ${sen.sennomuse}`);
+                    continue;
+                }
+                throw error;
+            }
+        }
+    }
+    // Resize photos to 155x225, because some haven't exactly this size.
+    for (const sen of sens) {
+        const photoStem = `${slugify(sen.sennomuse, "_")}_${slugify(sen.senprenomuse, "_")}${slugify(sen.senmat, "_")}`;
+        const photoFilename = photoStem + ".jpg";
+        const photoFilePath = path.join(photosDir, photoFilename);
+        if (fs.existsSync(photoFilePath)) {
+            if (!options.silent) {
+                console.log(`Resizing photo ${photoStem} for ${sen.senprenomuse} ${sen.sennomuse}…`);
+            }
+            execSync(`gm convert -resize 155x225! ${photoStem}.jpg ${photoStem}_155x225.jpg`, {
+                cwd: photosDir,
+            });
+        }
+        else {
+            if (!options.silent) {
+                console.warn(`Missing photo for ${sen.senprenomuse} ${sen.sennomuse}: using blank image`);
+            }
+            fs.copyFileSync(missingPhotoFilePath, path.join(photosDir, `${photoStem}_155x225.jpg`));
+        }
+    }
+    // Create a mosaic of photos.
+    if (!options.silent) {
+        console.log("Creating mosaic of photos…");
+    }
+    const photoBySenmat = {};
+    const rowsFilenames = [];
+    for (let senIndex = 0, rowIndex = 0; senIndex < sens.length; senIndex += 25, rowIndex++) {
+        const row = sens.slice(senIndex, senIndex + 25);
+        const photosFilenames = [];
+        for (const [columnIndex, sen] of row.entries()) {
+            const photoStem = `${slugify(sen.sennomuse, "_")}_${slugify(sen.senprenomuse, "_")}${slugify(sen.senmat, "_")}`;
+            const photoFilename = `${photoStem}_155x225.jpg`;
+            photosFilenames.push(photoFilename);
+            photoBySenmat[sen.senmat] = {
+                chemin: `photos_senateurs/${photoFilename}`,
+                cheminMosaique: "photos_senateurs/senateurs.jpg",
+                hauteur: 225,
+                largeur: 155,
+                xMosaique: columnIndex * 155,
+                yMosaique: rowIndex * 225,
+            };
+        }
+        const rowFilename = `row-${rowIndex}.jpg`;
+        execSync(`gm convert ${photosFilenames.join(" ")} +append ${rowFilename}`, {
+            cwd: photosDir,
+        });
+        rowsFilenames.push(rowFilename);
+    }
+    execSync(`gm convert ${rowsFilenames.join(" ")} -append senateurs.jpg`, {
+        cwd: photosDir,
+    });
+    for (const rowFilename of rowsFilenames) {
+        fs.unlinkSync(path.join(photosDir, rowFilename));
+    }
+    if (!options.silent) {
+        console.log("Creating JSON file containing informations on all pictures…");
+    }
+    const jsonFilePath = path.join(photosDir, "senateurs.json");
+    fs.writeFileSync(jsonFilePath, JSON.stringify(photoBySenmat, null, 2));
+}
+retrievePhotosSenateurs()
+    .then(() => process.exit(0))
+    .catch((error) => {
+    console.log(error);
+    process.exit(1);
+});

package/lib/src/scripts/shared/cli_helpers.d.ts

@@ -0,0 +1,44 @@
+export declare const categoriesOption: {
+    alias: string;
+    defaultValue: string[];
+    help: string;
+    multiple: boolean;
+    name: string;
+    type: StringConstructor;
+};
+export declare const dataDirDefaultOption: {
+    defaultOption: boolean;
+    help: string;
+    name: string;
+    type: StringConstructor;
+};
+export declare const silentOption: {
+    alias: string;
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+};
+export declare const verboseOption: {
+    alias: string;
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+};
+export declare const commonOptions: ({
+    alias: string;
+    defaultValue: string[];
+    help: string;
+    multiple: boolean;
+    name: string;
+    type: StringConstructor;
+} | {
+    defaultOption: boolean;
+    help: string;
+    name: string;
+    type: StringConstructor;
+} | {
+    alias: string;
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+})[];

package/lib/src/scripts/shared/cli_helpers.js

@@ -0,0 +1,32 @@
+export const categoriesOption = {
+    alias: "k",
+    defaultValue: ["All"],
+    help: "categories of datasets to reorganize",
+    multiple: true,
+    name: "categories",
+    type: String,
+};
+export const dataDirDefaultOption = {
+    defaultOption: true,
+    help: "directory containing Sénat open data files",
+    name: "dataDir",
+    type: String,
+};
+export const silentOption = {
+    alias: "s",
+    help: "don't log anything",
+    name: "silent",
+    type: Boolean,
+};
+export const verboseOption = {
+    alias: "v",
+    help: "verbose logs",
+    name: "verbose",
+    type: Boolean,
+};
+export const commonOptions = [
+    categoriesOption,
+    dataDirDefaultOption,
+    silentOption,
+    verboseOption,
+];

package/lib/src/scripts/shared/util.d.ts

@@ -0,0 +1,3 @@
+export declare function isOptionEmptyOrHasValue(option: string, value: string): boolean;
+export declare function ensureAndClearDir(path: string): void;
+export declare function fetchWithRetry(url: string, retries?: number, backoff?: number): Promise<Response>;

package/lib/src/scripts/shared/util.js

@@ -0,0 +1,28 @@
+import fs from "fs-extra";
+export function isOptionEmptyOrHasValue(option, value) {
+    return !option || option.length === 0 || option.includes(value);
+}
+export function ensureAndClearDir(path) {
+    if (!fs.existsSync(path)) {
+        fs.mkdirSync(path, { recursive: true });
+    }
+    else {
+        fs.emptyDirSync(path);
+    }
+}
+export async function fetchWithRetry(url, retries = 3, backoff = 300) {
+    for (let attempt = 0; attempt < retries; attempt++) {
+        try {
+            return await fetch(url);
+        }
+        catch (error) {
+            if (attempt === retries - 1) {
+                throw error;
+            }
+            console.warn(`Fetch attempt ${attempt + 1} for ${url} failed. Retrying in ${backoff}ms…`);
+            await new Promise((resolve) => setTimeout(resolve, backoff));
+            backoff *= 2;
+        }
+    }
+    throw new Error(`Failed to fetch ${url} after ${retries} attempts`);
+}

package/lib/src/strings.d.ts

@@ -0,0 +1 @@
+export declare function slugify(string: string, replacement?: string): string;

package/lib/src/strings.mjs

@@ -0,0 +1,18 @@
+import originalSlugify from "slug";
+const slugifyCharmap = {
+    ...originalSlugify.defaults.charmap,
+    "'": " ",
+    "@": " ",
+    ".": " ",
+    "-": "_",
+};
+export function slugify(string, replacement) {
+    const options = {
+        charmap: slugifyCharmap,
+        mode: "rfc3986",
+    };
+    if (replacement) {
+        options.replacement = replacement;
+    }
+    return originalSlugify(string, options);
+}

package/lib/src/types/ameli.d.ts

@@ -0,0 +1,10 @@
+import { ses as Ses, sub as Sub, subFields, txt_ameli } from "../raw_types_schemats/ameli";
+export { Ses, Sub };
+export interface TxtAmeli extends txt_ameli {
+    subids?: subFields.id[];
+}
+export declare const sesFieldsToParseInt: string[];
+export declare const sesFieldsToTrim: string[];
+export declare const subFieldsToParseInt: string[];
+export declare const subFieldsToTrim: string[];
+export declare const txtAmeliFieldsToTrim: string[];

package/lib/src/types/ameli.js

@@ -0,0 +1,13 @@
+export const sesFieldsToParseInt = ["ann"];
+export const sesFieldsToTrim = ["lil"];
+export const subFieldsToParseInt = ["pos", "posder", "prires"];
+export const subFieldsToTrim = ["lic", "lib", "sig", "style"];
+export const txtAmeliFieldsToTrim = [
+    "num",
+    "int",
+    "inl",
+    "libdelim",
+    "libcplnat",
+    "doslegsignet",
+    "ordsnddelib",
+];

package/lib/src/types/debats.d.ts

@@ -0,0 +1,4 @@
+import { debats as Debat, lecassdeb as LecAssDeb } from "../raw_types_schemats/debats";
+export { Debat, LecAssDeb };
+export declare const debatsFieldsToTrim: string[];
+export declare const lecassdebFieldsToTrim: string[];

package/lib/src/types/debats.js

@@ -0,0 +1,2 @@
+export const debatsFieldsToTrim = ["deburl", "libspec"];
+export const lecassdebFieldsToTrim = ["lecassidt"];

package/lib/src/types/dosleg.d.ts

@@ -0,0 +1,98 @@
+import { txt_ameliFields } from "../raw_types_schemats/ameli";
+import { ass as Ass, aud, audFields, auteur, date_seance, date_seanceFields as dateSeanceFields, deccoc as DecCoc, denrap as DenRap, docatt, docattFields, ecr, ecrFields, etaloi as EtaLoi, lecass, lecassFields, lecassrap, lecture, lectureFields, loi, org as Org, oritxt as OriTxt, qua as Qua, rap, raporg as RapOrg, raporgFields, scr as Scr, texte, texteFields, typatt as TypAtt, typlec as TypLec, typloi as TypLoi, typtxt as TypTxt, typurl as TypUrl, typurlFields } from "../raw_types_schemats/dosleg";
+import { Debat } from "./debats";
+import { TxtAmeli } from "./ameli";
+export { Ass, DecCoc, DenRap, EtaLoi, Org, OriTxt, Qua, RapOrg, Scr, TypAtt, TypLec, TypLoi, TypTxt, TypUrl, };
+export interface Aud extends aud {
+    org?: Org;
+}
+export interface Auteur extends auteur {
+    qua?: Qua;
+}
+export interface DateSeance extends date_seance {
+    debat?: Debat;
+    scrids?: string[];
+    scrs?: Scr[];
+}
+export interface DocAtt extends docatt {
+    rap?: Rap;
+    typatt?: TypAtt;
+}
+export interface Ecr extends ecr {
+    aut?: Auteur;
+}
+export interface LecAss extends lecass {
+    ass?: Ass;
+    auds?: Aud[];
+    audcles?: audFields.audcle[];
+    datesSeances?: DateSeance[];
+    datesSeancesCodes?: dateSeanceFields.code[];
+    debatdatseas: Date[];
+    lecassraps?: LecAssRap[];
+    lecassrapids?: string[];
+    org?: Org;
+    texcods: texteFields.texcod[];
+    textes?: Texte[];
+}
+export interface LecAssRap extends lecassrap {
+    rap?: Rap;
+}
+export interface Lecture extends lecture {
+    typlec?: TypLec;
+    lecassidts?: lecassFields.lecassidt[];
+    lecasss?: LecAss[];
+}
+export interface Loi extends loi {
+    deccoc?: DecCoc;
+    etaloi?: EtaLoi;
+    lecidts?: lectureFields.lecidt[];
+    lectures?: Lecture[];
+    typloi?: TypLoi;
+}
+export interface Rap extends rap {
+    denrap?: DenRap;
+    docattcles?: docattFields.docattcle[];
+    docatts?: DocAtt[];
+    ecrnums?: ecrFields.ecrnum[];
+    ecrs?: Ecr[];
+    orgcods?: raporgFields.orgcod[];
+    orgs?: Org[];
+}
+export interface Texte extends texte {
+    ecrs?: Ecr[];
+    ecrnums?: ecrFields.ecrnum[];
+    libtypurl?: typurlFields.libtypurl;
+    org?: Org;
+    oritxt: OriTxt;
+    typtxt?: TypTxt;
+    txtAmeli?: TxtAmeli;
+    txtAmeliId: txt_ameliFields.id;
+}
+export declare const assFieldsToTrim: string[];
+export declare const audFieldsToTrim: string[];
+export declare const auteurFieldsToTrim: string[];
+export declare const dateSeanceFieldsToTrim: string[];
+export declare const deccocFieldsToTrim: string[];
+export declare const denrapFieldsToTrim: string[];
+export declare const docattFieldsToParseInt: string[];
+export declare const docattFieldsToTrim: string[];
+export declare const ecrFieldsToTrim: string[];
+export declare const etaloiFieldsToTrim: string[];
+export declare const lecassFieldsToTrim: string[];
+export declare const lecassrapFieldsToTrim: string[];
+export declare const lectureFieldsToTrim: string[];
+export declare const loiFieldsToTrim: string[];
+export declare const orgFieldsToTrim: string[];
+export declare const oritxtFieldsToTrim: string[];
+export declare const quaFieldsToTrim: string[];
+export declare const rapFieldsToParseInt: string[];
+export declare const rapFieldsToTrim: string[];
+export declare const raporgFieldsToTrim: string[];
+export declare const scrFieldsToTrim: string[];
+export declare const texteFieldsToParseInt: string[];
+export declare const texteFieldsToTrim: string[];
+export declare const typattFieldsToTrim: string[];
+export declare const typlecFieldsToTrim: string[];
+export declare const typloiFieldsToTrim: string[];
+export declare const typtxtFieldsToTrim: string[];
+export declare const typurlFieldsToTrim: string[];

package/lib/src/types/dosleg.js

@@ -0,0 +1,151 @@
+export const assFieldsToTrim = ["libass"];
+export const audFieldsToTrim = ["lecassidt", "audtit", "audurl", "orgcod"];
+export const auteurFieldsToTrim = [
+    "autcod",
+    "quacod",
+    "typautcod",
+    "nomuse",
+    "prenom",
+    "nomtec",
+    "autmat",
+    "autfct",
+];
+export const dateSeanceFieldsToTrim = ["lecidt", "statut"];
+export const deccocFieldsToTrim = ["deccoccod", "deccoclib"];
+export const denrapFieldsToTrim = [
+    "coddenrap",
+    "typraprap",
+    "libdenrap",
+    "denrapmin",
+    "denraptit",
+    "denrapstymin",
+    "solnatrapcod",
+];
+export const docattFieldsToParseInt = ["docattcle", "rapcod"];
+export const docattFieldsToTrim = ["docatturl"];
+export const ecrFieldsToTrim = ["autcod", "ecrqua"];
+export const etaloiFieldsToTrim = ["etaloilib"];
+export const lecassFieldsToTrim = [
+    "lecassidt",
+    "lecidt",
+    "ptlurl",
+    "ptlnumcpl",
+    "ptlnot",
+    "ptlurl2",
+    "ptlnot2",
+    "ptlurl3",
+    "ptlnot3",
+    "ptlnumcpl2",
+    "ptlnumcpl3",
+    "lecassame",
+    "orgcod",
+    "loiintmod",
+    "reucom",
+    "debatsurl",
+    "libppr",
+    "ptlurlcom",
+    "aliasppr",
+    "lecassamecom",
+];
+export const lecassrapFieldsToTrim = ["lecassidt"];
+export const lectureFieldsToTrim = ["lecidt", "loicod", "typleccod", "leccom"];
+export const loiFieldsToTrim = [
+    "loicod",
+    "typloicod",
+    "deccoccod",
+    "numero",
+    "loient",
+    "motclef",
+    "loitit",
+    "loiint",
+    "url_jo",
+    "loinumjo",
+    "loititjo",
+    "url_jo2",
+    "loinumjo2",
+    "deccocurl",
+    "num_decision",
+    "loicodmai",
+    "loinoudelibcod",
+    "motionloiorigcod",
+    "url_ordonnance",
+    "saisine_par",
+    "loinumjo3",
+    "url_jo3",
+    "url_an",
+    "url_presart",
+    "signetalt",
+    "orgcod",
+    "doscocurl",
+    "loiintori",
+];
+export const orgFieldsToTrim = [
+    "orgcod",
+    "typorgcod",
+    "orgnom",
+    "orgliblon",
+    "orglibaff",
+    "orgurl",
+    "orglibcou",
+    "org_de",
+    "urltra",
+    "inttra",
+    "orgnomcouv",
+    "senorgcod",
+    "html_color",
+];
+export const oritxtFieldsToTrim = ["oritxtcod", "oritxtlib", "oritxtlibfem"];
+export const quaFieldsToTrim = ["quacod", "qualic", "quaabr", "quaabrplu"];
+export const rapFieldsToParseInt = ["rapcod", "sesann", "rapnum", "rapnuman"];
+export const rapFieldsToTrim = [
+    "coddenrap",
+    "blecod",
+    "raptitcou",
+    "raptil",
+    "rapurl",
+    "url2",
+    "url3",
+    "url4",
+    "url2txt",
+    "url3txt",
+    "url4txt",
+    "prix",
+    "numerobis",
+    "rapsoustit",
+    "rapres",
+    "forpubcod",
+];
+export const raporgFieldsToTrim = ["orgcod"];
+export const scrFieldsToTrim = ["scrint", "soslib"];
+export const texteFieldsToParseInt = ["texcod", "sesann", "texnum"];
+export const texteFieldsToTrim = [
+    "oritxtcod",
+    "typtxtcod",
+    "lecassidt",
+    "orgcod",
+    "texurl",
+    "url2",
+    "url3",
+    "url4",
+    "url2txt",
+    "url3txt",
+    "url4txt",
+    "prix",
+    "numerobis",
+    "reserve_comspe",
+];
+export const typattFieldsToTrim = ["typattlib"];
+export const typlecFieldsToTrim = ["typleccod", "typleclib"];
+export const typloiFieldsToTrim = [
+    "typloicod",
+    "typloilib",
+    "groupe",
+    "typloiden",
+    "typloigen",
+    "typloitit",
+    "typloidenplu",
+    "typloide",
+    "typloiabr",
+];
+export const typtxtFieldsToTrim = ["typtxtcod", "typtxtlib"];
+export const typurlFieldsToTrim = ["libtypurl"];

package/lib/src/types/questions.d.ts

@@ -0,0 +1,2 @@
+import { tam_questions as Question } from "../raw_types_schemats/questions";
+export { Question };

package/lib/src/types/questions.js

@@ -0,0 +1 @@
+export {};

package/lib/src/types/sens.d.ts

@@ -0,0 +1,10 @@
+import { sen as Sen } from "../raw_types_schemats/sens";
+export { Sen };
+export interface Photo {
+    chemin: string;
+    cheminMosaique: string;
+    hauteur: number;
+    largeur: number;
+    xMosaique: number;
+    yMosaique: number;
+}

package/lib/src/types/sens.js

@@ -0,0 +1 @@
+export {};

package/lib/src/types/sessions.d.ts

@@ -0,0 +1,42 @@
+export declare enum Session {
+    "2012-2013" = 2012,
+    "2013-2014" = 2013,
+    "2014-2015" = 2014,
+    "2015-2016" = 2015,
+    "2016-2017" = 2016,
+    "2017-2018" = 2017,
+    "2018-2019" = 2018,
+    "2019-2020" = 2019,
+    "2020-2021" = 2020,
+    "2021-2022" = 2021,
+    "2022-2023" = 2022,
+    "2023-2024" = 2023,
+    "2024-2025" = 2024,
+    "2025-2026" = 2025,
+    "2026-2027" = 2026,
+    "2027-2028" = 2027,
+    "2028-2029" = 2028,
+    "2029-2030" = 2029,
+    "2030-2031" = 2030,
+    "2031-2032" = 2031,
+    "2032-2033" = 2032,
+    "2033-2034" = 2033,
+    "2034-2035" = 2034,
+    "2035-2036" = 2035,
+    "2036-2037" = 2036,
+    "2037-2038" = 2037,
+    "2038-2039" = 2038,
+    "2039-2040" = 2039,
+    "2040-2041" = 2040,
+    "2041-2042" = 2041,
+    "2042-2043" = 2042,
+    "2043-2044" = 2043,
+    "2044-2045" = 2044,
+    "2045-2046" = 2045,
+    "2046-2047" = 2046,
+    "2047-2048" = 2047,
+    "2048-2049" = 2048,
+    "2049-2050" = 2049,
+    "2050-2051" = 2050,
+    "All" = 0
+}

package/lib/src/types/sessions.js

@@ -0,0 +1,43 @@
+export var Session;
+(function (Session) {
+    Session[Session["2012-2013"] = 2012] = "2012-2013";
+    Session[Session["2013-2014"] = 2013] = "2013-2014";
+    Session[Session["2014-2015"] = 2014] = "2014-2015";
+    Session[Session["2015-2016"] = 2015] = "2015-2016";
+    Session[Session["2016-2017"] = 2016] = "2016-2017";
+    Session[Session["2017-2018"] = 2017] = "2017-2018";
+    Session[Session["2018-2019"] = 2018] = "2018-2019";
+    Session[Session["2019-2020"] = 2019] = "2019-2020";
+    Session[Session["2020-2021"] = 2020] = "2020-2021";
+    Session[Session["2021-2022"] = 2021] = "2021-2022";
+    Session[Session["2022-2023"] = 2022] = "2022-2023";
+    Session[Session["2023-2024"] = 2023] = "2023-2024";
+    Session[Session["2024-2025"] = 2024] = "2024-2025";
+    Session[Session["2025-2026"] = 2025] = "2025-2026";
+    Session[Session["2026-2027"] = 2026] = "2026-2027";
+    Session[Session["2027-2028"] = 2027] = "2027-2028";
+    Session[Session["2028-2029"] = 2028] = "2028-2029";
+    Session[Session["2029-2030"] = 2029] = "2029-2030";
+    Session[Session["2030-2031"] = 2030] = "2030-2031";
+    Session[Session["2031-2032"] = 2031] = "2031-2032";
+    Session[Session["2032-2033"] = 2032] = "2032-2033";
+    Session[Session["2033-2034"] = 2033] = "2033-2034";
+    Session[Session["2034-2035"] = 2034] = "2034-2035";
+    Session[Session["2035-2036"] = 2035] = "2035-2036";
+    Session[Session["2036-2037"] = 2036] = "2036-2037";
+    Session[Session["2037-2038"] = 2037] = "2037-2038";
+    Session[Session["2038-2039"] = 2038] = "2038-2039";
+    Session[Session["2039-2040"] = 2039] = "2039-2040";
+    Session[Session["2040-2041"] = 2040] = "2040-2041";
+    Session[Session["2041-2042"] = 2041] = "2041-2042";
+    Session[Session["2042-2043"] = 2042] = "2042-2043";
+    Session[Session["2043-2044"] = 2043] = "2043-2044";
+    Session[Session["2044-2045"] = 2044] = "2044-2045";
+    Session[Session["2045-2046"] = 2045] = "2045-2046";
+    Session[Session["2046-2047"] = 2046] = "2046-2047";
+    Session[Session["2047-2048"] = 2047] = "2047-2048";
+    Session[Session["2048-2049"] = 2048] = "2048-2049";
+    Session[Session["2049-2050"] = 2049] = "2049-2050";
+    Session[Session["2050-2051"] = 2050] = "2050-2051";
+    Session[Session["All"] = 0] = "All";
+})(Session || (Session = {}));