template updating added and item text field fixes
This commit is contained in:
+15
-18
@@ -1,6 +1,7 @@
|
|||||||
import type { Component } from 'solid-js';
|
import type { Component } from 'solid-js';
|
||||||
import { createMemo, createEffect, createSignal, Show } from 'solid-js';
|
import { createMemo, createEffect, createSignal, Show } from 'solid-js';
|
||||||
import { GripVertical, Trash2, Copy } from 'lucide-solid';
|
import { GripVertical, Trash2, Copy } from 'lucide-solid';
|
||||||
|
import NumericInput from './ui/NumericInput';
|
||||||
import type { EstimateItem } from '../types';
|
import type { EstimateItem } from '../types';
|
||||||
|
|
||||||
interface ItemRowProps {
|
interface ItemRowProps {
|
||||||
@@ -108,13 +109,12 @@ const ItemRow: Component<ItemRowProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w-20 shrink-0 mt-1">
|
<div class="w-20 shrink-0 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
dataFieldName="qty"
|
||||||
data-field-name="qty"
|
|
||||||
value={props.item.quantity}
|
value={props.item.quantity}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { quantity: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { quantity: val })}
|
||||||
onDragStart={(e) => {
|
onDragStart={(e) => {
|
||||||
const val = parseFloat(e.currentTarget.value) || 0;
|
const val = props.item.quantity;
|
||||||
const data = {
|
const data = {
|
||||||
type: 'item-field',
|
type: 'item-field',
|
||||||
itemId: props.item.id,
|
itemId: props.item.id,
|
||||||
@@ -137,14 +137,13 @@ const ItemRow: Component<ItemRowProps> = (props) => {
|
|||||||
<div class="w-24 shrink-0 mt-1">
|
<div class="w-24 shrink-0 mt-1">
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<span class="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/50 text-[10px]">$</span>
|
<span class="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/50 text-[10px]">$</span>
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
dataFieldName="price"
|
||||||
data-field-name="price"
|
|
||||||
step="0.1"
|
step="0.1"
|
||||||
value={props.item.unitPrice}
|
value={props.item.unitPrice}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { unitPrice: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { unitPrice: val })}
|
||||||
onDragStart={(e) => {
|
onDragStart={(e) => {
|
||||||
const val = parseFloat(e.currentTarget.value) || 0;
|
const val = props.item.unitPrice;
|
||||||
const data = {
|
const data = {
|
||||||
type: 'item-field',
|
type: 'item-field',
|
||||||
itemId: props.item.id,
|
itemId: props.item.id,
|
||||||
@@ -188,11 +187,10 @@ const ItemRow: Component<ItemRowProps> = (props) => {
|
|||||||
|
|
||||||
<Show when={props.isSidebarCollapsed() || !props.hideColumns}>
|
<Show when={props.isSidebarCollapsed() || !props.hideColumns}>
|
||||||
<div class="w-32 shrink-0 flex items-center gap-1.5 mt-1">
|
<div class="w-32 shrink-0 flex items-center gap-1.5 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
dataFieldName="markup"
|
||||||
data-field-name="markup"
|
|
||||||
value={props.item.markup}
|
value={props.item.markup}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { markup: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { markup: val })}
|
||||||
disabled={props.anySelected}
|
disabled={props.anySelected}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none disabled:opacity-50 font-bold text-primary transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none disabled:opacity-50 font-bold text-primary transition-all"
|
||||||
placeholder="Markup"
|
placeholder="Markup"
|
||||||
@@ -210,11 +208,10 @@ const ItemRow: Component<ItemRowProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w-32 shrink-0 flex items-center gap-1.5 mt-1">
|
<div class="w-32 shrink-0 flex items-center gap-1.5 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
dataFieldName="contingency"
|
||||||
data-field-name="contingency"
|
|
||||||
value={props.item.contingency}
|
value={props.item.contingency}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { contingency: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { contingency: val })}
|
||||||
disabled={props.anySelected}
|
disabled={props.anySelected}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none disabled:opacity-50 font-bold text-foreground/80 transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none disabled:opacity-50 font-bold text-foreground/80 transition-all"
|
||||||
placeholder="Contingency"
|
placeholder="Contingency"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { Component } from 'solid-js';
|
import type { Component } from 'solid-js';
|
||||||
import { For, createMemo, Show, createSignal } from 'solid-js';
|
import { For, createMemo, Show, createSignal } from 'solid-js';
|
||||||
import { Trash2, Plus, Settings2, Percent, DollarSign, ChevronDown, FileText, ClipboardList, FileBox } from 'lucide-solid';
|
import { Trash2, Plus, Settings2, Percent, DollarSign, ChevronDown, FileText, ClipboardList, FileBox } from 'lucide-solid';
|
||||||
|
import NumericInput from './ui/NumericInput';
|
||||||
import type { EstimateItem, Scope, SubScope, PricingType } from '../types';
|
import type { EstimateItem, Scope, SubScope, PricingType } from '../types';
|
||||||
import ItemRow from './ItemRow';
|
import ItemRow from './ItemRow';
|
||||||
import SubScopeCard from './SubScopeCard';
|
import SubScopeCard from './SubScopeCard';
|
||||||
@@ -162,10 +163,10 @@ const ScopeCard: Component<ScopeCardProps> = (props) => {
|
|||||||
<span class="text-sm font-semibold text-primary">Bulk Adjust Scope:</span>
|
<span class="text-sm font-semibold text-primary">Bulk Adjust Scope:</span>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<label class="text-xs text-primary/70">Markup %:</label>
|
<label class="text-xs text-primary/70">Markup %:</label>
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
class="w-16 px-2 py-1 border border-primary/20 bg-background rounded text-sm focus:ring-2 focus:ring-primary outline-none"
|
class="w-16 px-2 py-1 border border-primary/20 bg-background rounded text-sm focus:ring-2 focus:ring-primary outline-none"
|
||||||
onInput={(e) => setBulkMarkup(parseFloat(e.currentTarget.value) || 0)}
|
value={bulkMarkup()}
|
||||||
|
onUpdate={(val) => setBulkMarkup(val)}
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={() => props.onBulkUpdate(props.scope.id, undefined, { markup: bulkMarkup(), markupType: 'percent' })}
|
onClick={() => props.onBulkUpdate(props.scope.id, undefined, { markup: bulkMarkup(), markupType: 'percent' })}
|
||||||
@@ -176,10 +177,10 @@ const ScopeCard: Component<ScopeCardProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-2 border-l border-primary/20 pl-4">
|
<div class="flex items-center gap-2 border-l border-primary/20 pl-4">
|
||||||
<label class="text-xs text-primary/70">Contingency %:</label>
|
<label class="text-xs text-primary/70">Contingency %:</label>
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
class="w-16 px-2 py-1 border border-primary/20 bg-background rounded text-sm focus:ring-2 focus:ring-primary outline-none"
|
class="w-16 px-2 py-1 border border-primary/20 bg-background rounded text-sm focus:ring-2 focus:ring-primary outline-none"
|
||||||
onInput={(e) => setBulkContingency(parseFloat(e.currentTarget.value) || 0)}
|
value={bulkContingency()}
|
||||||
|
onUpdate={(val) => setBulkContingency(val)}
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={() => props.onBulkUpdate(props.scope.id, undefined, { contingency: bulkContingency(), contingencyType: 'percent' })}
|
onClick={() => props.onBulkUpdate(props.scope.id, undefined, { contingency: bulkContingency(), contingencyType: 'percent' })}
|
||||||
@@ -299,10 +300,9 @@ const ScopeCard: Component<ScopeCardProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-4">
|
<div class="flex items-center gap-4">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
value={props.scope.managementFee}
|
value={props.scope.managementFee}
|
||||||
onInput={(e) => props.onUpdateScope(props.scope.id, { managementFee: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdateScope(props.scope.id, { managementFee: val })}
|
||||||
class="w-20 text-right text-sm border-b border-dashed border-border focus:border-primary outline-none bg-transparent"
|
class="w-20 text-right text-sm border-b border-dashed border-border focus:border-primary outline-none bg-transparent"
|
||||||
/>
|
/>
|
||||||
<span class="w-28 text-right text-foreground font-medium">${formatNumber(totals().mgmtTotal)}</span>
|
<span class="w-28 text-right text-foreground font-medium">${formatNumber(totals().mgmtTotal)}</span>
|
||||||
@@ -329,10 +329,9 @@ const ScopeCard: Component<ScopeCardProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-4">
|
<div class="flex items-center gap-4">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
value={props.scope.deliveryFee}
|
value={props.scope.deliveryFee}
|
||||||
onInput={(e) => props.onUpdateScope(props.scope.id, { deliveryFee: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdateScope(props.scope.id, { deliveryFee: val })}
|
||||||
class="w-20 text-right text-sm border-b border-dashed border-border focus:border-primary outline-none bg-transparent"
|
class="w-20 text-right text-sm border-b border-dashed border-border focus:border-primary outline-none bg-transparent"
|
||||||
/>
|
/>
|
||||||
<span class="w-28 text-right text-foreground font-medium">${formatNumber(totals().deliveryTotal)}</span>
|
<span class="w-28 text-right text-foreground font-medium">${formatNumber(totals().deliveryTotal)}</span>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { Component } from 'solid-js';
|
import type { Component } from 'solid-js';
|
||||||
import { createSignal, createEffect } from 'solid-js';
|
import { createSignal, createEffect } from 'solid-js';
|
||||||
import { Trash2, GripVertical } from 'lucide-solid';
|
import { Trash2, GripVertical } from 'lucide-solid';
|
||||||
|
import NumericInput from '../ui/NumericInput';
|
||||||
import type { TemplateItem } from '../../types';
|
import type { TemplateItem } from '../../types';
|
||||||
|
|
||||||
interface TemplateItemRowProps {
|
interface TemplateItemRowProps {
|
||||||
@@ -56,10 +57,9 @@ const TemplateItemRow: Component<TemplateItemRowProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w-24 shrink-0 mt-1">
|
<div class="w-24 shrink-0 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
value={props.item.quantity}
|
value={props.item.quantity}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { quantity: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { quantity: val })}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
||||||
placeholder="Qty"
|
placeholder="Qty"
|
||||||
/>
|
/>
|
||||||
@@ -68,11 +68,10 @@ const TemplateItemRow: Component<TemplateItemRowProps> = (props) => {
|
|||||||
<div class="w-32 shrink-0 mt-1">
|
<div class="w-32 shrink-0 mt-1">
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<span class="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/50 text-[10px]">$</span>
|
<span class="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/50 text-[10px]">$</span>
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
step="0.1"
|
step="0.1"
|
||||||
value={props.item.unitPrice}
|
value={props.item.unitPrice}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { unitPrice: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { unitPrice: val })}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl pl-5 pr-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl pl-5 pr-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
||||||
placeholder="Price"
|
placeholder="Price"
|
||||||
/>
|
/>
|
||||||
@@ -80,10 +79,9 @@ const TemplateItemRow: Component<TemplateItemRowProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w-28 shrink-0 flex items-center gap-1.5 mt-1">
|
<div class="w-28 shrink-0 flex items-center gap-1.5 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
value={props.item.markup}
|
value={props.item.markup}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { markup: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { markup: val })}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-primary transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-primary transition-all"
|
||||||
placeholder="Markup"
|
placeholder="Markup"
|
||||||
/>
|
/>
|
||||||
@@ -96,10 +94,9 @@ const TemplateItemRow: Component<TemplateItemRowProps> = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="w-28 shrink-0 flex items-center gap-1.5 mt-1">
|
<div class="w-28 shrink-0 flex items-center gap-1.5 mt-1">
|
||||||
<input
|
<NumericInput
|
||||||
type="number"
|
|
||||||
value={props.item.contingency}
|
value={props.item.contingency}
|
||||||
onInput={(e) => props.onUpdate(props.item.id, { contingency: parseFloat(e.currentTarget.value) || 0 })}
|
onUpdate={(val) => props.onUpdate(props.item.id, { contingency: val })}
|
||||||
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
class="w-full bg-muted/30 border border-border/60 rounded-xl px-2 py-1.5 text-xs text-right focus:bg-background focus:ring-2 focus:ring-primary/20 focus:border-primary outline-none font-bold text-foreground/80 transition-all"
|
||||||
placeholder="Cont"
|
placeholder="Cont"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
import type { Component } from 'solid-js';
|
||||||
|
import { createSignal, Show, For, createEffect } from 'solid-js';
|
||||||
|
import { Portal } from 'solid-js/web';
|
||||||
|
import { X, FileBox, CheckCircle2 } from 'lucide-solid';
|
||||||
|
import { pb, COLLECTIONS } from '../../utils/db';
|
||||||
|
|
||||||
|
interface TemplateLoadModalProps {
|
||||||
|
show: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
onLoad: (template: any) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const TemplateLoadModal: Component<TemplateLoadModalProps> = (props) => {
|
||||||
|
const [templates, setTemplates] = createSignal<any[]>([]);
|
||||||
|
const [isLoading, setIsLoading] = createSignal(false);
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
if (props.show) {
|
||||||
|
loadTemplates();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const loadTemplates = async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
const records = await pb.collection(COLLECTIONS.TEMPLATES).getFullList({
|
||||||
|
sort: '-created'
|
||||||
|
});
|
||||||
|
setTemplates(records);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
alert('Failed to load templates.');
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Show when={props.show}>
|
||||||
|
<Portal>
|
||||||
|
<div class="fixed inset-0 z-[100] flex flex-col items-center justify-center bg-background/80 backdrop-blur-sm p-4 animate-in fade-in duration-200">
|
||||||
|
<div class="bg-card w-full max-w-2xl max-h-[85vh] flex flex-col rounded-3xl shadow-premium border border-border overflow-hidden animate-in zoom-in-95 duration-200">
|
||||||
|
<div class="flex items-center justify-between p-6 border-b border-border">
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<div class="p-2 bg-primary/10 text-primary rounded-xl">
|
||||||
|
<FileBox class="w-5 h-5" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 class="text-xl font-black text-foreground">Load Template</h3>
|
||||||
|
<p class="text-[10px] uppercase font-bold text-muted-foreground tracking-wider mt-0.5">Select a template to edit</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button onClick={props.onClose} class="p-2 hover:bg-muted rounded-xl transition-colors">
|
||||||
|
<X class="w-5 h-5 text-muted-foreground" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-1 flex flex-col p-6 gap-6 overflow-hidden">
|
||||||
|
{/* Templates List */}
|
||||||
|
<div class="flex-1 flex flex-col min-h-0 space-y-3">
|
||||||
|
<label class="text-xs font-black text-muted-foreground uppercase tracking-wider">Saved Templates</label>
|
||||||
|
<div class="flex-1 overflow-y-auto space-y-3 bg-muted/10 border border-border/50 rounded-2xl p-4">
|
||||||
|
<Show
|
||||||
|
when={!isLoading()}
|
||||||
|
fallback={<div class="py-12 text-center text-muted-foreground text-sm font-medium">Loading templates...</div>}
|
||||||
|
>
|
||||||
|
<For each={templates()}>
|
||||||
|
{(record) => (
|
||||||
|
<div class="group flex items-center justify-between p-4 rounded-xl border border-border/60 bg-card hover:border-primary/50 hover:shadow-premium transition-all">
|
||||||
|
<div>
|
||||||
|
<h4 class="font-bold text-foreground">{record.name}</h4>
|
||||||
|
<p class="text-[10px] text-muted-foreground font-medium uppercase tracking-wider mt-1">
|
||||||
|
{record.items?.length || 0} Items • {new Date(record.created).toLocaleDateString()}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
props.onLoad(record);
|
||||||
|
props.onClose();
|
||||||
|
}}
|
||||||
|
class="flex items-center gap-2 px-4 py-2 bg-primary/10 text-primary border border-primary/20 rounded-lg text-xs font-bold shadow-sm hover:bg-primary hover:text-primary-foreground hover:border-primary transition-all"
|
||||||
|
>
|
||||||
|
<CheckCircle2 class="w-4 h-4" /> Load
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
|
<Show when={templates().length === 0}>
|
||||||
|
<div class="py-12 flex flex-col items-center justify-center text-center text-muted-foreground/60 border-2 border-dashed border-border/60 rounded-xl bg-background/50 h-full">
|
||||||
|
<FileBox class="w-8 h-8 mb-3 opacity-50" />
|
||||||
|
<p class="text-sm font-medium">No saved templates found.</p>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Portal>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default TemplateLoadModal;
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
import type { Component, JSX } from 'solid-js';
|
||||||
|
import { createSignal, createEffect } from 'solid-js';
|
||||||
|
|
||||||
|
interface NumericInputProps extends Omit<JSX.InputHTMLAttributes<HTMLInputElement>, 'onInput' | 'value'> {
|
||||||
|
value: number;
|
||||||
|
onUpdate: (val: number) => void;
|
||||||
|
dataFieldName?: string;
|
||||||
|
class?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const NumericInput: Component<NumericInputProps> = (props) => {
|
||||||
|
const [isFocused, setIsFocused] = createSignal(false);
|
||||||
|
const [localValue, setLocalValue] = createSignal(props.value.toString());
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
if (!isFocused()) {
|
||||||
|
setLocalValue(props.value.toString());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleInput = (e: InputEvent & { currentTarget: HTMLInputElement }) => {
|
||||||
|
let val = e.currentTarget.value;
|
||||||
|
|
||||||
|
// Allow only numeric characters, one dot, and one leading minus sign
|
||||||
|
// This regex allows: "", "-", ".", "-.", and valid numbers
|
||||||
|
if (val !== '' && !/^-?(\d*\.?\d*)?$/.test(val)) {
|
||||||
|
// If invalid, revert to previous local value (simple way to block invalid keys)
|
||||||
|
e.currentTarget.value = localValue();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setLocalValue(val);
|
||||||
|
|
||||||
|
// Only update the store if it's a valid numeric value for calculations
|
||||||
|
if (val === '' || val === '-' || val === '.' || val === '-.') {
|
||||||
|
props.onUpdate(0);
|
||||||
|
} else {
|
||||||
|
const parsed = parseFloat(val);
|
||||||
|
if (!isNaN(parsed)) {
|
||||||
|
props.onUpdate(parsed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const callHandler = (handler: any, event: any) => {
|
||||||
|
if (typeof handler === 'function') {
|
||||||
|
handler(event);
|
||||||
|
} else if (Array.isArray(handler)) {
|
||||||
|
handler[0](handler[1], event);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFocus = (e: FocusEvent) => {
|
||||||
|
setIsFocused(true);
|
||||||
|
// Select all text on focus to make it easier to replace values
|
||||||
|
(e.currentTarget as HTMLInputElement).select();
|
||||||
|
callHandler(props.onFocus, e);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBlur = (e: FocusEvent) => {
|
||||||
|
setIsFocused(false);
|
||||||
|
// On blur, normalize the local value to the props value
|
||||||
|
// But if the user left it empty or as a partial, props.value will be 0
|
||||||
|
setLocalValue(props.value.toString());
|
||||||
|
callHandler(props.onBlur, e);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<input
|
||||||
|
{...props}
|
||||||
|
type="text"
|
||||||
|
inputmode="decimal"
|
||||||
|
value={localValue()}
|
||||||
|
onInput={handleInput}
|
||||||
|
onFocus={handleFocus}
|
||||||
|
onBlur={handleBlur}
|
||||||
|
class={props.class}
|
||||||
|
data-field-name={props.dataFieldName}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default NumericInput;
|
||||||
@@ -35,7 +35,8 @@ const [generalPreNotes, setGeneralPreNotes] = createSignal('');
|
|||||||
|
|
||||||
// Template Creator State
|
// Template Creator State
|
||||||
const [activeTemplateName, setActiveTemplateName] = createSignal('');
|
const [activeTemplateName, setActiveTemplateName] = createSignal('');
|
||||||
const [activeTemplateItems, setActiveTemplateItems] = createSignal<TemplateItem[]>([]);
|
const [activeTemplateItems, setActiveTemplateItems] = createStore<TemplateItem[]>([]);
|
||||||
|
const [activeTemplateId, setActiveTemplateId] = createSignal<string | null>(null);
|
||||||
|
|
||||||
export const appStore = {
|
export const appStore = {
|
||||||
// Raw CSV Extraction
|
// Raw CSV Extraction
|
||||||
@@ -60,6 +61,8 @@ export const appStore = {
|
|||||||
generalPreNotes, setGeneralPreNotes,
|
generalPreNotes, setGeneralPreNotes,
|
||||||
|
|
||||||
// Templates
|
// Templates
|
||||||
|
templateId: activeTemplateId,
|
||||||
|
setTemplateId: setActiveTemplateId,
|
||||||
templateName: activeTemplateName,
|
templateName: activeTemplateName,
|
||||||
setTemplateName: setActiveTemplateName,
|
setTemplateName: setActiveTemplateName,
|
||||||
templateItems: activeTemplateItems,
|
templateItems: activeTemplateItems,
|
||||||
|
|||||||
@@ -1,17 +1,23 @@
|
|||||||
import type { Component } from 'solid-js';
|
import type { Component } from 'solid-js';
|
||||||
import { Save } from 'lucide-solid';
|
import { FolderOpen, Save } from 'lucide-solid';
|
||||||
import type { TemplateItem } from '../types';
|
import type { TemplateItem } from '../types';
|
||||||
import TemplateItemList from '../components/template/TemplateItemList';
|
import TemplateItemList from '../components/template/TemplateItemList';
|
||||||
|
import TemplateLoadModal from '../components/template/TemplateLoadModal';
|
||||||
import { pb, COLLECTIONS } from '../utils/db';
|
import { pb, COLLECTIONS } from '../utils/db';
|
||||||
|
import { createSignal } from 'solid-js';
|
||||||
|
|
||||||
import { appStore } from '../store/appStore';
|
import { appStore } from '../store/appStore';
|
||||||
|
|
||||||
const TemplateCreator: Component = () => {
|
const TemplateCreator: Component = () => {
|
||||||
|
const templateId = appStore.templateId;
|
||||||
|
const setTemplateId = appStore.setTemplateId;
|
||||||
const templateName = appStore.templateName;
|
const templateName = appStore.templateName;
|
||||||
const setTemplateName = appStore.setTemplateName;
|
const setTemplateName = appStore.setTemplateName;
|
||||||
const items = appStore.templateItems;
|
const items = appStore.templateItems;
|
||||||
const setItems = appStore.setTemplateItems;
|
const setItems = appStore.setTemplateItems;
|
||||||
|
|
||||||
|
const [showLoadModal, setShowLoadModal] = createSignal(false);
|
||||||
|
|
||||||
const handleAddItem = () => {
|
const handleAddItem = () => {
|
||||||
const newItem: TemplateItem = {
|
const newItem: TemplateItem = {
|
||||||
id: crypto.randomUUID(),
|
id: crypto.randomUUID(),
|
||||||
@@ -23,34 +29,46 @@ const TemplateCreator: Component = () => {
|
|||||||
contingency: 10, // default
|
contingency: 10, // default
|
||||||
contingencyType: 'percent'
|
contingencyType: 'percent'
|
||||||
};
|
};
|
||||||
setItems([...items(), newItem]);
|
setItems([...items, newItem]);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleUpdateItem = (id: string, updates: Partial<TemplateItem>) => {
|
const handleUpdateItem = (id: string, updates: Partial<TemplateItem>) => {
|
||||||
setItems(items().map(item => item.id === id ? { ...item, ...updates } : item));
|
setItems(item => item.id === id, updates);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleDeleteItem = (id: string) => {
|
const handleDeleteItem = (id: string) => {
|
||||||
setItems(items().filter(item => item.id !== id));
|
setItems(items.filter(item => item.id !== id));
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLoadTemplate = (record: any) => {
|
||||||
|
setTemplateId(record.id);
|
||||||
|
setTemplateName(record.name);
|
||||||
|
setItems(JSON.parse(JSON.stringify(record.items || [])));
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleNewTemplate = () => {
|
||||||
|
setTemplateId(null);
|
||||||
|
setTemplateName('');
|
||||||
|
setItems([]);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSaveTemplate = async () => {
|
const handleSaveTemplate = async () => {
|
||||||
if (!templateName() || items().length === 0) return;
|
if (!templateName() || items.length === 0) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const record = {
|
const record = {
|
||||||
name: templateName(),
|
name: templateName(),
|
||||||
items: items() // PocketBase will store this as JSON
|
items: JSON.parse(JSON.stringify(items)) // Ensure plain objects for PocketBase
|
||||||
};
|
};
|
||||||
|
|
||||||
await pb.collection(COLLECTIONS.TEMPLATES).create(record);
|
if (templateId()) {
|
||||||
alert(`Template "${record.name}" saved successfully!`);
|
await pb.collection(COLLECTIONS.TEMPLATES).update(templateId()!, record);
|
||||||
|
alert(`Template "${record.name}" updated successfully!`);
|
||||||
// Reset form
|
} else {
|
||||||
setTemplateName('');
|
const newRecord = await pb.collection(COLLECTIONS.TEMPLATES).create(record);
|
||||||
setItems([]);
|
setTemplateId(newRecord.id);
|
||||||
|
alert(`Template "${record.name}" saved successfully!`);
|
||||||
// Refresh the list if we had one
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error saving template:', error);
|
console.error('Error saving template:', error);
|
||||||
alert('Failed to save template. Make sure the collection and fields exist.');
|
alert('Failed to save template. Make sure the collection and fields exist.');
|
||||||
@@ -66,14 +84,29 @@ const TemplateCreator: Component = () => {
|
|||||||
<p class="text-gray-500 font-medium">Create templates for your estimate sub-scopes.</p>
|
<p class="text-gray-500 font-medium">Create templates for your estimate sub-scopes.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<div class="flex items-center gap-3">
|
||||||
onClick={handleSaveTemplate}
|
<button
|
||||||
disabled={!templateName() || items().length === 0}
|
onClick={handleNewTemplate}
|
||||||
class="flex items-center gap-2 px-6 py-2.5 text-sm font-bold text-white bg-blue-600 rounded-xl hover:bg-blue-700 transition-all shadow-premium hover:shadow-premium-hover disabled:opacity-50 disabled:cursor-not-allowed"
|
class="flex items-center gap-2 px-4 py-2.5 text-sm font-bold text-gray-700 bg-white border border-gray-200 rounded-xl hover:bg-gray-50 transition-all shadow-sm"
|
||||||
>
|
>
|
||||||
<Save class="w-4 h-4" />
|
New
|
||||||
Save Template
|
</button>
|
||||||
</button>
|
<button
|
||||||
|
onClick={() => setShowLoadModal(true)}
|
||||||
|
class="flex items-center gap-2 px-4 py-2.5 text-sm font-bold text-blue-600 bg-blue-50 border border-blue-100 rounded-xl hover:bg-blue-100 transition-all shadow-sm"
|
||||||
|
>
|
||||||
|
<FolderOpen class="w-4 h-4" />
|
||||||
|
Load
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={handleSaveTemplate}
|
||||||
|
disabled={!templateName() || items.length === 0}
|
||||||
|
class="flex items-center gap-2 px-6 py-2.5 text-sm font-bold text-white bg-blue-600 rounded-xl hover:bg-blue-700 transition-all shadow-premium hover:shadow-premium-hover disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
|
>
|
||||||
|
<Save class="w-4 h-4" />
|
||||||
|
{templateId() ? 'Update Template' : 'Save Template'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-8">
|
<div class="mb-8">
|
||||||
@@ -90,12 +123,18 @@ const TemplateCreator: Component = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<TemplateItemList
|
<TemplateItemList
|
||||||
items={items()}
|
items={items}
|
||||||
onAddItem={handleAddItem}
|
onAddItem={handleAddItem}
|
||||||
onUpdateItem={handleUpdateItem}
|
onUpdateItem={handleUpdateItem}
|
||||||
onDeleteItem={handleDeleteItem}
|
onDeleteItem={handleDeleteItem}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<TemplateLoadModal
|
||||||
|
show={showLoadModal()}
|
||||||
|
onClose={() => setShowLoadModal(false)}
|
||||||
|
onLoad={handleLoadTemplate}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user