From 9edb0c95cb6b6e45c870aa348522a449e96beb1d Mon Sep 17 00:00:00 2001
From: Robert Czechowski <robert+git@czecho.de>
Date: Fri, 13 Nov 2020 15:13:01 +0100
Subject: [PATCH] Oauth school selector: Allow to chose 'no school' in school
 selector in order to allow to retreive old data

---
 src/webfw_iron.rs                         |  7 +++++--
 templates/jwinf/oauth_school_selector.hbs | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/webfw_iron.rs b/src/webfw_iron.rs
index 9e5bac9..82e9eef 100644
--- a/src/webfw_iron.rs
+++ b/src/webfw_iron.rs
@@ -1221,12 +1221,15 @@ fn oauth_pms(req: &mut Request, oauth_provider: OauthProvider, school_id: Option
     if let Some(SchoolIdOrSchoolIds::SchoolIds(school_ids)) = user_data.schoolId {
         // Has there been a school selected?
         if let Some(school_id) = school_id {
+            if school_id == "none" {
+                // Nothing to do
+            }
             // Is the school a valid school for the user?
-            if school_ids.contains(&school_id) {
+            else if school_ids.contains(&school_id) {
                 if let Some(mut user_id) = user_data.userId {
                     user_id.push('/');
                     user_id.push_str(&school_id);
-                    user_data.userId = Some(user_id)
+                    user_data.userId = Some(user_id);
                 }
             } else {
                 return e("#40");
diff --git a/templates/jwinf/oauth_school_selector.hbs b/templates/jwinf/oauth_school_selector.hbs
index 7dabcdb..7acb41a 100644
--- a/templates/jwinf/oauth_school_selector.hbs
+++ b/templates/jwinf/oauth_school_selector.hbs
@@ -8,7 +8,7 @@
       {{#each schools}}
         <li><a href="{{this.0}}?{{../query}}" class="button is-success">{{this.1}}</a><br />&nbsp;</li>
       {{/each}}
-      <ul>
+      </ul>
     </p>
   </div>
 </div>
@@ -18,6 +18,21 @@
   </div>
 </div>
 
+
+<div class="columns" >
+  <div class="column">
+    <h1 class="title is-4">Ohne Schule einloggen</h1>
+    <p>Sie können sich ohne Schule einloggen, um Daten aus dem Wettbewerb 2020 einzusehen.</p>
+    <p>Dies ist nur bis Ende 2020 möglich! Damit ist keine Teilnahme am Jugendwettbewerb Informatik 2021 möglich.</p>
+    <p>&nbsp;</p>
+    <p>
+      <ul>
+        <li><a href="none?{{../query}}" class="button is-danger">Ohne Schule einloggen! Keine Teilnahmen am Jugendwettbewerb Informatik 2021 möglich.</a><br />&nbsp;</li>
+      </ul>
+    </p>
+  </div>
+</div>
+
 {{/inline}}
 {{~> (parent)~}}
 
-- 
GitLab