feat(lending): Track and display item condition on return

Author: cp099

inventory/migrations/0014_checkinlog_condition.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-26 07:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0013_userprofile'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='checkinlog',
+            name='condition',
+            field=models.CharField(choices=[('OK', 'OK'), ('DAMAGED', 'Damaged')], default='OK', help_text='The condition of the item upon return.', max_length=10),
+        ),
+    ]

inventory/models.py

@@ -268,12 +268,23 @@ def is_overdue(self):
 
 class CheckInLog(models.Model):
     """A record of a partial or full return for a specific checkout."""
+    class Condition(models.TextChoices):
+        OK = 'OK', 'OK'
+        DAMAGED = 'DAMAGED', 'Damaged'
+
     checkout_log = models.ForeignKey(CheckoutLog, on_delete=models.CASCADE, related_name="check_in_logs")
     quantity_returned = models.PositiveIntegerField()
     return_date = models.DateTimeField(auto_now_add=True)
+    
+    condition = models.CharField(
+        max_length=10, 
+        choices=Condition.choices, 
+        default=Condition.OK,
+        help_text="The condition of the item upon return."
+    )
 
     def __str__(self):
-        return f"{self.quantity_returned} units of {self.checkout_log.item.name} returned on {self.return_date.strftime('%Y-%m-%d')}"
+        return f"{self.quantity_returned} units of {self.checkout_log.item.name} returned on {self.return_date.strftime('%Y-%m-%d')} (Condition: {self.get_condition_display()})"
 
 class ItemLog(models.Model):
     """A permanent record of a change in an item's stock quantity."""

inventory/templates/inventory/check_in_page.html

@@ -22,11 +22,37 @@ <h3>Loan Details</h3>
         <hr style="margin: 2em 0;">
 
         <h3>Process a Return</h3>
-        <form action="{% url 'inventory:process_check_in' log_entry.id %}" method="post">
+        <form action="{% url 'inventory:process_check_in' log_entry.id %}" method="post" class="styled-form">
             {% csrf_token %}
-            <label for="quantity_returned">Quantity to Return:</label>
-            <input type="number" name="quantity_returned" value="{{ quantity_still_on_loan }}" min="1" max="{{ quantity_still_on_loan }}" autofocus required>
-            <button type="submit">Confirm Return</button>
+            
+            <div class="form-field">
+                <label for="id_quantity_returned">Quantity to Return:</label>
+                <input type="number" id="id_quantity_returned" name="quantity_returned" value="{{ quantity_still_on_loan }}" min="1" max="{{ quantity_still_on_loan }}" autofocus required>
+            </div>
+            
+            <div class="form-field">
+                <label>Condition on Return:</label>
+                <div class="radio-group">
+                    <div class="radio-item">
+                        <input type="radio" id="id_condition_ok" name="condition" value="OK" checked>
+                        <label for="id_condition_ok">
+                            <i class="fas fa-check-circle text-success"></i> OK
+                        </label>
+                    </div>
+                    <div class="radio-item">
+                        <input type="radio" id="id_condition_damaged" name="condition" value="DAMAGED">
+                        <label for="id_condition_damaged">
+                            <i class="fas fa-times-circle text-danger"></i> Damaged
+                        </label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-actions">
+                <button type="submit" class="btn btn-primary">
+                    <i class="fas fa-undo-alt"></i> Confirm Return
+                </button>
+            </div>
         </form>
     </div>
 {% endblock %}

inventory/templates/inventory/student_detail.html

@@ -45,26 +45,37 @@ <h2>Items Currently on Loan</h2>
             <p>This student has no items currently on loan.</p>
         {% endif %}
 
