diff --git a/FusionIIIT/applications/globals/migrations/0015_auto_20240315_2100.py b/FusionIIIT/applications/globals/migrations/0015_auto_20240315_2100.py
new file mode 100644
index 000000000..223656449
--- /dev/null
+++ b/FusionIIIT/applications/globals/migrations/0015_auto_20240315_2100.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-03-15 21:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0014_auto_20240312_1930'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
+        ),
+    ]
diff --git a/FusionIIIT/applications/globals/migrations/0019_merge_20240315_2153.py b/FusionIIIT/applications/globals/migrations/0019_merge_20240315_2153.py
new file mode 100644
index 000000000..742ec09cd
--- /dev/null
+++ b/FusionIIIT/applications/globals/migrations/0019_merge_20240315_2153.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.5 on 2024-03-15 21:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0015_auto_20240315_2100'),
+        ('globals', '0018_merge_20240315_1500'),
+    ]
+
+    operations = [
+    ]
diff --git a/FusionIIIT/applications/globals/migrations/0020_auto_20240315_2158.py b/FusionIIIT/applications/globals/migrations/0020_auto_20240315_2158.py
new file mode 100644
index 000000000..d7d37f5d2
--- /dev/null
+++ b/FusionIIIT/applications/globals/migrations/0020_auto_20240315_2158.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-03-15 21:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0019_merge_20240315_2153'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50),
+        ),
+    ]
diff --git a/FusionIIIT/applications/hostel_management/migrations/0016_hostelleave_remark.py b/FusionIIIT/applications/hostel_management/migrations/0016_hostelleave_remark.py
new file mode 100644
index 000000000..402af32bf
--- /dev/null
+++ b/FusionIIIT/applications/hostel_management/migrations/0016_hostelleave_remark.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-03-15 21:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hostel_management', '0015_merge_20240220_1917'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hostelleave',
+            name='remark',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/FusionIIIT/applications/hostel_management/migrations/0019_merge_20240315_2153.py b/FusionIIIT/applications/hostel_management/migrations/0019_merge_20240315_2153.py
new file mode 100644
index 000000000..8beebe6f8
--- /dev/null
+++ b/FusionIIIT/applications/hostel_management/migrations/0019_merge_20240315_2153.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.5 on 2024-03-15 21:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hostel_management', '0018_hostelhistory'),
+        ('hostel_management', '0016_hostelleave_remark'),
+    ]
+
+    operations = [
+    ]
diff --git a/FusionIIIT/applications/hostel_management/models.py b/FusionIIIT/applications/hostel_management/models.py
index df18d5959..1108f573a 100644
--- a/FusionIIIT/applications/hostel_management/models.py
+++ b/FusionIIIT/applications/hostel_management/models.py
@@ -257,6 +257,7 @@ class HostelLeave(models.Model):
     start_date = models.DateField(default=timezone.now)
     end_date = models.DateField()
     status = models.CharField(max_length=20, default='pending')
+    remark = models.TextField(blank=True, null=True)
 
 
     def __str__(self):
diff --git a/FusionIIIT/applications/hostel_management/views.py b/FusionIIIT/applications/hostel_management/views.py
index 48fe23805..74a366749 100644
--- a/FusionIIIT/applications/hostel_management/views.py
+++ b/FusionIIIT/applications/hostel_management/views.py
@@ -706,6 +706,7 @@ def create_hostel_leave(request):
         reason = data.get('reason')
         start_date = data.get('start_date', timezone.now())
         end_date = data.get('end_date')
+        
 
         # Create HostelLeave object and save to the database
         leave = HostelLeave.objects.create(
@@ -713,7 +714,8 @@ def create_hostel_leave(request):
             roll_num=roll_num,
             reason=reason,
             start_date=start_date,
-            end_date=end_date
+            end_date=end_date,
+            
         )
 
         return JsonResponse({'message': 'HostelLeave created successfully'}, status=status.HTTP_201_CREATED)
@@ -1597,8 +1599,9 @@ def update_leave_status(request):
         try:
             leave = HostelLeave.objects.get(id=leave_id)
             leave.status = status
+            leave.remark = request.POST.get('remark')
             leave.save()
