diff --git a/site-observable/docs/data/movies.csv.py b/site-observable/docs/data/movies.csv.py index 454c837..5460e7d 100755 --- a/site-observable/docs/data/movies.csv.py +++ b/site-observable/docs/data/movies.csv.py @@ -22,18 +22,21 @@ start_date = years_ago.replace(month=1, day=1) # Filter the dataframe based on the start date - df["tally_url"] = df.apply( - lambda row: ( - f"""https://tally.so/r/wQ5Og8""" - f"""?original_title={row["original_title"]}""" - f"""&production_year={row["production_year"]}""" - f"""&production_countries={row["production_countries"]}""" - f"""&genres={row["genres"]}""" - ), - axis=1, - ) + df = df[df["release_date"] >= start_date] + + # Add a column with the production_year based on the release_date + df["production_year"] = df["release_date"].dt.year # Select the columns we want - df = df[["id", "title", "tally_url"]] + df = df[ + [ + "id", + "title", + "original_title", + "production_year", + "production_countries", + "genres", + ] + ] print(df.to_csv(index=False)) diff --git a/site-observable/docs/data/shows.csv.py b/site-observable/docs/data/shows.csv.py index ff8a204..cc4a7c3 100755 --- a/site-observable/docs/data/shows.csv.py +++ b/site-observable/docs/data/shows.csv.py @@ -16,17 +16,7 @@ # Remove adult movies df = df[df["adult"] == False] # noqa: E712 - # Add a column with the tally URL - df["tally_url"] = df.apply( - lambda row: ( - f"""https://tally.so/r/wQ5Og8""" - f"""?original_title={row["original_name"]}""" - f"""&production_countries={row["production_countries"]}""" - ), - axis=1, - ) - # Select the columns we want - df = df[["id", "name", "tally_url"]] + df = df[["id", "name", "original_name", "production_countries"]] print(df.to_csv(index=False)) diff --git a/site-observable/docs/movies.md b/site-observable/docs/movies.md index 78f99b5..0aa51a1 100644 --- a/site-observable/docs/movies.md +++ b/site-observable/docs/movies.md @@ -5,6 +5,7 @@ title: Choix d'un film # Chosir un film ```js +const tallyUrl = "https://tally.so/r/wa6jyb"; const movies = FileAttachment("data/movies.csv").csv({ typed: true }); ``` @@ -32,11 +33,33 @@ import { html } from "npm:htl"; ${results.length} films trouvés: -${results.length > 0 ? results.slice(0,20).forEach((movie) => display(html` -${movie["title"]} -
`)) : display(html`Désolé, ce film n'est pas répertorié dans notre base. Aller au questionnaire`)} +```js +if (results.length > 0) { + results + .slice(0, 20) + .forEach( + ({ + id, + title, + original_title, + production_year, + production_countries, + genres, + }) => { + const url = `${tallyUrl}?id=${id}&original_title=${original_title}&production_year=${production_year}&production_countries=${ + production_countries || "" + }&genres=${genres || ""}`; + display(html`${title}
`); + } + ); +} else { + display( + html`Désolé, ce film n'est pas répertorié dans notre base. + Aller au questionnaire` + ); +} +``` Retour - diff --git a/site-observable/docs/series.md b/site-observable/docs/series.md index 2d8b97e..e97741f 100644 --- a/site-observable/docs/series.md +++ b/site-observable/docs/series.md @@ -5,6 +5,7 @@ title: Choix d'une série télévisée # Choisir une série télévisée ```js +const tallyUrl = "https://tally.so/r/w48jMo"; const shows = FileAttachment("data/shows.csv").csv({ typed: true }); ``` @@ -31,9 +32,23 @@ import { html } from "npm:htl"; ${results.length} séries trouvées: -${results.length > 0 ? results.slice(0, 20).forEach((show) => display(html` -${show["name"]} -
`)) : display(html`Désolé, cette série n'est pas répertoriée dans notre base. Aller au questionnaire`)} +```js +if (results.length > 0) { + results + .slice(0, 20) + .forEach(({ id, name, original_name, production_countries }) => { + const url = `${tallyUrl}?id=${id}&original_name=${original_name}&production_countries=${ + production_countries || "" + }`; + display(html` ${name}
`); + }); +} else { + display( + html`Désolé, cette série n'est pas répertoriée dans notre base. + Aller au questionnaire` + ); +} +```