-        <h2 style="margin-top: 2em;">Full Loan History</h2>
-        {% if loan_history %}
-            <table class="open-table">
-                <thead>
-                    <tr><th>Item</th><th>Quantity</th><th>Checked Out</th><th>Returned On</th></tr>
-                </thead>
-                <tbody>
-                    {% for log in loan_history %}
-                    <tr>
-                        <td><a href="{{ log.item.get_absolute_url }}">{{ log.item.name }}</a></td>
-                        <td>{{ log.quantity }}</td>
-                        <td>{{ log.checkout_date }}</td>
-                        <td>{{ log.return_date }}</td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% else %}
-            <p>This student has not returned any items yet.</p>
-        {% endif %}
+        <h2 style="margin-top: 2em;">Return History</h2>
+            {% if return_history %}
+                <table class="open-table">
+                    <thead>
+                        <tr>
+                            <th>Item</th>
+                            <th>Quantity Returned</th>
+                            <th>Return Date</th>
+                            <th>Condition</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for log in return_history %}
+                        <tr>
+                            <td><a href="{{ log.checkout_log.item.get_absolute_url }}">{{ log.checkout_log.item.name }}</a></td>
+                            <td>{{ log.quantity_returned }}</td>
+                            <td>{{ log.return_date }}</td>
+                            <td>
+                                {% if log.condition == 'OK' %}
+                                    <span class="badge bg-success">{{ log.get_condition_display }}</span>
+                                {% else %}
+                                    <span class="badge bg-danger">{{ log.get_condition_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            {% else %}
+                <p>This student has no return history.</p>
+            {% endif %}
 
         {% if request.user.profile.role == 'ADMIN' %}
             <h2 class="destructive">Delete this student</h2>

inventory/views.py

@@ -472,20 +472,21 @@ def student_list(request):
 @login_required
 def student_detail(request, student_id):
     student = get_object_or_404(Student, id=student_id)
+    
     items_on_loan = CheckoutLog.objects.filter(
         student=student,
         return_date__isnull=True
-    ).order_by('-checkout_date')
+    ).select_related('item').order_by('-checkout_date')
 
-    loan_history = CheckoutLog.objects.filter(
-        student=student,
-        return_date__isnull=False
-    ).order_by('-return_date')
+    # This is the new query: it fetches individual return logs instead of closed loans.
+    return_history = CheckInLog.objects.filter(
+        checkout_log__student=student
+    ).select_related('checkout_log__item').order_by('-return_date')
 
     context = {
         'student': student,
         'items_on_loan': items_on_loan,
-        'loan_history': loan_history,
+        'return_history': return_history, # We now pass the new queryset to the template
     }
     return render(request, 'inventory/student_detail.html', context)
 
@@ -892,30 +893,50 @@ def check_in_page(request, log_id):
 @login_required
 def process_check_in(request, log_id):
     """
-    Handles the logic of a partial or full return.
+    Handles the logic of a partial or full return, including item condition.
+    If an item is returned as 'Damaged', its total quantity in the main
+    inventory is permanently reduced.
     """
     if request.method == 'POST':
         log_entry = get_object_or_404(CheckoutLog, id=log_id, return_date__isnull=True)
 
         try:
             quantity_to_return = int(request.POST.get('quantity_returned', 0))
-            quantity_still_on_loan = log_entry.quantity - log_entry.quantity_returned_so_far
+            return_condition = request.POST.get('condition', CheckInLog.Condition.OK)
+            quantity_still_on_loan = log_entry.quantity_still_on_loan
 
-            if quantity_to_return <= 0:
+            if return_condition not in CheckInLog.Condition.values:
+                messages.error(request, "Invalid return condition specified.")
+            elif quantity_to_return <= 0:
                 messages.error(request, "Quantity to return must be a positive number.")
             elif quantity_to_return > quantity_still_on_loan:
                 messages.error(request, f"Cannot return {quantity_to_return}. Only {quantity_still_on_loan} units are on loan.")
             else:
                 CheckInLog.objects.create(
                     checkout_log=log_entry,
-                    quantity_returned=quantity_to_return
+                    quantity_returned=quantity_to_return,
+                    condition=return_condition
                 )
-
+                
+                if return_condition == CheckInLog.Condition.DAMAGED:
+                    item = log_entry.item
+                    item.quantity -= quantity_to_return
+                    item.save()
+                    
+                    ItemLog.objects.create(
+                        item=item,
+                        user=request.user,
+                        action=ItemLog.Action.DAMAGED,
+                        quantity_change=-quantity_to_return,
+                        notes=f"Reported damaged during return by student {log_entry.student.name}."
+                    )
+                    messages.warning(request, f"{quantity_to_return} x '{item.name}' were marked as damaged and removed from total stock.")
+                
                 log_entry.refresh_from_db()
 
-                messages.success(request, f"Successfully returned {quantity_to_return} x '{log_entry.item.name}'.")
+                messages.success(request, f"Successfully processed return of {quantity_to_return} x '{log_entry.item.name}'.")
 
-                if log_entry.quantity_returned_so_far == log_entry.quantity:
+                if log_entry.quantity_still_on_loan == 0:
                     log_entry.return_date = timezone.now()
                     log_entry.save()
                     messages.info(request, "This loan is now fully returned and closed.")