-            return JsonResponse({'status': status, 'message': 'Leave status updated successfully.'})
+            return JsonResponse({'status': status,'remarks':leave.remark,'message': 'Leave status updated successfully.'})
         except HostelLeave.DoesNotExist:
             return JsonResponse({'status': 'error', 'message': 'Leave not found.'}, status=404)
     else:
diff --git a/FusionIIIT/templates/hostelmanagement/all_leave_data.html b/FusionIIIT/templates/hostelmanagement/all_leave_data.html
index 486896342..485a5f912 100644
--- a/FusionIIIT/templates/hostelmanagement/all_leave_data.html
+++ b/FusionIIIT/templates/hostelmanagement/all_leave_data.html
@@ -1,6 +1,6 @@
 {% block leave_requests %}
-    <h2 align="center">All Leave Requests</h2>
-    <div class="textLoader" style="max-height: 64vh; overflow-y: auto; overflow-x: auto;">
+<h2 align="center">All Leave Requests</h2>
+<div class="textLoader" style="max-height: 64vh; overflow-y: auto; overflow-x: auto;">
     <table border="1" class="ui table">
         <thead>
             <tr>
@@ -11,11 +11,11 @@ <h2 align="center">All Leave Requests</h2>
                 <th>End Date</th>
                 <th>Status</th>
                 <th>Actions</th>
+                <th>Remark</th>
             </tr>
         </thead>
         <tbody>
             {% for leave in all_leaves %}
-            <!-- {% if leave.status != 'Rejected' %} -->
             <tr>
                 <td>{{ leave.student_name }}</td>
                 <td>{{ leave.roll_num }}</td>
@@ -23,58 +23,91 @@ <h2 align="center">All Leave Requests</h2>
                 <td>{{ leave.start_date }}</td>
                 <td>{{ leave.end_date }}</td>
                 <td>{{ leave.status }}</td>
-                <td class="flex-container">
+                
+                <td class="">
+
+                    <!-- {%if leave.status == 'pending' %} -->
                     <form class="status-form">
+
                         {% csrf_token %}
                         <input type="hidden" name="leave_id" value="{{ leave.id }}">
                         <input type="hidden" name="status" value="Approved">
+                        {%if leave.status == 'pending' %}
                         <button type="button" class="ui status-update positive button mini">Approve</button>
+                        {%endif%}
                     </form>
                     <form class="status-form">
                         {% csrf_token %}
                         <input type="hidden" name="leave_id" value="{{ leave.id }}">
                         <input type="hidden" name="status" value="Rejected">
-                        <button type="button" style="margin-top: 10px;" class="ui status-update negative button tiny">Reject</button>
+                        <textarea name="remark" placeholder="Enter Remark" style="display: none;" required></textarea>
+                        <button type="button" style="margin-top: 10px;"
+                            class="ui status-update negative button tiny reject-button">Reject</button>
                     </form>
+                    <!-- {%else%}
+                        <p>to be hidden</p>
+                    {%endif%} -->
+
+
                 </td>
+                <td>{{leave.remark}}</td>
             </tr>
-            <!-- {% endif %} -->
             {% endfor %}
         </tbody>
     </table>
