Skip to content

Commit 880933f

Browse files
committed
Fixes
1 parent 50ca6a3 commit 880933f

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

landolfio/inventory_frontend/templates/detail.html

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,7 @@ <h5 class="card-title">{% translate "Divested" %}</h5>
756756
<form method="post" action="{% url 'inventory_frontend:dispose_moneybird' asset.pk %}" class="d-inline" id="disposeForm">
757757
{% csrf_token %}
758758
<input type="hidden" name="disposal_reason" id="disposalReasonInput" value="">
759+
<input type="hidden" name="disposal_date" id="disposalDateFormInput" value="">
759760
<button type="submit" class="btn btn-warning" id="confirmDisposeBtn" disabled>
760761
<i class="fas fa-trash-alt me-2"></i>{% translate "Confirm Disposal" %}
761762
</button>
@@ -822,7 +823,16 @@ <h5 class="card-title">{% translate "Divested" %}</h5>
822823
if (disposalDateInput) {
823824
disposalDateInput.addEventListener('change', checkFormValidity);
824825
}
825-
826+
827+
// Copy date to form when submitting
828+
const disposeForm = document.getElementById('disposeForm');
829+
const disposalDateFormInput = document.getElementById('disposalDateFormInput');
830+
if (disposeForm && disposalDateFormInput) {
831+
disposeForm.addEventListener('submit', function(e) {
832+
disposalDateFormInput.value = disposalDateInput.value;
833+
});
834+
}
835+
826836
// Reset selection when modal is closed
827837
const disposeModal = document.getElementById('disposeModal');
828838
if (disposeModal) {
@@ -832,7 +842,7 @@ <h5 class="card-title">{% translate "Divested" %}</h5>
832842
disposalDateInput.value = '';
833843
confirmBtn.disabled = true;
834844
});
835-
845+
836846
// Set default date to today when modal opens
837847
disposeModal.addEventListener('shown.bs.modal', function() {
838848
if (!disposalDateInput.value) {

landolfio/inventory_frontend/views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ def get_queryset(self):
202202
queryset = queryset.filter(
203203
Q(name__icontains=search_query.strip())
204204
| Q(category__name__icontains=search_query.strip())
205+
| Q(remarks__remark__icontains=search_query.strip())
206+
| Q(tickets__description__icontains=search_query.strip())
207+
| Q(tickets__contact__first_name__icontains=search_query.strip())
208+
| Q(tickets__contact__last_name__icontains=search_query.strip())
205209
)
206210

207211
if categories:

0 commit comments

Comments
 (0)