From 198ac6897d0531722c62c78f3aadcdb5448e4a0f Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Tue, 2 Sep 2025 17:11:15 +0530
Subject: [PATCH] [FIX] EMPLOYEE: #905

---
 employee/models.py                    |  4 +---
 employee/templates/tabs/add_note.html | 34 ++++++++++++++++++---------
 employee/templates/tabs/note_tab.html |  3 +--
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/employee/models.py b/employee/models.py
index ed518801e..271f60039 100644
--- a/employee/models.py
+++ b/employee/models.py
@@ -790,9 +790,7 @@ class EmployeeNote(HorillaModel):
         on_delete=models.CASCADE,
         related_name="employee_name",
     )
-    description = models.TextField(
-        verbose_name=_("Description"), max_length=255, null=True
-    )
+    description = models.TextField(verbose_name=_("Description"), null=True)  # 905
     note_files = models.ManyToManyField(NoteFiles, blank=True)
     updated_by = models.ForeignKey(Employee, on_delete=models.CASCADE)
     objects = HorillaCompanyManager(
diff --git a/employee/templates/tabs/add_note.html b/employee/templates/tabs/add_note.html
index 40944d196..73bf017fa 100644
--- a/employee/templates/tabs/add_note.html
+++ b/employee/templates/tabs/add_note.html
@@ -1,13 +1,25 @@
 {% load i18n %}
-<form class='oh-general__tab-target oh-profile-section'>
-  {{note_form.as_p}}
-  <div class="d-flex flex-row-reverse">
-    <button
-    class="oh-btn oh-btn--secondary pr-4 pl-4"
-    hx-post="{% url 'add-employee-note-post' %}"
-    hx-target='#remark-content'
-    >
-    {% trans "Add" %}
-  </button>
-  </div>
+{% load basefilters %}
+
+<form hx-target="#note_target" hx-post="{% url 'add-employee-note' employee.id %}" id="commentForm">
+    {% csrf_token %}
+    <div>
+        <div class="mt-4">
+            <span class="oh-activity-sidebar__title fw-bold">{{employee}}'s {% trans "Notes" %}</span>
+            {% if perms.employee.add_employeenote or request.user|is_reportingmanager %}
+                {% if form.description.errors %}
+                    {{ form.description.errors }}
+                {% endif %}
+                <input type="text" hx-on:keyup="toggleCommentButton(this);" name="description" id="commentInput"
+                    class="oh-input w-100 mt-2" placeholder="{% trans 'Add notes' %}"
+                    value="{{ form.description.value|default:'' }}"
+                >
+            {% endif %}
+        </div>
+        <button type="submit" id="commentButton" class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
+            {% if not form.description.value %}style="display: none;"{% endif %}>
+            {% trans "Add" %}
+        </button>
+    </div>
+    <div class="oh-inner-sidebar-content__footer"></div>
 </form>
diff --git a/employee/templates/tabs/note_tab.html b/employee/templates/tabs/note_tab.html
index 4be186cc2..a90018e73 100644
--- a/employee/templates/tabs/note_tab.html
+++ b/employee/templates/tabs/note_tab.html
@@ -135,8 +135,7 @@
     </ol>
 {% else %}
     <div class="mt-4">
-        <form hx-target="#note_target" hx-post="{% url 'add-employee-note' employee.id %}"
-            hx-on:change="console.log('test');" id="commentForm">
+        <form hx-target="#note_target" hx-post="{% url 'add-employee-note' employee.id %}" id="commentForm">
             {% csrf_token %}
             <div>
                 <div class="mt-4">