-    </div>
-    <style>
-        .flex-container{
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-        }
-    </style>
+</div>
+<style>
+    .flex-container {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+    }
+</style>
+
+<script>
+    $(document).ready(function () {
+        $('.reject-button').click(function () {
+            // Show the remark field when Reject button is clicked
+            $(this).closest('form').find('textarea[name="remark"]').show();
+        });
+
+        $('.status-update').click(function () {
+            var form = $(this).closest('form');
+            var formData = form.serialize();
+            var status = form.find('input[name="status"]').val();
+            if (status === 'Rejected') {
+                var remark = form.find('textarea[name="remark"]').val().trim();
+                if (!remark) {
+                    alert('Please enter a remark to reject the leave.');
+                    return;
+                }
+                // Append remark to formData
+                formData += '&remark=' + encodeURIComponent(remark);
+            }
+
+            // Disable the buttons to prevent multiple submissions
+            form.find('button').prop('disabled', true);
 
-<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> -->
-    <script>
-        $(document).ready(function () {
-            $('.status-update').click(function () {
-                var form = $(this).closest('form');
-                var formData = form.serialize();
-                $.ajax({
-                    type: 'POST',
-                    url: '/hostelmanagement/update_leave_status/',
-                    data: formData,
-                    success: function (response) {
-                        // Update the status cell text
-                        var statusCell = form.closest('tr').find('td:nth-child(6)');
-                        statusCell.text(response.status);
-                        // Show success message
-                        alert('Leave status updated successfully.');
-                    },
-                    error: function (xhr, status, error) {
-                        // Show error message
-                        alert('Error occurred while updating status.');
-                    }
-                });
+            $.ajax({
+                type: 'POST',
+                url: '/hostelmanagement/update_leave_status/',
+                data: formData,
+                success: function (response) {
+                    // Update the status cell text
+                    var statusCell = form.closest('tr').find('td:nth-child(6)');
+                    statusCell.text(response.status);
+                    // Show success message
+                    alert('Leave status updated successfully.');
+                },
+                error: function (xhr, status, error) {
+                    // Show error message
+                    alert('Error occurred while updating status.');
+                    // Re-enable the buttons in case of an error
+                    form.find('button').prop('disabled', false);
+                }
             });
         });
-    </script>
+    });
+</script>
 {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/hostelmanagement/create_leave.html b/FusionIIIT/templates/hostelmanagement/create_leave.html
index 99d4fe7bc..1e989c34d 100644
--- a/FusionIIIT/templates/hostelmanagement/create_leave.html
+++ b/FusionIIIT/templates/hostelmanagement/create_leave.html
@@ -1,65 +1,78 @@
 {% block create_leave %}
-    <h2 class="ui header" align="center">Leave Form</h2>
-    <form id="createLeaveForm" method="POST" action="{% url 'hostelmanagement:create_hostel_leave' %}" class="ui form">
-        {% csrf_token %}
-        <div class="field">
+<h2 class="ui header" align="center">Leave Form</h2>
+<form id="createLeaveForm" method="POST" action="{% url 'hostelmanagement:create_hostel_leave' %}" class="ui form">
+    {% csrf_token %}
+    <div class="field">
         <label for="student_name">Student Name:</label>
-        <input type="text" id="student_name" name="student_name" value="{{ request.user.first_name }} {{ request.user.last_name }}" required readonly><br><br>
-        </div>
-        <div class="field">
+        <input type="text" id="student_name" name="student_name"
+            value="{{ request.user.first_name }} {{ request.user.last_name }}" required readonly><br><br>
+    </div>
+    <div class="field">
         <label for="roll_num">Roll Number:</label>
         <input type="text" id="roll_num" name="roll_num" value="{{ request.user.username}}" required readonly><br><br>
-        </div>
-        <div class="field">
+    </div>
+    <div class="field">
         <label for="reason">Reason:</label>
         <textarea id="reason" name="reason" rows="4" cols="50" required></textarea><br><br>
-        </div>
-        <div class="field">
+    </div>
+    <div class="field">
         <label for="start_date">Start Date:</label>
-        <input type="date" id="start_date" name="start_date" required><br><br>
-        </div>
-        <div class="field">
+        <input type="date" id="start_date" name="start_date" min="" required><br><br>
+    </div>
+    <div class="field">
         <label for="end_date">End Date:</label>
-        <input type="date" id="end_date" name="end_date" required><br><br>
-        </div>
-        <div class="leave-form-btn">
-            <button class="ui primary button" type="submit" id="submitBtn">Submit</button>
-        </div>
-    </form>
-    <script>
-        document.getElementById("createLeaveForm").addEventListener("submit", function (event) {
-            event.preventDefault(); // Prevent default form submission
-            var form = this;
-            var formData = new FormData(form);
+        <input type="date" id="end_date" name="end_date" min="" required><br><br>
+    </div>
+    <div class="leave-form-btn">
+        <button class="ui primary button" type="submit" id="submitBtn">Submit</button>
+    </div>
+</form>
+<script>
 
-            // Send AJAX POST request
-            fetch(form.action, {
-                method: "POST",
-                body: formData,
-                headers: {
-                    'X-CSRFToken': document.querySelector('input[name="csrfmiddlewaretoken"]').value
+
+    // // Get today's date in YYYY-MM-DD format
+    var today = new Date().toISOString().split('T')[0];
+    document.getElementById("start_date").value = "";
+    document.getElementById("end_date").value = "";
+    document.getElementById("start_date").min = today;
+    document.getElementById("start_date").addEventListener("change", function () {
+        document.getElementById("end_date").min = document.getElementById("start_date").value;
+    });
+
+
+    document.getElementById("createLeaveForm").addEventListener("submit", function (event) {
+        event.preventDefault(); // Prevent default form submission
+        var form = this;
+        var formData = new FormData(form);
+
+        // Send AJAX POST request
+        fetch(form.action, {
+            method: "POST",
+            body: formData,
+            headers: {
+                'X-CSRFToken': document.querySelector('input[name="csrfmiddlewaretoken"]').value
+            }
+        })
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('Network response was not ok');
                 }
+                return response.json();
+            })
+            .then(data => {
+                console.log(data);
+                // Handle successful response
+                alert(data.message);
+                // Optionally, reset form fields
+                form.reset();
+                window.location.href = "/hostelmanagement/";
             })
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error('Network response was not ok');
-                    }
-                    return response.json();
-                })
-                .then(data => {
-                    console.log(data);
-                    // Handle successful response
-                    alert(data.message);
-                    // Optionally, reset form fields
-                    form.reset();
-                    window.location.href = "/hostelmanagement/";
-                })
-                .catch(error => {
-                    console.error('There was a problem with the fetch operation:', error);
-                    // Handle error
-                    alert('An error occurred while submitting the form.');
-                });
-        });
+            .catch(error => {
+                console.error('There was a problem with the fetch operation:', error);
+                // Handle error
+                alert('An error occurred while submitting the form.');
+            });
+    });
 
-    </script>
+</script>
 {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/hostelmanagement/my_leaves.html b/FusionIIIT/templates/hostelmanagement/my_leaves.html
index 662050e11..6b12edc2d 100644
--- a/FusionIIIT/templates/hostelmanagement/my_leaves.html
+++ b/FusionIIIT/templates/hostelmanagement/my_leaves.html
@@ -1,6 +1,6 @@
 {% block leave_status %}
-    <h2 align="center">My Leaves</h2>
-    <div class="textLoader" style="max-height: 64vh; overflow-y: auto; overflow-x: auto;">
+<h2 align="center">My Leaves</h2>
+<div class="textLoader" style="max-height: 64vh; overflow-y: auto; overflow-x: auto;">
     <table class="ui table" border="1">
         <thead>
             <tr>
@@ -9,6 +9,7 @@ <h2 align="center">My Leaves</h2>
                 <th>Start Date</th>
                 <th>End Date</th>
                 <th>Status</th>
+                <th>Remark</th> <!-- Add this column for the remark -->
             </tr>
         </thead>
         <tbody>
@@ -22,24 +23,26 @@ <h2 align="center">My Leaves</h2>
                     class="{% if leave.status == 'Approved' %}approved-status{% elif leave.status == 'Rejected' %}rejected-status{% elif leave.status == 'pending' %}pending-status{%endif%}">
                     {{ leave.status }}
                 </td>
+                <td>{{ leave.remark }}</td> <!-- Display the remark here -->
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    </div>
-    <style>
-        /* Add this CSS block to your existing stylesheet or in a separate style tag */
-        /* Adjust the selector as needed based on your HTML structure */
-        .approved-status {
-            background-color: rgb(16, 244, 16);
-        }
-    
-        .rejected-status {
-            background-color: red;
-            color: white;
-        }
-        .pending-status {
-            background-color: yellow;
-        }
-    </style>
-{% endblock %}
+</div>
+<style>
+    /* Add this CSS block to your existing stylesheet or in a separate style tag */
+    /* Adjust the selector as needed based on your HTML structure */
+    .approved-status {
+        background-color: rgb(16, 244, 16);
+    }
+
+    .rejected-status {
+        background-color: red;
+        color: white;
+    }
+
+    .pending-status {
+        background-color: yellow;
+    }
+</style>
+{% endblock %}
\ No newline at end of file