Compare commits
13 Commits
feature/is
...
3209adcf40
| Author | SHA1 | Date | |
|---|---|---|---|
| 3209adcf40 | |||
|
|
0a020a6681 | ||
| ec6dd68e70 | |||
|
|
76c4a875ff | ||
|
|
2635483dbc | ||
| f6300c890b | |||
|
|
8a9f8f7fdd | ||
|
|
bd000649e3 | ||
|
|
1ed51c3667 | ||
|
|
76a229952f | ||
|
|
c5870f9e6f | ||
|
|
0ba695f159 | ||
| 7f9a92994c |
@@ -57,6 +57,21 @@
|
||||
/>
|
||||
</UFormGroup>
|
||||
|
||||
<!-- Low Stock Threshold -->
|
||||
<UFormGroup
|
||||
label="Low Stock Alert"
|
||||
hint="Optional - Alert when quantity falls below this"
|
||||
>
|
||||
<UInput
|
||||
v-model.number="form.low_stock_threshold"
|
||||
type="number"
|
||||
min="0"
|
||||
step="0.1"
|
||||
placeholder="e.g. 2"
|
||||
size="lg"
|
||||
/>
|
||||
</UFormGroup>
|
||||
|
||||
<!-- Notes -->
|
||||
<UFormGroup label="Notes" hint="Optional">
|
||||
<UTextarea
|
||||
@@ -121,6 +136,7 @@ const form = reactive({
|
||||
quantity: 1,
|
||||
unit_id: '',
|
||||
expiry_date: '',
|
||||
low_stock_threshold: null as number | null,
|
||||
notes: ''
|
||||
})
|
||||
|
||||
@@ -210,6 +226,7 @@ const handleSubmit = async () => {
|
||||
quantity: form.quantity,
|
||||
unit_id: form.unit_id,
|
||||
expiry_date: form.expiry_date || null,
|
||||
low_stock_threshold: form.low_stock_threshold,
|
||||
notes: form.notes.trim() || null
|
||||
})
|
||||
|
||||
|
||||
@@ -55,6 +55,21 @@
|
||||
/>
|
||||
</UFormGroup>
|
||||
|
||||
<!-- Low Stock Threshold -->
|
||||
<UFormGroup
|
||||
label="Low Stock Alert"
|
||||
hint="Optional - Alert when quantity falls below this"
|
||||
>
|
||||
<UInput
|
||||
v-model.number="form.low_stock_threshold"
|
||||
type="number"
|
||||
min="0"
|
||||
step="0.1"
|
||||
placeholder="e.g. 2"
|
||||
size="lg"
|
||||
/>
|
||||
</UFormGroup>
|
||||
|
||||
<!-- Notes -->
|
||||
<UFormGroup label="Notes" hint="Optional">
|
||||
<UTextarea
|
||||
@@ -112,6 +127,7 @@ const form = reactive({
|
||||
quantity: 1,
|
||||
unit_id: '',
|
||||
expiry_date: '',
|
||||
low_stock_threshold: null as number | null,
|
||||
notes: ''
|
||||
})
|
||||
|
||||
@@ -136,6 +152,7 @@ watch(() => props.item, (newItem) => {
|
||||
form.quantity = Number(newItem.quantity)
|
||||
form.unit_id = newItem.unit_id
|
||||
form.expiry_date = newItem.expiry_date || ''
|
||||
form.low_stock_threshold = newItem.low_stock_threshold || null
|
||||
form.notes = newItem.notes || ''
|
||||
isOpen.value = true
|
||||
}
|
||||
@@ -168,6 +185,7 @@ const handleSubmit = async () => {
|
||||
quantity: form.quantity,
|
||||
unit_id: form.unit_id,
|
||||
expiry_date: form.expiry_date || null,
|
||||
low_stock_threshold: form.low_stock_threshold,
|
||||
notes: form.notes.trim() || null
|
||||
})
|
||||
|
||||
|
||||
@@ -72,17 +72,53 @@
|
||||
{{ expiryText }}
|
||||
</UBadge>
|
||||
</div>
|
||||
|
||||
<!-- Low Stock Warning -->
|
||||
<div v-if="isLowStock" class="text-xs">
|
||||
<UBadge
|
||||
color="orange"
|
||||
variant="soft"
|
||||
class="w-full justify-center"
|
||||
>
|
||||
<UIcon name="i-heroicons-exclamation-triangle" class="mr-1" />
|
||||
Low stock ({{ item.quantity }}/{{ item.low_stock_threshold }})
|
||||
</UBadge>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Action Buttons -->
|
||||
<template #footer>
|
||||
<div class="flex gap-2">
|
||||
<div class="flex flex-col gap-2">
|
||||
<!-- Quick Actions Row -->
|
||||
<div class="grid grid-cols-2 gap-2">
|
||||
<UButton
|
||||
icon="i-heroicons-arrow-trending-down"
|
||||
size="sm"
|
||||
color="orange"
|
||||
variant="soft"
|
||||
@click="handleConsume"
|
||||
:disabled="item.quantity <= 0.01"
|
||||
>
|
||||
Consume
|
||||
</UButton>
|
||||
<UButton
|
||||
icon="i-heroicons-arrow-trending-up"
|
||||
size="sm"
|
||||
color="green"
|
||||
variant="soft"
|
||||
@click="showRestockModal = true"
|
||||
>
|
||||
Restock
|
||||
</UButton>
|
||||
</div>
|
||||
|
||||
<!-- Management Actions Row -->
|
||||
<div class="grid grid-cols-2 gap-2">
|
||||
<UButton
|
||||
icon="i-heroicons-pencil"
|
||||
size="sm"
|
||||
color="gray"
|
||||
variant="soft"
|
||||
class="flex-1"
|
||||
@click="$emit('edit', item)"
|
||||
>
|
||||
Edit
|
||||
@@ -97,7 +133,61 @@
|
||||
Delete
|
||||
</UButton>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- Restock Modal -->
|
||||
<UModal v-model="showRestockModal">
|
||||
<UCard>
|
||||
<template #header>
|
||||
<h3 class="text-lg font-semibold">Restock {{ item.name }}</h3>
|
||||
</template>
|
||||
|
||||
<div class="space-y-4">
|
||||
<div class="text-sm text-gray-600">
|
||||
Current: <span class="font-semibold">{{ item.quantity }} {{ item.unit?.abbreviation }}</span>
|
||||
</div>
|
||||
|
||||
<UFormGroup label="Amount to add">
|
||||
<UInput
|
||||
v-model.number="restockAmount"
|
||||
type="number"
|
||||
min="0.01"
|
||||
step="0.01"
|
||||
size="lg"
|
||||
autofocus
|
||||
placeholder="e.g. 5"
|
||||
/>
|
||||
</UFormGroup>
|
||||
|
||||
<div v-if="restockAmount > 0" class="text-sm text-gray-600">
|
||||
New total: <span class="font-semibold">{{ (Number(item.quantity) + Number(restockAmount)).toFixed(2) }} {{ item.unit?.abbreviation }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="flex gap-2">
|
||||
<UButton
|
||||
color="primary"
|
||||
size="lg"
|
||||
class="flex-1"
|
||||
@click="handleRestock"
|
||||
:disabled="!restockAmount || restockAmount <= 0"
|
||||
>
|
||||
Add {{ restockAmount || 0 }} {{ item.unit?.abbreviation }}
|
||||
</UButton>
|
||||
<UButton
|
||||
color="gray"
|
||||
size="lg"
|
||||
variant="soft"
|
||||
@click="showRestockModal = false"
|
||||
>
|
||||
Cancel
|
||||
</UButton>
|
||||
</div>
|
||||
</template>
|
||||
</UCard>
|
||||
</UModal>
|
||||
</UCard>
|
||||
</template>
|
||||
|
||||
@@ -106,12 +196,17 @@ const props = defineProps<{
|
||||
item: any
|
||||
}>()
|
||||
|
||||
defineEmits<{
|
||||
const emit = defineEmits<{
|
||||
edit: [item: any]
|
||||
delete: [id: string]
|
||||
'update-quantity': [id: string, change: number]
|
||||
'consume': [id: string]
|
||||
'restock': [id: string, amount: number]
|
||||
}>()
|
||||
|
||||
const showRestockModal = ref(false)
|
||||
const restockAmount = ref<number>(1)
|
||||
|
||||
// Calculate days until expiry
|
||||
const daysUntilExpiry = computed(() => {
|
||||
if (!props.item.expiry_date) return null
|
||||
@@ -145,4 +240,30 @@ const expiryText = computed(() => {
|
||||
if (daysUntilExpiry.value === 1) return 'Expires tomorrow'
|
||||
return `Expires in ${daysUntilExpiry.value} days`
|
||||
})
|
||||
|
||||
// Low stock detection
|
||||
const isLowStock = computed(() => {
|
||||
if (!props.item.low_stock_threshold) return false
|
||||
return Number(props.item.quantity) <= Number(props.item.low_stock_threshold)
|
||||
})
|
||||
|
||||
// Quick actions
|
||||
const handleConsume = () => {
|
||||
emit('update-quantity', props.item.id, -1)
|
||||
}
|
||||
|
||||
const handleRestock = () => {
|
||||
if (restockAmount.value && restockAmount.value > 0) {
|
||||
emit('update-quantity', props.item.id, restockAmount.value)
|
||||
showRestockModal.value = false
|
||||
restockAmount.value = 1 // Reset for next time
|
||||
}
|
||||
}
|
||||
|
||||
// Reset restock amount when modal closes
|
||||
watch(showRestockModal, (isOpen) => {
|
||||
if (!isOpen) {
|
||||
restockAmount.value = 1
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -60,6 +60,7 @@ const { getInventory, deleteInventoryItem, updateQuantity } = useInventory()
|
||||
const props = defineProps<{
|
||||
refresh?: boolean
|
||||
tagFilters?: string[]
|
||||
searchQuery?: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
@@ -89,17 +90,27 @@ const loadInventory = async () => {
|
||||
|
||||
// Computed filtered items
|
||||
const filteredItems = computed(() => {
|
||||
if (!props.tagFilters || props.tagFilters.length === 0) {
|
||||
return items.value
|
||||
let result = items.value
|
||||
|
||||
// Filter by search query (case-insensitive)
|
||||
if (props.searchQuery && props.searchQuery.trim()) {
|
||||
const query = props.searchQuery.trim().toLowerCase()
|
||||
result = result.filter(item =>
|
||||
item.name.toLowerCase().includes(query)
|
||||
)
|
||||
}
|
||||
|
||||
// Filter items that have at least one of the selected tags
|
||||
return items.value.filter(item => {
|
||||
// Filter by tags
|
||||
if (props.tagFilters && props.tagFilters.length > 0) {
|
||||
result = result.filter(item => {
|
||||
if (!item.tags || item.tags.length === 0) return false
|
||||
|
||||
const itemTagIds = item.tags.map((t: any) => t.tag.id)
|
||||
return props.tagFilters!.some(filterId => itemTagIds.includes(filterId))
|
||||
})
|
||||
}
|
||||
|
||||
return result
|
||||
})
|
||||
|
||||
const handleDelete = async (id: string) => {
|
||||
|
||||
@@ -33,9 +33,36 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Search & Filters -->
|
||||
<UCard v-if="showFilters" class="mb-6 space-y-4">
|
||||
<!-- Search Bar -->
|
||||
<div>
|
||||
<UFormGroup label="Search Items">
|
||||
<UInput
|
||||
v-model="searchQuery"
|
||||
placeholder="Search by item name..."
|
||||
icon="i-heroicons-magnifying-glass"
|
||||
size="lg"
|
||||
:ui="{ icon: { trailing: { pointer: '' } } }"
|
||||
>
|
||||
<template #trailing>
|
||||
<UButton
|
||||
v-if="searchQuery"
|
||||
color="gray"
|
||||
variant="link"
|
||||
icon="i-heroicons-x-mark"
|
||||
:padded="false"
|
||||
@click="searchQuery = ''"
|
||||
/>
|
||||
</template>
|
||||
</UInput>
|
||||
</UFormGroup>
|
||||
</div>
|
||||
|
||||
<!-- Tag Filters -->
|
||||
<UCard v-if="showFilters" class="mb-6">
|
||||
<div>
|
||||
<TagsTagFilter v-model="selectedTagFilters" />
|
||||
</div>
|
||||
</UCard>
|
||||
|
||||
<!-- Add Item Form (Overlay) -->
|
||||
@@ -61,6 +88,7 @@
|
||||
ref="inventoryListRef"
|
||||
:refresh="refreshKey"
|
||||
:tag-filters="selectedTagFilters"
|
||||
:search-query="searchQuery"
|
||||
@add-item="showAddForm = true"
|
||||
@edit-item="editingItem = $event"
|
||||
/>
|
||||
@@ -82,6 +110,7 @@ const refreshKey = ref(0)
|
||||
const inventoryListRef = ref()
|
||||
const prefilledData = ref<any>(null)
|
||||
const selectedTagFilters = ref<string[]>([])
|
||||
const searchQuery = ref('')
|
||||
|
||||
// Handle scan-to-add flow (Issue #25)
|
||||
onMounted(() => {
|
||||
|
||||
@@ -26,6 +26,8 @@ export interface Database {
|
||||
quantity: number
|
||||
unit_id: string
|
||||
expiry_date: string | null
|
||||
expires_at: string | null
|
||||
low_stock_threshold: number | null
|
||||
notes: string | null
|
||||
added_by: string
|
||||
created_at: string
|
||||
@@ -38,6 +40,8 @@ export interface Database {
|
||||
quantity: number
|
||||
unit_id: string
|
||||
expiry_date?: string | null
|
||||
expires_at?: string | null
|
||||
low_stock_threshold?: number | null
|
||||
notes?: string | null
|
||||
added_by: string
|
||||
created_at?: string
|
||||
@@ -50,6 +54,8 @@ export interface Database {
|
||||
quantity?: number
|
||||
unit_id?: string
|
||||
expiry_date?: string | null
|
||||
expires_at?: string | null
|
||||
low_stock_threshold?: number | null
|
||||
notes?: string | null
|
||||
added_by?: string
|
||||
created_at?: string
|
||||
|
||||
26
supabase/migrations/006_add_expiry_lowstock.sql
Normal file
26
supabase/migrations/006_add_expiry_lowstock.sql
Normal file
@@ -0,0 +1,26 @@
|
||||
-- Migration: Add expiry date and low-stock threshold tracking
|
||||
-- Issues: #63 (expiry tracking), #67 (low-stock threshold)
|
||||
-- Created: 2026-02-25
|
||||
|
||||
-- Note: expiry_date already exists as DATE type. Adding expires_at as TIMESTAMPTZ for consistency
|
||||
-- and low_stock_threshold for threshold tracking.
|
||||
|
||||
-- Add expires_at column for precise expiry date/time tracking (complementing existing expiry_date)
|
||||
-- We'll keep both: expiry_date (DATE) for simple day-based expiry, expires_at (TIMESTAMPTZ) for precise tracking
|
||||
ALTER TABLE inventory_items
|
||||
ADD COLUMN expires_at TIMESTAMP WITH TIME ZONE DEFAULT NULL;
|
||||
|
||||
-- Add low_stock_threshold column for low-stock alerts
|
||||
ALTER TABLE inventory_items
|
||||
ADD COLUMN low_stock_threshold NUMERIC(10,2) DEFAULT NULL;
|
||||
|
||||
-- Add comments for documentation
|
||||
COMMENT ON COLUMN inventory_items.expires_at IS 'Optional precise expiration timestamp. Complements expiry_date for items needing time-specific expiry.';
|
||||
COMMENT ON COLUMN inventory_items.low_stock_threshold IS 'Minimum quantity threshold. Item is considered low-stock when quantity <= threshold. Null means no threshold set.';
|
||||
|
||||
-- Create index for efficient expiry queries (finding items expiring soon)
|
||||
CREATE INDEX idx_inventory_items_expires_at ON inventory_items(expires_at) WHERE expires_at IS NOT NULL;
|
||||
|
||||
-- Create index for efficient low-stock queries
|
||||
CREATE INDEX idx_inventory_items_low_stock ON inventory_items(quantity, low_stock_threshold)
|
||||
WHERE low_stock_threshold IS NOT NULL;
|
||||
Reference in New Issue
Block a user