From bb7d072cc8af6b83574c10de87f6dfe3a7b7e80f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 11:10:17 +0100
Subject: [PATCH] FIX [render] use isAbsent method to render user as absent or
 not + place homepage msg above searchbar

---
 src/Bundle/ChillMainBundle/Entity/User.php                   | 2 +-
 .../ChillMainBundle/Resources/views/Entity/user.html.twig    | 2 +-
 .../ChillMainBundle/Resources/views/Homepage/index.html.twig | 5 -----
 src/Bundle/ChillMainBundle/Resources/views/layout.html.twig  | 5 +++++
 src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 43a63c52d..24e88e7ba 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -304,7 +304,7 @@ class User implements UserInterface
 
     public function isAbsent(): bool
     {
-        return null !== $this->getAbsenceStart() ? true : false;
+        return (null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now')) ? true : false;
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 779be6740..6d6e095d5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -6,7 +6,7 @@
     {%- if opts['main_scope'] and user.mainScope is not null %}
     <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
     {%- endif -%}
-    {%- if opts['absence'] and user.absenceStart is not null %}
+    {%- if opts['absence'] and user.isAbsent %}
         {%- if date(user.absenceStart) < date() %}
             <span class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
               <i class="fa fa-circle fa-stack-1x text-danger"></i>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
index 60f6c88ff..98af21171 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -1,10 +1,5 @@
 <div class="col-10 mt-5">
-
     {# vue component #}
-    {% if app.user.absenceStart is not null and date(app.user.absenceStart) < date() %}
-        <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
-    {% endif %}
-
     <div id="homepage_widget"></div>
 
     {% include '@ChillMain/Homepage/fast_actions.html.twig' %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 319adad81..9b4007266 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -69,6 +69,11 @@
 
                 {% block content %}
                     <div class="col-8 main_search">
+                        {% if app.user.isAbsent %}
+                            <div class="row mb-5">
+                                <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
+                            </div>
+                        {% endif %}
                         <h2>{{ 'Search'|trans }}</h2>
 
                         <form action="{{ path('chill_main_search') }}" method="get">
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 2cef950d5..4f24808d4 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -71,7 +71,7 @@ class UserRender implements ChillEntityRenderInterface
 
         $current_date = new DateTimeImmutable();
 
-        if (null !== $entity->getAbsenceStart() && $entity->getAbsenceStart() < $current_date && $opts['main_scope']) {
+        if ($entity->isAbsent() && $opts['main_scope']) {
             $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
         }