diff --git a/main/food/scan_views.py b/main/food/scan_views.py index d0e7d0a..891c340 100644 --- a/main/food/scan_views.py +++ b/main/food/scan_views.py @@ -139,20 +139,27 @@ def inventory_review(request): preference = update_review_preference(request.user, request.POST.get('mode')) except ScanWorkflowError as error: return JsonResponse({'error': str(error)}, status=400) - return redirect(f"{reverse('food:inventory-review')}?mode={preference.mode}") + suffix = f"?mode={preference.mode}" + if request.POST.get('state') in ('processing', 'deferred'): + suffix += f"&state={request.POST['state']}" + return redirect(f"{reverse('food:inventory-review')}{suffix}") if request.GET.get('mode') in InventoryReviewPreference.Mode.values: mode = request.GET['mode'] - state = 'processing' if request.GET.get('state') == 'processing' else 'review' + requested_state = request.GET.get('state') or request.POST.get('state') + state = requested_state if requested_state in ('processing', 'deferred') else 'review' statuses = ((InventoryScanItem.Status.QUEUED, InventoryScanItem.Status.PROCESSING) if state == 'processing' else - (InventoryScanItem.Status.NEEDS_REVIEW, InventoryScanItem.Status.DEFERRED, - InventoryScanItem.Status.FAILED)) + (InventoryScanItem.Status.DEFERRED,) if state == 'deferred' else + (InventoryScanItem.Status.NEEDS_REVIEW, InventoryScanItem.Status.FAILED)) items = (InventoryScanItem.objects.filter(batch__run__user=request.user, status__in=statuses) .select_related('location', 'product', 'batch__run').order_by('created_at')) context = {'mode': mode, 'items': items, 'locations': InventoryLocation.objects.filter(user=request.user), 'review_count': items.count(), 'state': state, - 'approved_count': request.GET.get('approved', '')} + 'eligible_bulk_count': items.exclude(product_name='').count(), + 'approved_count': request.GET.get('approved', ''), + 'deferred_count': InventoryScanItem.objects.filter(batch__run__user=request.user, + status=InventoryScanItem.Status.DEFERRED).count()} if request.method == 'POST' and request.POST.get('action') == 'preview': selected_ids = request.POST.getlist('item_ids') selected = list(items.filter(pk__in=selected_ids)) diff --git a/main/food/static/food/food.css b/main/food/static/food/food.css index 0c57ee0..a3cfda6 100644 --- a/main/food/static/food/food.css +++ b/main/food/static/food/food.css @@ -193,4 +193,5 @@ body[data-theme="dark"] .food-tabs a[aria-current=page]{color:#102317} .food-macro .food-ring{--accent:inherit} /* Shared product and entry nutrition forms. */ +.inventory-review-states{display:flex;gap:.5rem;flex-wrap:wrap;margin:.75rem 0}.inventory-review-states a{min-height:42px;align-content:center;padding:.5rem .75rem;border:1px solid #c8d4ca;border-radius:9px;color:#183c2c;text-decoration:none}.inventory-review-states a[aria-current=page]{background:#e9f3ec;border-color:#247452;font-weight:700} .product-form{display:grid;gap:1rem}.product-form .form-field,.entry-nutrition-fields .form-field{display:grid;gap:.3rem}.nutrition-fields{min-width:0;margin:0;padding:1rem;border:1px solid var(--food-border);border-radius:.9rem}.nutrition-fields legend{padding:0 .35rem;font-weight:700}.nutrition-fields p,.entry-nutrition-fields p{margin:.2rem 0 1rem;line-height:1.45;color:var(--food-muted)}.nutrition-fields>details,.entry-nutrition-fields{margin-top:1rem}.nutrition-fields summary,.entry-nutrition-fields summary{cursor:pointer;font-weight:700;min-height:44px;align-content:center}.nutrition-field-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:.85rem}.nutrition-field-grid input{width:100%;min-width:0}.nutrition-fields .form-field{margin-bottom:.8rem}.entry-nutrition-fields{padding:1rem;border:1px solid var(--food-border);border-radius:.9rem}.entry-nutrition-fields .form-field:has(input[type=checkbox]){display:flex;flex-wrap:wrap;align-items:center;gap:.5rem}.entry-nutrition-fields .form-field:has(input[type=checkbox]) small{flex-basis:100%}@media(max-width:520px){.nutrition-field-grid{grid-template-columns:1fr}} diff --git a/main/food/static/food/inventory_review.js b/main/food/static/food/inventory_review.js new file mode 100644 index 0000000..b142a87 --- /dev/null +++ b/main/food/static/food/inventory_review.js @@ -0,0 +1,28 @@ +(() => { + document.querySelectorAll('[data-bulk-review]').forEach((form) => { + const checkboxes = [...form.querySelectorAll('input[name="item_ids"]:not(:disabled)')]; + const preview = form.querySelector('[data-bulk-preview-submit]'); + if (!preview) return; + const status = form.querySelector('[data-review-selection-status]'); + const update = () => { + const selected = checkboxes.filter((checkbox) => checkbox.checked).length; + preview.disabled = selected === 0; + if (status) { + status.hidden = selected === 0; + status.textContent = selected ? `${selected} product${selected === 1 ? '' : 's'} selected for preview.` : ''; + } + }; + checkboxes.forEach((checkbox) => checkbox.addEventListener('change', update)); + form.addEventListener('submit', (event) => { + if (!checkboxes.some((checkbox) => checkbox.checked)) { + event.preventDefault(); + if (status) { + status.hidden = false; + status.textContent = 'Select at least one product with a name before previewing.'; + status.focus?.(); + } + } + }); + update(); + }); +})(); diff --git a/main/food/templates/food/inventory_review.html b/main/food/templates/food/inventory_review.html index a476616..caac7e7 100644 --- a/main/food/templates/food/inventory_review.html +++ b/main/food/templates/food/inventory_review.html @@ -1,9 +1,10 @@ {% extends 'planner/base.html' %}{% load static %} {% block title %}Inventory review · Tasknest{% endblock %} -{% block content %} +{% block content %}
-
← Kitchen inventory

{% if state == 'processing' %}Processing scan items{% else %}Additional Review Required{% endif %}

{{ review_count }} product{{ review_count|pluralize }} {% if state == 'processing' %}are queued or being enriched.{% else %}need review. Fetched and entered information is kept on each staged item.{% endif %}

- {% if state != 'processing' %}
{% csrf_token %}
Processing and review counts
{% endif %} +
← Kitchen inventory

{% if state == 'processing' %}Processing scan items{% elif state == 'deferred' %}Deferred scan items{% else %}Additional Review Required{% endif %}

{{ review_count }} product{{ review_count|pluralize }} {% if state == 'processing' %}are queued or being enriched.{% elif state == 'deferred' %}deferred for later. Fetched and entered information remains saved.{% else %}need review. Fetched and entered information is kept on each staged item.{% endif %}

+ {% if state != 'processing' %}{% endif %} + {% if state != 'processing' %}
{% csrf_token %}
Processing and review counts
{% endif %} {% if approved_count %}

{{ approved_count }} product{{ approved_count|pluralize }} added to inventory.

{% endif %} {% if review_error %}{% endif %} {% if mode == 'individual' or state == 'processing' %} @@ -11,19 +12,19 @@ {% for item in items %}

{{ item.get_status_display }} · {{ item.location.name }}

{{ item.product_name|default:'Product details needed' }}

{{ item.brand }}{% if item.brand %} · {% endif %}Barcode {{ item.barcode }}

{% if item.last_error %}

{{ item.last_error }}

{% endif %}

{{ item.package_count }} package{{ item.package_count|pluralize }}{% if item.package_amount %} · {{ item.package_amount }} {{ item.package_unit }}{% endif %}

{% if state != 'processing' %}Review product{% endif %}
{% empty %}

{% if state == 'processing' %}No items processing{% else %}Nothing needs review{% endif %}

{% if state == 'processing' %}Submitted scan batches will appear here while the worker enriches them.{% else %}Products that could not be matched or need corrections will appear here.{% endif %}

{% endfor %} {% elif state != 'processing' %} -
- {% csrf_token %} -

{% if preview %}Preview selected products{% else %}Select products to review together{% endif %}

+ + {% csrf_token %} +

{% if preview %}Preview selected products{% else %}Select products to review together{% endif %}

{% if preview %}Review the affected rows before adding them to inventory. Individual product fields and nutrition stay unchanged.{% else %}Apply a shared storage location or category, then preview the exact products before approval.{% endif %}

{% if preview %} {% for item in preview_items %}
{{ item.product_name|default:'Product details needed' }}{{ item.barcode }} · {{ item.package_count }} package{{ item.package_count|pluralize }}
{{ shared_location_name|default:item.location.name }}{% if shared_category %} · {{ shared_category }}{% elif item.category_name %} · {{ item.category_name }}{% endif %}
{% endfor %}
Back to selection
{% else %} -
Select staged products{% for item in items %}{% empty %}

No staged products need review.

{% endfor %}
+
Select staged products{% for item in items %}{% empty %}

No staged products need review.

{% endfor %}
- + {% endif %}
{% endif %} -
{% endblock %} +{% endblock %} diff --git a/main/food/templates/food/inventory_review_item.html b/main/food/templates/food/inventory_review_item.html index 2df29f8..076e621 100644 --- a/main/food/templates/food/inventory_review_item.html +++ b/main/food/templates/food/inventory_review_item.html @@ -1,6 +1,6 @@ {% extends 'planner/base.html' %}{% load static %} {% block title %}Review {{ item.product_name|default:'scanned product' }} · Tasknest{% endblock %} -{% block content %} +{% block content %}
← Additional Review Required

{{ item.get_status_display }} · Barcode {{ item.barcode }}

Review scanned product

Unknown nutrition values stay blank. You can approve without filling optional nutrition fields.

{% if error %}{% endif %}{% if values.saved %}

Your changes were saved.

{% endif %}
{% csrf_token %} diff --git a/main/food/test_inventory_scanner.py b/main/food/test_inventory_scanner.py index 3116a53..a0e0f95 100644 --- a/main/food/test_inventory_scanner.py +++ b/main/food/test_inventory_scanner.py @@ -277,3 +277,18 @@ class InventoryScanWorkflowViewTests(TestCase): }) self.assertContains(response, 'Preview selected products') self.assertContains(response, 'Green lentils') + + def test_deferred_items_have_separate_state_and_missing_names_are_individual_only(self): + run = InventoryScanRun.objects.create(user=self.user, selected_location=self.fridge) + batch = InventoryScanBatch.objects.create(run=run, location=self.fridge, sequence=1) + item = InventoryScanItem.objects.create(batch=batch, location=self.fridge, barcode='9876543210123', + status=InventoryScanItem.Status.DEFERRED, last_error='A name is needed.') + response = self.client.post(reverse('food:inventory-review'), { + 'action': 'mode', 'mode': 'bulk', 'state': 'deferred'}) + self.assertRedirects(response, reverse('food:inventory-review') + '?mode=bulk&state=deferred', + fetch_redirect_response=False) + response = self.client.get(reverse('food:inventory-review'), {'mode': 'bulk', 'state': 'deferred'}) + self.assertContains(response, 'Deferred scan items') + self.assertContains(response, f'name="item_ids" value="{item.pk}" disabled') + self.assertEqual(response.context['eligible_bulk_count'], 0) + self.assertContains(response, 'data-bulk-preview-submit disabled')