From bf61b0184b7c7ceb5eb9a1da4050fffc3ce82fc3 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 1 Aug 2023 18:20:08 +0200
Subject: [PATCH] dashboard: Wait for the themes to load before getting the
 events

---
 dashboard/static/index.html      | 4 ++--
 dashboard/static/js/dashboard.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dashboard/static/index.html b/dashboard/static/index.html
index 3de17d3a..53149f0f 100644
--- a/dashboard/static/index.html
+++ b/dashboard/static/index.html
@@ -335,7 +335,7 @@
 	<div id="themesSummary" ng-cloak>
 
 	  <div ng-repeat="(k,s) in display.side" class="repeatedd-item" style="margin-bottom: 7px;">
-	    <div class="card niceborder bg-dark" ng-if="s.type == 'welcome' && !s.params.hide">
+	    <div class="card niceborder bg-dark" ng-if="(s.type == 'welcome' && !s.params.hide || s.type == 'exercice_follow' && !s.params.hide && !lastExercice)">
 	      <div class="card-body text-light text-indent" style="padding: 0.4rem;">
 		<h1 ng-if="!s.params.notitle" class="text-center niceborder">Le {{ challenge.title }}&nbsp;!</h1>
 		<p class="lead text-justify">
@@ -391,7 +391,7 @@
 	      </div>
 	    </div>
 
-	    <div class="card niceborder bg-dark" ng-if="s.type == 'exercice_follow' && !s.params.hide">
+	    <div class="card niceborder bg-dark" ng-if="s.type == 'exercice_follow' && !s.params.hide && lastExercice">
 	      <div class="text-light text-bold text-right" style="position: absolute; z-index: 10; width: 100%; padding: 1rem;">
 		<span style="background: rgba(50,50,50,0.66); padding: 0.2rem 0.4rem; border-radius: 3px; border-bottom-width: 3px;">
 		  Challenges à la une
diff --git a/dashboard/static/js/dashboard.js b/dashboard/static/js/dashboard.js
index 2439e3bf..1047c8ba 100644
--- a/dashboard/static/js/dashboard.js
+++ b/dashboard/static/js/dashboard.js
@@ -43,7 +43,6 @@ angular.module("FICApp", ["ngSanitize", "ngAnimate"])
 		$rootScope.lastExercice = lastExercice;
 	    });
 	}
-	refreshEvents()
 	$interval(refreshEvents, 2100);
     })
     .controller("TimerController", function($scope, $rootScope, $interval, $timeout) {