Resolve "Absence user: add end date"

src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts

@@ -37,8 +37,13 @@ export const ISOToDate = (str: string | null): Date | null => {
         return null;
     }
 
-    const [year, month, day] = str.split("-").map((p) => parseInt(p));
+    // If the string already contains time info, use it directly
+    if (str.includes("T") || str.includes(" ")) {
+        return new Date(str);
+    }
 
+    // Otherwise, parse date only
+    const [year, month, day] = str.split("-").map((p) => parseInt(p));
     return new Date(year, month - 1, day, 0, 0, 0, 0);
 };
 
@@ -69,20 +74,19 @@ export const ISOToDatetime = (str: string | null): Date | null => {
  *
  */
 export const datetimeToISO = (date: Date): string => {
-    let cal, time, offset;
-    cal = [
+    const cal = [
         date.getFullYear(),
         (date.getMonth() + 1).toString().padStart(2, "0"),
         date.getDate().toString().padStart(2, "0"),
     ].join("-");
 
-    time = [
+    const time = [
         date.getHours().toString().padStart(2, "0"),
         date.getMinutes().toString().padStart(2, "0"),
         date.getSeconds().toString().padStart(2, "0"),
     ].join(":");
 
-    offset = [
+    const offset = [
         date.getTimezoneOffset() <= 0 ? "+" : "-",
         Math.abs(Math.floor(date.getTimezoneOffset() / 60))
             .toString()

src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig

@@ -8,36 +8,36 @@
 
     <div class="col-md-10">
         <h2>{{ 'absence.My absence'|trans }}</h2>
+        <div>
+            {% if user.absenceStart is not null %}
+                <div class="alert alert-success flash_message">{{ 'absence.You are listed as absent, as of {date, date, short}'|trans({
+                        date: user.absenceStart
+                    }) }}
+                    {% if user.absenceEnd is not null %}
+                   {{ 'until %date%'|trans({'%date%': user.absenceEnd|format_date('short') }) }}
+                {% endif %}
+                </div>
+            {% else %}
+                <div class="alert alert-warning flash_message">{{ 'absence.No absence listed'|trans }}</div>
+            {% endif %}
+        </div>
+        <div>
+            {{ form_start(form) }}
+            {{ form_row(form.absenceStart) }}
+            {{ form_row(form.absenceEnd) }}
 
-        {% if user.absenceStart is not null %}
-            <div>
-                <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
-                <ul class="record_actions sticky-form-buttons">
-                    <li>
-                        <a href="{{ path('chill_main_user_absence_unset') }}"
-                           class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
-                    </li>
-                </ul>
-            </div>
-        {% else %}
-            <div>
-                <p class="chill-no-data-statement">{{ 'absence.No absence listed'|trans }}</p>
-            </div>
-            <div>
-                {{ form_start(form) }}
-                {{ form_row(form.absenceStart) }}
-
-                <ul class="record_actions sticky-form-buttons">
-                    <li>
-                        <button class="btn btn-save" type="submit">
-                            {{ 'Save'|trans }}
-                        </button>
-                    </li>
-                </ul>
-
-                {{ form_end(form) }}
-            </div>
-        {% endif %}
+            <ul class="record_actions sticky-form-buttons">
+                <li>
+                    <a class="btn btn-delete" title="Modifier" href="{{ path('chill_main_user_absence_unset') }}">{{ 'absence.Unset absence'|trans }}</a>
+                </li>
+                <li>
+                    <button class="btn btn-save" type="submit">
+                        {{ 'Save'|trans }}
+                    </button>
+                </li>
+            </ul>
+            {{ form_end(form) }}
+        </div>
     </div>
 
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -79,7 +79,7 @@
                             <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
                                 <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
                                 <span class="ms-auto">
-                                    <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
+                                    <a class="btn btn-delete" title="Modifier" href="{{ path('chill_main_user_absence_unset') }}">{{ 'absence.Unset absence'|trans }}</a>
                                 </span>
                             </div>
                         {% endif %}