From 3109d92adea4585842e766c3b17ed5eac9912c0a Mon Sep 17 00:00:00 2001
From: Tait Hoyem <tait@tait.tech>
Date: Wed, 19 Apr 2023 16:32:53 -0600
Subject: [PATCH] Add nullable filter

---
 src/filters.rs                 | 6 ++++++
 templates/division_list.html   | 4 ++--
 templates/game_list.html       | 6 +++---
 templates/game_score_page.html | 4 ++--
 templates/league_list.html     | 2 +-
 templates/player_page.html     | 4 ++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/filters.rs b/src/filters.rs
index 1eee67a..3d84195 100644
--- a/src/filters.rs
+++ b/src/filters.rs
@@ -3,3 +3,9 @@ pub fn seconds_as_time(secs: &i32) -> ::askama::Result<String> {
     let seconds = secs % 60;
     Ok(format!("{}:{}", minutes, seconds))
 }
+pub fn nullable<T: std::fmt::Display>(ot: &Option<T>) -> ::askama::Result<String> {
+  match ot {
+    Some(t) => Ok(format!("{}", t)),
+    None => Ok("NULL".to_string())
+  }
+}
diff --git a/templates/division_list.html b/templates/division_list.html
index f84b44a..d6d402a 100644
--- a/templates/division_list.html
+++ b/templates/division_list.html
@@ -3,10 +3,10 @@
 {% block title %}Divisions{% endblock %}
 
 {% block content %}
-<h1 id="first-heading">Divisions for the {{ league.name }}</h1>
+<h1 id="first-heading">Divisions for the {{ league.name.clone().unwrap_or("???".to_string()) }}</h1>
 <ul aria-labelledby="first-heading">
   {% for division in divisions %}
-    <li><a href="/{{ lang }}/division/{{ division.id }}/">{{ division.name }}</a></li>
+    <li><a href="/{{ lang }}/division/{{ division.id }}/">{{ division.name.clone().unwrap_or("???".to_string()) }}</a></li>
   {% endfor %}
 </ul>
 {% endblock %}
diff --git a/templates/game_list.html b/templates/game_list.html
index c8e0fe3..248d055 100644
--- a/templates/game_list.html
+++ b/templates/game_list.html
@@ -1,16 +1,16 @@
 {% extends "master.html" %}
 
-{% block title %}Games for {{ division.name }}{% endblock %}
+{% block title %}Games for {{ division.name.clone().unwrap_or("???".to_string()) }}{% endblock %}
 
 {% block content %}
-	<h1>Division: {{ division.name }}</h1>
+	<h1>Division: {{ division.name|nullable }}</h1>
 	{% if games.len() > 0 %}
 	<h2 id="iihf_points">Points</h2>
 	{{ iihf_team_stats_table|safe }}
 	<h2 id="games">Games</h2>
 	<ol aria-labelledby="games">
 		{% for game in games %}
-			<li><a href="{{ localize("game_url_tmpl", lang: lang, id: game.id) }}">{{ game.name }}</a></li>
+			<li><a href="{{ localize("game_url_tmpl", lang: lang, id: game.id) }}">{{ game.name|nullable }}</a></li>
 		{% endfor %}
 	</ol>
 	{% else %}
diff --git a/templates/game_score_page.html b/templates/game_score_page.html
index 0037b9e..ed3f3de 100644
--- a/templates/game_score_page.html
+++ b/templates/game_score_page.html
@@ -1,9 +1,9 @@
 {% extends "master.html" %}
 
-{% block title %}{{ game.name }}{% endblock %}
+{% block title %}{{ game.name.clone().unwrap() }}{% endblock %}
 
 {% block content %}
-<h1>{{ localize("game-of-division", game: game.name.clone(), division: division.name.clone()) }}</h1>
+<h1>{{ localize("game-of-division", game: game.name.clone().unwrap(), division: division.name.clone().unwrap()) }}</h1>
 <h2>{{ localize("team") }}</h2>
 {{ team_stats|safe }}
 <h2>{{ localize("individual") }}</h2>
diff --git a/templates/league_list.html b/templates/league_list.html
index a89e571..8da684b 100644
--- a/templates/league_list.html
+++ b/templates/league_list.html
@@ -6,7 +6,7 @@
 <h1 id="leagues">{{ localize("league_ibihf") }}</h1>
 <ol aria-labelledby="leagues">
   {% for league in leagues %}
-    <li><a href="/{{ lang }}/league/{{ league.id }}/">{{ league.name }}</a></li>
+    <li><a href="/{{ lang }}/league/{{ league.id }}/">{{ league.name|nullable }}</a></li>
   {% endfor %}
 </ol>
 {% endblock %}
diff --git a/templates/player_page.html b/templates/player_page.html
index 0a7edc3..5bea5af 100644
--- a/templates/player_page.html
+++ b/templates/player_page.html
@@ -1,8 +1,8 @@
 {% extends "master.html" %}
 
 {% block content %}
-<h1>{{ player.name }}</h1>
-<h2>Latest Competition: {{ league.name }}</h2>
+<h1>{{ player.first_names }}</h1>
+<h2>Latest Competition: {{ league.name|nullable }}</h2>
 <label for="league_points">Points</label>
 <span id="league_points">{{ league_stats.points }}</span>
 <label for="league_goals">Goals</label>