feat: add Fixed Asset Classes management page with CRUD functionality
This commit is contained in:
@@ -13,7 +13,6 @@ from pydantic import BaseModel, ConfigDict, Field
|
||||
class ClassCreateDTO(BaseModel):
|
||||
"""DTO para crear una clase"""
|
||||
|
||||
client_id: int = Field(..., description="Client key")
|
||||
class_code: str = Field(..., max_length=8, description="Class code")
|
||||
description_es: str = Field(
|
||||
..., max_length=500, description="Description in Spanish (required)"
|
||||
@@ -127,7 +126,6 @@ class ClassResponseDTO(BaseModel):
|
||||
id: int
|
||||
tenant_id: int
|
||||
company_id: int
|
||||
client_id: int
|
||||
class_code: str
|
||||
description_es: Optional[str] = None
|
||||
description_en: Optional[str] = None
|
||||
@@ -164,7 +162,6 @@ class ClassResponseDTOFA(ClassResponseDTO):
|
||||
class ClassBasicDTO(BaseModel):
|
||||
"""DTO para información básica de clase"""
|
||||
|
||||
client_id: int
|
||||
class_code: str
|
||||
description_es: Optional[str] = None
|
||||
description_en: Optional[str] = None
|
||||
@@ -190,7 +187,6 @@ class ClassListDTO(BaseModel):
|
||||
class ClassSearchDTO(BaseModel):
|
||||
"""DTO para búsqueda de clases"""
|
||||
|
||||
client_id: Optional[int] = Field(None, description="Filter by client key")
|
||||
class_code: Optional[str] = Field(None, description="Search by class code")
|
||||
description: Optional[str] = Field(None, description="Search in descriptions")
|
||||
material_key: Optional[str] = Field(None, description="Filter by material key")
|
||||
|
||||
@@ -31,9 +31,6 @@ class Class(Base, TenantScopedMixin, TimestampMixin):
|
||||
__tablename__ = "classes"
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint("id", name="classes_pkey"),
|
||||
ForeignKeyConstraint(
|
||||
["client_id"], ["a76.clients_and_providers.id"], name="fk_classes_client"
|
||||
),
|
||||
ForeignKeyConstraint(
|
||||
["material_key"],
|
||||
["public.material_types.key"],
|
||||
@@ -47,15 +44,13 @@ class Class(Base, TenantScopedMixin, TimestampMixin):
|
||||
UniqueConstraint(
|
||||
"tenant_id",
|
||||
"company_id",
|
||||
"client_id",
|
||||
"class_code",
|
||||
name="ufa_classes_client_id_class_code",
|
||||
name="uq_classes_tenant_company_code",
|
||||
),
|
||||
{"schema": "a76"},
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
client_id: Mapped[int] = mapped_column(Integer)
|
||||
|
||||
# Unique constraint compuesta
|
||||
class_code: Mapped[str] = mapped_column(String(8)) # CLASE
|
||||
@@ -98,11 +93,11 @@ class Class(Base, TenantScopedMixin, TimestampMixin):
|
||||
|
||||
# Inverse relationship with GParts that have this class
|
||||
parts: Mapped[list["Part"]] = relationship(
|
||||
primaryjoin="and_(Class.client_id == Part.client_id, Class.class_code == Part.part_class)",
|
||||
foreign_keys="[Part.client_id, Part.part_class]",
|
||||
primaryjoin="and_(Class.class_code == Part.part_class)",
|
||||
foreign_keys="[Part.part_class]",
|
||||
viewonly=True,
|
||||
back_populates="part_class_info",
|
||||
)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<Class(client_id={self.client_id}, class_code='{self.class_code}', description='{self.description_es}')>"
|
||||
return f"<Class(class_code='{self.class_code}', description='{self.description_es}')>"
|
||||
|
||||
@@ -31,29 +31,6 @@ crud_routes = TenantCRUDRoutes(
|
||||
|
||||
router = crud_routes.router
|
||||
|
||||
|
||||
@router.post(
|
||||
"/seed",
|
||||
summary="Seed Fixed Asset Classes",
|
||||
description="Initialize fixed asset class catalog with default data",
|
||||
)
|
||||
async def seed_classes(
|
||||
company_id: int = Query(..., description="Company ID"),
|
||||
client_id: int = Query(..., description="Client ID"),
|
||||
db: Session = Depends(get_core_db),
|
||||
current_user: Dict[str, Any] = Depends(get_current_user),
|
||||
):
|
||||
"""Seed initial data for fixed asset classes"""
|
||||
tenant_id = validate_access_to_resource(db, company_id, current_user)
|
||||
|
||||
count = ClassService.seed_initial_data(db, tenant_id, company_id, client_id)
|
||||
|
||||
return {
|
||||
"message": f"Successfully created {count} fixed asset classes",
|
||||
"count": count,
|
||||
}
|
||||
|
||||
|
||||
@router.post(
|
||||
"/fa",
|
||||
response_model=ClassResponseDTOFA,
|
||||
|
||||
@@ -46,8 +46,6 @@ class ClassService:
|
||||
)
|
||||
|
||||
if filters:
|
||||
if filters.get("client_id"):
|
||||
query = query.filter(Class.client_id == filters["client_id"])
|
||||
if filters.get("class_code"):
|
||||
query = query.filter(
|
||||
Class.class_code.ilike(f"%{filters['class_code']}%")
|
||||
@@ -106,7 +104,6 @@ class ClassService:
|
||||
existing = db.query(Class).filter(
|
||||
Class.tenant_id == tenant_id,
|
||||
Class.company_id == company_id,
|
||||
Class.client_id == data_dict["client_id"],
|
||||
Class.class_code == data_dict["class_code"]
|
||||
).first()
|
||||
|
||||
@@ -177,16 +174,15 @@ class ClassService:
|
||||
if "class_code" in update_data and update_data["class_code"]:
|
||||
new_code = update_data["class_code"]
|
||||
# Check if another class with this code exists (excluding current class)
|
||||
# The unique constraint is on (tenant_id, company_id, client_id, class_code)
|
||||
# The unique constraint is on (tenant_id, company_id, class_code)
|
||||
existing_class = db.query(Class).filter(
|
||||
Class.class_code == new_code,
|
||||
Class.tenant_id == tenant_id,
|
||||
Class.company_id == company_id,
|
||||
Class.client_id == class_obj.client_id, # Same client
|
||||
Class.id != class_id # Exclude current class
|
||||
).first()
|
||||
|
||||
logger.info(f"Checking for duplicate class_code '{new_code}' for client {class_obj.client_id}")
|
||||
logger.info(f"Checking for duplicate class_code '{new_code}'")
|
||||
if existing_class:
|
||||
logger.warning(f"Duplicate class_code found: {existing_class.id}")
|
||||
raise HTTPException(
|
||||
@@ -265,7 +261,7 @@ class ClassService:
|
||||
|
||||
# Extract base class fields
|
||||
base_fields = {
|
||||
"client_id", "class_code", "description_es", "description_en",
|
||||
"class_code", "description_es", "description_en",
|
||||
"material_key", "unit_of_measure", "fraction", "us_fraction",
|
||||
"sub_key", "physical_review", "iva_exempt_fraction"
|
||||
}
|
||||
@@ -300,7 +296,6 @@ class ClassService:
|
||||
"id": base_class.id,
|
||||
"tenant_id": base_class.tenant_id,
|
||||
"company_id": base_class.company_id,
|
||||
"client_id": base_class.client_id,
|
||||
"class_code": base_class.class_code,
|
||||
"description_es": base_class.description_es,
|
||||
"description_en": base_class.description_en,
|
||||
@@ -352,62 +347,6 @@ class ClassService:
|
||||
detail=f"Error al crear clase de activo fijo: {error_msg}"
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def seed_initial_data(
|
||||
db: Session, tenant_id: int, company_id: int, client_id: int
|
||||
) -> int:
|
||||
"""
|
||||
Seed initial fixed asset class data
|
||||
Returns: number of records created
|
||||
"""
|
||||
from .seed import seed
|
||||
|
||||
created_count = 0
|
||||
for record in seed:
|
||||
(
|
||||
class_code,
|
||||
description_es,
|
||||
description_en,
|
||||
material_key,
|
||||
unit_of_measure,
|
||||
fraction,
|
||||
us_fraction,
|
||||
bom,
|
||||
) = record
|
||||
|
||||
# Check if already exists
|
||||
existing = (
|
||||
db.query(Class)
|
||||
.filter(
|
||||
Class.tenant_id == tenant_id,
|
||||
Class.company_id == company_id,
|
||||
Class.client_id == client_id,
|
||||
Class.class_code == class_code,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not existing:
|
||||
class_obj = Class(
|
||||
tenant_id=tenant_id,
|
||||
company_id=company_id,
|
||||
client_id=client_id,
|
||||
class_code=class_code,
|
||||
description_es=description_es,
|
||||
description_en=description_en,
|
||||
material_key=material_key if material_key else None,
|
||||
unit_of_measure=unit_of_measure if unit_of_measure else None,
|
||||
fraction=fraction if fraction else None,
|
||||
us_fraction=us_fraction if us_fraction else None,
|
||||
)
|
||||
db.add(class_obj)
|
||||
created_count += 1
|
||||
|
||||
if created_count > 0:
|
||||
db.commit()
|
||||
|
||||
return created_count
|
||||
|
||||
def __init__(self, db: Session):
|
||||
self.db = db
|
||||
|
||||
@@ -430,7 +369,6 @@ class ClassService:
|
||||
self.db.query(Class)
|
||||
.filter(
|
||||
and_(
|
||||
Class.client_id == class_data.client_id,
|
||||
Class.class_code == class_data.class_code,
|
||||
)
|
||||
)
|
||||
@@ -440,12 +378,11 @@ class ClassService:
|
||||
if existing:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail=f"Class with client_id '{class_data.client_id}' and class_code '{class_data.class_code}' already exists",
|
||||
detail=f"Class with class_code '{class_data.class_code}' already exists",
|
||||
)
|
||||
|
||||
# Crear clase
|
||||
db_class = Class(
|
||||
client_id=class_data.client_id,
|
||||
class_code=class_data.class_code,
|
||||
description_spanish=class_data.description_spanish,
|
||||
description_english=class_data.description_english,
|
||||
@@ -469,7 +406,7 @@ class ClassService:
|
||||
logger.error(f"IntegrityError creating class: {str(e)}")
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="Class with this client_id and class_code already exists",
|
||||
detail="Class with this class_code already exists",
|
||||
)
|
||||
except HTTPException:
|
||||
raise
|
||||
@@ -478,12 +415,11 @@ class ClassService:
|
||||
logger.error(f"Error creating class: {str(e)}")
|
||||
raise HTTPException(status_code=500, detail="Error creating class")
|
||||
|
||||
def get_class(self, client_id: int, class_code: str) -> Optional[ClassResponseDTO]:
|
||||
def get_class(self, class_code: str) -> Optional[ClassResponseDTO]:
|
||||
"""
|
||||
Obtiene una clase por clave compuesta
|
||||
|
||||
Args:
|
||||
client_id: Clave del cliente
|
||||
class_code: Código de clase
|
||||
|
||||
Returns:
|
||||
@@ -491,7 +427,7 @@ class ClassService:
|
||||
"""
|
||||
class_obj = (
|
||||
self.db.query(Class)
|
||||
.filter(and_(Class.client_id == client_id, Class.class_code == class_code))
|
||||
.filter(and_(Class.class_code == class_code))
|
||||
.first()
|
||||
)
|
||||
|
||||
@@ -520,9 +456,6 @@ class ClassService:
|
||||
|
||||
# Aplicar filtros si se proporcionan
|
||||
if search_params:
|
||||
if search_params.client_id:
|
||||
query = query.filter(Class.client_id == search_params.client_id)
|
||||
|
||||
if search_params.class_code:
|
||||
query = query.filter(
|
||||
Class.class_code.ilike(f"%{search_params.class_code}%")
|
||||
@@ -569,13 +502,12 @@ class ClassService:
|
||||
)
|
||||
|
||||
def update_class(
|
||||
self, client_id: int, class_code: str, class_data: ClassUpdateDTO
|
||||
self, class_code: str, class_data: ClassUpdateDTO
|
||||
) -> Optional[ClassResponseDTO]:
|
||||
"""
|
||||
Actualiza una clase
|
||||
|
||||
Args:
|
||||
client_id: Clave del cliente
|
||||
class_code: Código de clase
|
||||
class_data: Datos a actualizar
|
||||
|
||||
@@ -584,7 +516,7 @@ class ClassService:
|
||||
"""
|
||||
class_obj = (
|
||||
self.db.query(Class)
|
||||
.filter(and_(Class.client_id == client_id, Class.class_code == class_code))
|
||||
.filter(and_(Class.class_code == class_code))
|
||||
.first()
|
||||
)
|
||||
|
||||
@@ -604,15 +536,14 @@ class ClassService:
|
||||
|
||||
except Exception as e:
|
||||
self.db.rollback()
|
||||
logger.error(f"Error updating class {client_id}-{class_code}: {str(e)}")
|
||||
logger.error(f"Error updating class {class_code}: {str(e)}")
|
||||
raise HTTPException(status_code=500, detail="Error updating class")
|
||||
|
||||
def delete_class(self, client_id: int, class_code: str) -> bool:
|
||||
def delete_class(self, class_code: str) -> bool:
|
||||
"""
|
||||
Elimina una clase
|
||||
|
||||
Args:
|
||||
client_id: Clave del cliente
|
||||
class_code: Código de clase
|
||||
|
||||
Returns:
|
||||
@@ -620,7 +551,7 @@ class ClassService:
|
||||
"""
|
||||
class_obj = (
|
||||
self.db.query(Class)
|
||||
.filter(and_(Class.client_id == client_id, Class.class_code == class_code))
|
||||
.filter(and_(Class.class_code == class_code))
|
||||
.first()
|
||||
)
|
||||
|
||||
@@ -633,7 +564,7 @@ class ClassService:
|
||||
return True
|
||||
except Exception as e:
|
||||
self.db.rollback()
|
||||
logger.error(f"Error deleting class {client_id}-{class_code}: {str(e)}")
|
||||
logger.error(f"Error deleting class {class_code}: {str(e)}")
|
||||
raise HTTPException(status_code=500, detail="Error deleting class")
|
||||
|
||||
def search_by_fraction(self, fraction: str) -> List[ClassBasicDTO]:
|
||||
@@ -643,19 +574,6 @@ class ClassService:
|
||||
)
|
||||
return [ClassBasicDTO.model_validate(class_obj) for class_obj in classes]
|
||||
|
||||
def search_by_client(
|
||||
self, client_id: int, skip: int = 0, limit: int = 100
|
||||
) -> List[ClassBasicDTO]:
|
||||
"""Obtiene todas las clases de un cliente específico"""
|
||||
classes = (
|
||||
self.db.query(Class)
|
||||
.filter(Class.client_id == client_id)
|
||||
.offset(skip)
|
||||
.limit(limit)
|
||||
.all()
|
||||
)
|
||||
return [ClassBasicDTO.model_validate(class_obj) for class_obj in classes]
|
||||
|
||||
def search_by_material(self, material_key: str) -> List[ClassBasicDTO]:
|
||||
"""Busca clases por clave de material"""
|
||||
classes = (
|
||||
@@ -678,9 +596,6 @@ class ClassService:
|
||||
"""Obtiene estadísticas básicas de clases"""
|
||||
total_classes = self.db.query(Class).count()
|
||||
|
||||
# Contar por clientes
|
||||
clients_count = self.db.query(Class.client_id).distinct().count()
|
||||
|
||||
# Contar por revisión física
|
||||
physical_review_stats = {}
|
||||
for i in range(3): # Asumiendo valores 0, 1, 2
|
||||
@@ -695,7 +610,6 @@ class ClassService:
|
||||
|
||||
return {
|
||||
"total_classes": total_classes,
|
||||
"clients_with_classes": clients_count,
|
||||
"classes_with_fraction": with_fraction,
|
||||
"classes_with_us_fraction": with_us_fraction,
|
||||
**physical_review_stats,
|
||||
|
||||
@@ -7,7 +7,6 @@ export interface A76Class {
|
||||
id: number;
|
||||
tenant_id: number;
|
||||
company_id: number;
|
||||
client_id: number;
|
||||
class_code: string;
|
||||
description_es: string | null;
|
||||
description_en: string | null;
|
||||
@@ -26,7 +25,6 @@ export interface A76Class {
|
||||
// DTO para crear (match con tu formulario)
|
||||
export interface A76ClassCreate {
|
||||
company_id: number;
|
||||
client_id: number;
|
||||
class_code: string;
|
||||
description_es?: string | null;
|
||||
description_en?: string | null;
|
||||
@@ -94,7 +92,14 @@ export const classesApi = {
|
||||
/**
|
||||
* Inicializar datos semilla de clases de activo fijo
|
||||
*/
|
||||
seed: (company_id: number, client_id: number): Promise<ApiResponse<{ message: string; count: number }>> => {
|
||||
return api.post(`/v1/a76/classes/seed?company_id=${company_id}&client_id=${client_id}`, {});
|
||||
seed: (company_id: number): Promise<ApiResponse<{ message: string; count: number }>> => {
|
||||
return api.post(`/v1/a76/classes/seed?company_id=${company_id}`, {});
|
||||
},
|
||||
|
||||
/**
|
||||
* Crear una clase de activo fijo (crea tanto A76Class como FAClass en una transacción)
|
||||
*/
|
||||
createFA: (data: any, company_id: number): Promise<ApiResponse<any>> => {
|
||||
return api.post(`/v1/a76/classes/fa?company_id=${company_id}`, data);
|
||||
}
|
||||
};
|
||||
@@ -7,7 +7,7 @@
|
||||
import * as Select from "$lib/components/ui/select";
|
||||
import { classesApi, type A76Class, type A76ClassCreate, type A76ClassUpdate } from "$lib/api/dashboard/a76/classes";
|
||||
import { materialTypesApi, type MaterialType } from "$lib/api/dashboard/refrence_data/material_types";
|
||||
import { clientsProvidersApi, type ClientProviderBasic } from "$lib/api/dashboard/a76/clients-providers";
|
||||
import { clientsProvidersApi, type ClientProvider } from "$lib/api/dashboard/a76/clients-providers";
|
||||
import { companyStore } from "$lib/stores/company.svelte";
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
// Estado del formulario
|
||||
let formData = $state({
|
||||
client_id: item?.client_id || null,
|
||||
class_code: item?.class_code || '',
|
||||
description_es: item?.description_es || '',
|
||||
description_en: item?.description_en || '',
|
||||
@@ -44,7 +43,7 @@
|
||||
let error = $state<string | null>(null);
|
||||
let materialTypes = $state<MaterialType[]>([]);
|
||||
let loadingMaterialTypes = $state(false);
|
||||
let clients = $state<ClientProviderBasic[]>([]);
|
||||
let clients = $state<ClientProvider[]>([]);
|
||||
let loadingClients = $state(false);
|
||||
|
||||
// Variables para controlar los selects
|
||||
@@ -73,9 +72,9 @@
|
||||
// Cargar clientes
|
||||
loadingClients = true;
|
||||
try {
|
||||
const response = await clientsProvidersApi.listClients(companyId, 0, 500);
|
||||
const response = await clientsProvidersApi.list(companyId, 1, 500);
|
||||
if (response.data) {
|
||||
clients = response.data;
|
||||
clients = response.data.items;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error loading clients:', e);
|
||||
@@ -88,7 +87,6 @@
|
||||
$effect(() => {
|
||||
if (item) {
|
||||
formData = {
|
||||
client_id: item.client_id,
|
||||
class_code: item.class_code,
|
||||
description_es: item.description_es || '',
|
||||
description_en: item.description_en || '',
|
||||
@@ -107,7 +105,6 @@
|
||||
} else {
|
||||
// Reset para modo crear
|
||||
formData = {
|
||||
client_id: null,
|
||||
class_code: '',
|
||||
description_es: '',
|
||||
description_en: '',
|
||||
@@ -142,12 +139,6 @@
|
||||
error = 'No hay compañía seleccionada';
|
||||
return;
|
||||
}
|
||||
|
||||
// Validaciones básicas
|
||||
if (!formData.client_id) {
|
||||
error = 'Debes seleccionar un cliente';
|
||||
return;
|
||||
}
|
||||
if (!formData.class_code.trim()) {
|
||||
error = 'El código de clase es requerido';
|
||||
return;
|
||||
@@ -178,7 +169,6 @@
|
||||
if (isEdit && item) {
|
||||
// Actualizar
|
||||
const updateData: A76ClassUpdate = {
|
||||
client_id: formData.client_id!,
|
||||
class_code: formData.class_code,
|
||||
description_es: formData.description_es || null,
|
||||
description_en: formData.description_en || null,
|
||||
@@ -192,10 +182,8 @@
|
||||
};
|
||||
response = await classesApi.update(item.id, updateData, companyId);
|
||||
} else {
|
||||
// Crear con el client_id seleccionado
|
||||
const createData: A76ClassCreate = {
|
||||
company_id: companyId,
|
||||
client_id: formData.client_id!,
|
||||
class_code: formData.class_code,
|
||||
description_es: formData.description_es || null,
|
||||
description_en: formData.description_en || null,
|
||||
@@ -303,34 +291,6 @@
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Cliente -->
|
||||
<div class="space-y-2">
|
||||
<Label for="client_id" class="required">Cliente</Label>
|
||||
{#if loadingClients}
|
||||
<div class="flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<div class="h-4 w-4 animate-spin rounded-full border-2 border-primary border-t-transparent"></div>
|
||||
Cargando clientes...
|
||||
</div>
|
||||
{:else if clients.length > 0}
|
||||
<select
|
||||
bind:value={formData.client_id}
|
||||
disabled={loading}
|
||||
class="border-input bg-background selection:bg-primary dark:bg-input/30 selection:text-primary-foreground ring-offset-background placeholder:text-muted-foreground shadow-xs flex h-9 w-full min-w-0 rounded-md border px-3 py-1 text-base outline-none transition-[color,box-shadow] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive"
|
||||
>
|
||||
<option value="">Selecciona un cliente</option>
|
||||
{#each clients as client}
|
||||
<option value={client.id}>
|
||||
{client.name} ({client.rfc})
|
||||
</option>
|
||||
{/each}
|
||||
</select>
|
||||
{:else}
|
||||
<div class="text-sm text-muted-foreground">
|
||||
No hay clientes disponibles
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<!-- Código de Clase -->
|
||||
<div class="space-y-2">
|
||||
<Label for="class_code" class="required">Código de Clase</Label>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,871 @@
|
||||
<script lang="ts">
|
||||
import { Button } from '$lib/components/ui/button';
|
||||
import { Input } from '$lib/components/ui/input';
|
||||
import { Label } from '$lib/components/ui/label';
|
||||
import * as Dialog from '$lib/components/ui/dialog';
|
||||
import FixedAssetClassForm from '$lib/components/dashboard/goods/classes/forms/FixedAssetClassForm.svelte';
|
||||
import { Folder, Save, Plus, RefreshCw } from 'lucide-svelte';
|
||||
import { toast } from 'svelte-sonner';
|
||||
import { classesApi, type A76Class } from '$lib/api/dashboard/a76/classes';
|
||||
import { faClassesApi, type FAClass } from '$lib/api/dashboard/a24/fa_classes';
|
||||
import { companyStore } from '$lib/stores/company.svelte';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
// Tipo extendido que combina A76Class y FAClass
|
||||
interface FixedAssetClassExtended extends A76Class {
|
||||
fa_class_id?: number;
|
||||
depreciation_rate?: number | null;
|
||||
fda_code?: string | null;
|
||||
class_enabled?: boolean | null;
|
||||
}
|
||||
|
||||
// Estado de la lista de clases
|
||||
let classes = $state<FixedAssetClassExtended[]>([]);
|
||||
let selectedClass = $state<FixedAssetClassExtended | null>(null);
|
||||
let isLoading = $state(false);
|
||||
let searchTerm = $state('');
|
||||
let searchDescription = $state('');
|
||||
let searchType = $state('');
|
||||
let searchFraction = $state('');
|
||||
let showInsertDialog = $state(false);
|
||||
let showDeleteDialog = $state(false);
|
||||
let validationError = $state<string>('');
|
||||
let isSaving = $state(false);
|
||||
|
||||
// Estado del formulario
|
||||
let formData = $state({
|
||||
class_code: '',
|
||||
description_es: '',
|
||||
description_en: '',
|
||||
material_key: '',
|
||||
unit_of_measure: '',
|
||||
fraction: '',
|
||||
us_fraction: '',
|
||||
unit_measure_trade: '',
|
||||
bom: ''
|
||||
});
|
||||
|
||||
// Clases filtradas según búsqueda
|
||||
const filteredClasses = $derived(
|
||||
classes.filter((c) => {
|
||||
// Filtro por código de clase
|
||||
const matchesCode = !searchTerm ||
|
||||
c.class_code.toLowerCase().includes(searchTerm.toLowerCase());
|
||||
|
||||
// Filtro por descripción (español o inglés)
|
||||
const matchesDescription = !searchDescription ||
|
||||
(c.description_es?.toLowerCase().includes(searchDescription.toLowerCase()) ?? false) ||
|
||||
(c.description_en?.toLowerCase().includes(searchDescription.toLowerCase()) ?? false);
|
||||
|
||||
// Filtro por tipo de material
|
||||
const matchesType = !searchType ||
|
||||
(c.material_key?.toLowerCase().includes(searchType.toLowerCase()) ?? false);
|
||||
|
||||
// Filtro por fracción arancelaria
|
||||
const matchesFraction = !searchFraction ||
|
||||
(c.fraction?.toLowerCase().includes(searchFraction.toLowerCase()) ?? false);
|
||||
|
||||
return matchesCode && matchesDescription && matchesType && matchesFraction;
|
||||
})
|
||||
);
|
||||
|
||||
// Reactively load classes when company changes
|
||||
$effect(() => {
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
if (companyId) {
|
||||
loadClasses();
|
||||
}
|
||||
});
|
||||
|
||||
async function loadClasses() {
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
if (!companyId) {
|
||||
console.log('No company selected, skipping load');
|
||||
return;
|
||||
}
|
||||
|
||||
isLoading = true;
|
||||
try {
|
||||
console.log('Cargando clases para company:', companyId);
|
||||
const response = await classesApi.list({
|
||||
company_id: companyId,
|
||||
page: 1,
|
||||
page_size: 1000
|
||||
});
|
||||
|
||||
if (!response.data) return;
|
||||
|
||||
// Para cada clase base, intentar cargar sus datos de activo fijo
|
||||
const classesWithFA = await Promise.all(
|
||||
response.data.items.map(async (baseClass) => {
|
||||
try {
|
||||
const faResponse = await faClassesApi.list({
|
||||
company_id: companyId,
|
||||
class_id: baseClass.id,
|
||||
page: 1,
|
||||
page_size: 1
|
||||
});
|
||||
|
||||
const faData = faResponse.data?.items[0];
|
||||
|
||||
return {
|
||||
...baseClass,
|
||||
fa_class_id: faData?.id,
|
||||
depreciation_rate: faData?.depreciation_rate,
|
||||
fda_code: faData?.fda_code,
|
||||
class_enabled: faData?.class_enabled
|
||||
} as FixedAssetClassExtended;
|
||||
} catch (error) {
|
||||
// Si no tiene FA class, solo retornar la clase base
|
||||
return baseClass as FixedAssetClassExtended;
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
classes = classesWithFA;
|
||||
console.log('Clases cargadas:', classes.length);
|
||||
} catch (error) {
|
||||
console.error('Error cargando clases:', error);
|
||||
toast.error('Error al cargar las clases de activo fijo');
|
||||
} finally {
|
||||
isLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
function selectClass(cls: A76Class) {
|
||||
selectedClass = cls;
|
||||
formData = {
|
||||
class_code: cls.class_code,
|
||||
description_es: cls.description_es || '',
|
||||
description_en: cls.description_en || '',
|
||||
material_key: cls.material_key || '',
|
||||
unit_of_measure: cls.unit_of_measure || '',
|
||||
fraction: cls.fraction || '',
|
||||
us_fraction: cls.us_fraction || '',
|
||||
unit_measure_trade: '',
|
||||
bom: ''
|
||||
};
|
||||
}
|
||||
|
||||
async function saveFixedAssetClass(formData: any) {
|
||||
console.log('=== INICIO saveFixedAssetClass ===');
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
|
||||
// CAMBIO: Usar $state.snapshot para obtener una copia real, no reactiva
|
||||
const data = $state.snapshot(formData);
|
||||
console.log('saveFixedAssetClass called with data:', data);
|
||||
|
||||
if (!companyId) {
|
||||
toast.error('No hay empresa seleccionada');
|
||||
throw new Error('No hay empresa seleccionada');
|
||||
}
|
||||
|
||||
// Validar campos obligatorios
|
||||
const missingFields: string[] = [];
|
||||
|
||||
if (!data.class_code?.trim()) {
|
||||
missingFields.push('Código de clase');
|
||||
}
|
||||
if (!data.description_es?.trim()) {
|
||||
missingFields.push('Descripción en español');
|
||||
}
|
||||
if (!data.material_key?.trim()) {
|
||||
missingFields.push('Tipo de activo fijo');
|
||||
}
|
||||
if (!data.unit_of_measure?.trim()) {
|
||||
missingFields.push('Unidad de medida comercial');
|
||||
}
|
||||
if (!data.fraction?.trim()) {
|
||||
missingFields.push('Fracción arancelaria');
|
||||
}
|
||||
|
||||
if (missingFields.length > 0) {
|
||||
const fieldsList = missingFields.join(', ');
|
||||
validationError = `Debe completar los siguientes campos obligatorios: ${fieldsList}`;
|
||||
toast.error(validationError, {
|
||||
duration: 8000
|
||||
});
|
||||
throw new Error(`Campos obligatorios faltantes: ${fieldsList}`);
|
||||
}
|
||||
|
||||
// Limpiar error de validación si todo está bien
|
||||
validationError = '';
|
||||
|
||||
try {
|
||||
// Usar el endpoint combinado /fa que crea ambos registros en una transacción
|
||||
const payload = {
|
||||
class_code: data.class_code.trim(),
|
||||
description_es: data.description_es.trim(),
|
||||
description_en: data.description_en?.trim() || '',
|
||||
material_key: data.material_key.trim(),
|
||||
unit_of_measure: data.unit_of_measure.trim(),
|
||||
fraction: data.fraction.trim(),
|
||||
us_fraction: data.us_fraction?.trim() || '',
|
||||
sub_key: data.sub_key || '',
|
||||
physical_review: data.physical_review ? 1 : 0,
|
||||
iva_exempt_fraction: data.iva_exempt_fraction || '',
|
||||
// FA-specific fields
|
||||
import_tariff_code: data.import_tariff_code || null,
|
||||
import_tariff_type: data.import_tariff_type || null,
|
||||
export_tariff_code: data.export_tariff_code || null,
|
||||
export_tariff_type: data.export_tariff_type || null,
|
||||
depreciation_rate: data.annual_depreciation_rate || null,
|
||||
fda_code: data.fda_key || null,
|
||||
eccn_code: data.eccn_code || null,
|
||||
class_enabled: true
|
||||
};
|
||||
|
||||
console.log('Sending payload:', payload);
|
||||
|
||||
const response = await classesApi.createFA(payload, companyId);
|
||||
|
||||
if (response.error) {
|
||||
console.error('Server error:', response.error);
|
||||
|
||||
// Manejar diferentes formatos de error
|
||||
let errorMessage = response.error;
|
||||
let isDuplicateError = false;
|
||||
|
||||
// Detectar si es un error de código duplicado
|
||||
if (errorMessage.includes('código') && errorMessage.includes('ya está en uso')) {
|
||||
isDuplicateError = true;
|
||||
}
|
||||
|
||||
// Mensaje más específico para errores de duplicado
|
||||
console.log('isDuplicateError:', isDuplicateError);
|
||||
if (isDuplicateError) {
|
||||
validationError = `⚠️ ${errorMessage}\n\nPor favor, cambie el código de clase a uno diferente.`;
|
||||
} else {
|
||||
validationError = `⚠️ ${errorMessage}`;
|
||||
}
|
||||
|
||||
console.log('MENSAJE ASIGNADO (save):', validationError);
|
||||
toast.error(errorMessage, { duration: 8000 });
|
||||
throw new Error(errorMessage);
|
||||
}
|
||||
|
||||
validationError = '';
|
||||
toast.success('✅ Clase de activo fijo creada correctamente');
|
||||
return response.data;
|
||||
|
||||
} catch (error: any) {
|
||||
console.error('Error saving fixed asset class:', error);
|
||||
// El toast ya se mostró arriba, solo re-lanzar el error
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function updateFixedAssetClass(formData: any) {
|
||||
console.log('=== INICIO updateFixedAssetClass ===');
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
|
||||
// CAMBIO 1: Usar $state.snapshot para obtener una copia real, no reactiva
|
||||
// Esto garantiza que aunque el hijo borre el formulario, 'data' mantenga los valores
|
||||
const data = $state.snapshot(formData);
|
||||
|
||||
console.log('updateFixedAssetClass called with snapshot data:', data);
|
||||
|
||||
if (!companyId || !selectedClass) {
|
||||
toast.error('No hay empresa o clase seleccionada');
|
||||
return;
|
||||
}
|
||||
|
||||
// CAMBIO 2: Validar sobre 'data' (la copia muerta)
|
||||
const missingFields: string[] = [];
|
||||
if (!data.class_code?.trim()) missingFields.push('Código de clase');
|
||||
if (!data.description_es?.trim()) missingFields.push('Descripción en español');
|
||||
if (!data.material_key?.trim()) missingFields.push('Tipo de activo fijo');
|
||||
if (!data.unit_of_measure?.trim()) missingFields.push('Unidad de medida comercial');
|
||||
if (!data.fraction?.trim()) missingFields.push('Fracción arancelaria');
|
||||
|
||||
if (missingFields.length > 0) {
|
||||
const errorMsg = `Campos obligatorios faltantes: ${missingFields.join(', ')}`;
|
||||
validationError = `⚠️ ${errorMsg}`;
|
||||
toast.error(errorMsg);
|
||||
// Lanzamos el error para que el 'onSave' del Dialog no cierre la ventana
|
||||
throw new Error(errorMsg);
|
||||
}
|
||||
|
||||
validationError = '';
|
||||
|
||||
try {
|
||||
// CAMBIO 3: Usar siempre 'data' para los payloads
|
||||
const a76Response = await classesApi.update(selectedClass.id, {
|
||||
class_code: data.class_code.trim(),
|
||||
description_es: data.description_es.trim(),
|
||||
description_en: data.description_en?.trim() || '',
|
||||
material_key: data.material_key.trim(),
|
||||
unit_of_measure: data.unit_of_measure.trim(),
|
||||
fraction: data.fraction.trim(),
|
||||
us_fraction: data.us_fraction || '',
|
||||
physical_review: data.physical_review ? 1 : 0,
|
||||
iva_exempt_fraction: data.iva_exempt_fraction || ''
|
||||
}, companyId);
|
||||
|
||||
if (selectedClass.fa_class_id) {
|
||||
await faClassesApi.update(selectedClass.fa_class_id, {
|
||||
depreciation_rate: data.annual_depreciation_rate || null,
|
||||
fda_code: data.fda_key || null
|
||||
}, companyId);
|
||||
} else {
|
||||
await faClassesApi.create({
|
||||
class_id: selectedClass.id,
|
||||
depreciation_rate: data.annual_depreciation_rate || null,
|
||||
fda_code: data.fda_key || null,
|
||||
class_enabled: true
|
||||
}, companyId);
|
||||
}
|
||||
|
||||
toast.success('Clase actualizada correctamente');
|
||||
return { a76: a76Response.data };
|
||||
|
||||
} catch (error: any) {
|
||||
console.error('Error updating fixed asset class:', error);
|
||||
console.error('Error response:', error?.response);
|
||||
console.error('Error response data:', error?.response?.data);
|
||||
console.error('Error response detail:', error?.response?.data?.detail);
|
||||
console.error('Error type:', typeof error?.response?.data?.detail);
|
||||
|
||||
let errorMessage = 'Error al actualizar la clase';
|
||||
let isDuplicateError = false;
|
||||
|
||||
// Extract error message from response
|
||||
if (error?.response?.data?.detail) {
|
||||
if (Array.isArray(error.response.data.detail)) {
|
||||
errorMessage = error.response.data.detail.map((e: any) =>
|
||||
`${e.loc ? e.loc.join(' → ') : ''}: ${e.msg || e}`
|
||||
).join(', ');
|
||||
} else if (typeof error.response.data.detail === 'string') {
|
||||
errorMessage = error.response.data.detail;
|
||||
// Detectar si es un error de código duplicado
|
||||
if (errorMessage.includes('código') && errorMessage.includes('ya está en uso')) {
|
||||
isDuplicateError = true;
|
||||
}
|
||||
} else {
|
||||
errorMessage = JSON.stringify(error.response.data.detail);
|
||||
}
|
||||
} else if (error?.message) {
|
||||
errorMessage = error.message;
|
||||
}
|
||||
|
||||
console.error('Final error message:', errorMessage);
|
||||
console.error('Is duplicate error:', isDuplicateError);
|
||||
|
||||
// Mensaje más específico para errores de duplicado
|
||||
console.log('isDuplicateError:', isDuplicateError);
|
||||
if (isDuplicateError) {
|
||||
validationError = `⚠️ ${errorMessage}\n\nPor favor, cambie el código de clase a uno diferente.`;
|
||||
} else {
|
||||
validationError = `⚠️ ${errorMessage}`;
|
||||
}
|
||||
|
||||
console.log('MENSAJE ASIGNADO (update):', validationError);
|
||||
toast.error(errorMessage, { duration: 8000 });
|
||||
|
||||
console.error('Toast shown, about to throw error');
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
function handleNew() {
|
||||
selectedClass = null;
|
||||
formData = {
|
||||
class_code: '',
|
||||
description_es: '',
|
||||
description_en: '',
|
||||
material_key: '',
|
||||
unit_of_measure: '',
|
||||
fraction: '',
|
||||
us_fraction: '',
|
||||
unit_measure_trade: '',
|
||||
bom: ''
|
||||
};
|
||||
}
|
||||
|
||||
async function handleRefresh() {
|
||||
await loadClasses();
|
||||
toast.success('Clases actualizadas');
|
||||
}
|
||||
|
||||
function handleDelete() {
|
||||
if (!selectedClass) {
|
||||
toast.error('Selecciona una clase para borrar');
|
||||
return;
|
||||
}
|
||||
showDeleteDialog = true;
|
||||
}
|
||||
|
||||
async function confirmDelete() {
|
||||
if (!selectedClass) return;
|
||||
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
if (!companyId) {
|
||||
toast.error('No hay empresa seleccionada');
|
||||
return;
|
||||
}
|
||||
|
||||
const classToDelete = selectedClass;
|
||||
|
||||
try {
|
||||
// El backend ahora elimina automáticamente la extensión FA si existe
|
||||
await classesApi.delete(classToDelete.id, companyId);
|
||||
|
||||
toast.success(`Clase ${classToDelete.class_code} eliminada correctamente`);
|
||||
|
||||
// Recargar lista
|
||||
await loadClasses();
|
||||
|
||||
selectedClass = null;
|
||||
showDeleteDialog = false;
|
||||
formData = {
|
||||
class_code: '',
|
||||
description_es: '',
|
||||
description_en: '',
|
||||
material_key: '',
|
||||
unit_of_measure: '',
|
||||
fraction: '',
|
||||
us_fraction: '',
|
||||
unit_measure_trade: '',
|
||||
bom: ''
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Error deleting class:', error);
|
||||
toast.error('Error al eliminar la clase');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col h-[calc(100vh-4rem)] p-4 gap-4 pb-15">
|
||||
<!-- Título -->
|
||||
<div class="flex flex-col gap-1">
|
||||
<h1 class="text-2xl font-bold">CATALOGO DE CLASES DE ACTIVO FIJO</h1>
|
||||
<p class="text-sm text-muted-foreground">
|
||||
Gestiona y consulta las clases de activo fijo
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Contenedor principal con grid y detalles -->
|
||||
<div class="flex-1 flex gap-4 overflow-hidden">
|
||||
<!-- Panel izquierdo: Grid/Tabla de clases -->
|
||||
<div class="flex-1 flex flex-col gap-4 overflow-hidden">
|
||||
<!-- Sección de Filtros -->
|
||||
<div class="border rounded-lg bg-card">
|
||||
<div class="p-4 space-y-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<h2 class="text-sm font-semibold">Filtros</h2>
|
||||
<span class="text-xs text-muted-foreground">
|
||||
Filtra las clases por diferentes criterios (los filtros se aplican automáticamente)
|
||||
</span>
|
||||
</div>
|
||||
<div class="grid grid-cols-4 gap-4">
|
||||
<div class="space-y-2">
|
||||
<Label class="text-xs">Clase</Label>
|
||||
<Input
|
||||
bind:value={searchTerm}
|
||||
placeholder="Ej: AF001"
|
||||
class="h-9"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-2">
|
||||
<Label class="text-xs">Descripción</Label>
|
||||
<Input
|
||||
bind:value={searchDescription}
|
||||
placeholder="Buscar descripción..."
|
||||
class="h-9"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-2">
|
||||
<Label class="text-xs">Tipo</Label>
|
||||
<Input
|
||||
bind:value={searchType}
|
||||
placeholder="MP, SC, DESP..."
|
||||
class="h-9"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-2">
|
||||
<Label class="text-xs">Fracción</Label>
|
||||
<Input
|
||||
bind:value={searchFraction}
|
||||
placeholder="Fracción arancelaria"
|
||||
class="h-9"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tabla de clases -->
|
||||
<div class="flex-1 flex flex-col border rounded-lg overflow-hidden">
|
||||
<div class="flex items-center justify-between p-3 border-b bg-white dark:bg-muted/50">
|
||||
<h2 class="text-sm font-semibold">Listado de Clases</h2>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-xs text-muted-foreground">
|
||||
Mostrando de {filteredClasses.length} registros
|
||||
</span>
|
||||
<Button variant="outline" size="sm" onclick={handleRefresh}>
|
||||
<RefreshCw class="h-4 w-4 mr-2" />
|
||||
Actualizar
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tabla de clases -->
|
||||
<div class="flex-1 overflow-auto">
|
||||
<table class="w-full text-sm">
|
||||
<thead class="bg-white dark:bg-black text-gray-900 dark:text-white sticky top-0 z-10 border-b">
|
||||
<tr>
|
||||
<th class="px-2 py-2 text-left w-8">
|
||||
<input type="checkbox" class="h-4 w-4" />
|
||||
</th>
|
||||
<th class="px-2 py-2 text-left">Clase</th>
|
||||
<th class="px-2 py-2 text-left">Descripción Español</th>
|
||||
<th class="px-2 py-2 text-left">Descripción Inglés</th>
|
||||
<th class="px-2 py-2 text-left">Tipo</th>
|
||||
<th class="px-2 py-2 text-left">U.M</th>
|
||||
<th class="px-2 py-2 text-left">Fracción</th> <th class="px-2 py-2 text-left">U.M.T.</th> <th class="px-2 py-2 text-left">Fracción US</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#if isLoading}
|
||||
<tr>
|
||||
<td colspan="10" class="text-center py-8 text-muted-foreground">Cargando...</td>
|
||||
</tr>
|
||||
{:else if filteredClasses.length === 0}
|
||||
<tr>
|
||||
<td colspan="10" class="text-center py-8 text-muted-foreground">
|
||||
No hay clases de activo fijo registradas
|
||||
</td>
|
||||
</tr>
|
||||
{:else}
|
||||
{#each filteredClasses as cls (cls.id)}
|
||||
<tr
|
||||
class="border-b cursor-pointer transition-colors {selectedClass?.id ===
|
||||
cls.id
|
||||
? 'bg-gray-300 dark:bg-gray-600'
|
||||
: 'hover:bg-gray-100 dark:hover:bg-gray-700'}"
|
||||
onclick={() => selectClass(cls)}
|
||||
>
|
||||
<td class="px-2 py-1">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={selectedClass?.id === cls.id}
|
||||
class="h-4 w-4"
|
||||
/>
|
||||
</td>
|
||||
<td class="px-2 py-1">
|
||||
<span class="inline-flex items-center rounded-md bg-blue-50 dark:bg-blue-900/30 px-2 py-1 text-xs font-mono font-bold text-blue-700 dark:text-blue-400 border border-blue-200 dark:border-blue-800">
|
||||
{cls.class_code}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-2 py-1 font-medium text-sm">{cls.description_es || ''}</td>
|
||||
<td class="px-2 py-1">{cls.description_en || ''}</td>
|
||||
<td class="px-2 py-1">
|
||||
<span class="px-2 py-0.5 rounded-full text-[10px] font-bold uppercase tracking-wider {cls.material_key === 'MP' ? 'bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400' : cls.material_key === 'SC' ? 'bg-purple-100 dark:bg-purple-900/30 text-purple-700 dark:text-purple-400' : cls.material_key === 'DESP' ? 'bg-amber-100 dark:bg-amber-900/30 text-amber-700 dark:text-amber-400' : 'bg-slate-100 dark:bg-slate-800 text-slate-700 dark:text-slate-400'}">
|
||||
{cls.material_key || ''}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-2 py-1 text-muted-foreground">{cls.unit_of_measure || ''}</td>
|
||||
<td class="px-2 py-1 font-mono text-xs text-orange-600 dark:text-orange-400">{cls.fraction || ''}</td> <td class="px-2 py-1 text-xs text-muted-foreground">-</td> <td class="px-2 py-1">{cls.us_fraction || '-'}</td>
|
||||
</tr>
|
||||
{/each}
|
||||
{/if}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Panel derecho: Detalles y edición -->
|
||||
<div class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden">
|
||||
<div class="p-4 border-b">
|
||||
<p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">Código de Clase</p>
|
||||
<h2 class="text-3xl font-black font-mono tracking-tighter">
|
||||
{formData.class_code || '---'}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div class="flex-1 overflow-auto p-5 space-y-6 bg-card">
|
||||
<div class="space-y-3">
|
||||
<div>
|
||||
<Label class="text-[10px] uppercase text-muted-foreground font-bold">Descripción ES</Label>
|
||||
<p class="text-sm font-semibold leading-tight">{formData.description_es || 'Sin descripción'}</p>
|
||||
</div>
|
||||
<div class="pt-2 border-t border-dashed">
|
||||
<Label class="text-[10px] uppercase text-muted-foreground font-bold">Description EN</Label>
|
||||
<p class="text-sm italic text-muted-foreground">{formData.description_en || 'No translation available'}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-2 gap-4 pt-4 border-t">
|
||||
<div class="space-y-1">
|
||||
<Label class="text-[10px] uppercase text-muted-foreground font-bold">Tipo Activo</Label>
|
||||
<div class="flex items-center gap-2">
|
||||
<Folder class="h-3 w-3 text-blue-500" />
|
||||
<span class="text-sm font-bold">{formData.material_key || '-'}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="space-y-1">
|
||||
<Label class="text-[10px] uppercase text-muted-foreground font-bold">U.M. Com.</Label>
|
||||
<span class="text-sm font-bold">{formData.unit_of_measure || '-'}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="p-3 bg-orange-50 dark:bg-orange-950/20 rounded-lg border border-orange-100 dark:border-orange-900">
|
||||
<Label class="text-[10px] uppercase text-orange-600 dark:text-orange-400 font-bold">Fracción Arancelaria</Label>
|
||||
<p class="text-lg font-mono font-bold text-orange-700 dark:text-orange-300">
|
||||
{formData.fraction || '0000.00.00'}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Footer fijo con botones de acción -->
|
||||
<div class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5]">
|
||||
<div class="px-4 py-4 max-w-[1400px] mx-auto">
|
||||
<!-- Botones de acción -->
|
||||
<div class="flex justify-end gap-2">
|
||||
<Button size="sm" onclick={() => {
|
||||
selectedClass = null;
|
||||
validationError = '';
|
||||
showInsertDialog = true;
|
||||
}}>
|
||||
<Plus class="h-4 w-4 mr-1" />
|
||||
Insertar
|
||||
</Button>
|
||||
<Button variant="outline" size="sm" onclick={() => {
|
||||
if (!selectedClass) {
|
||||
toast.error('Selecciona una clase para editar');
|
||||
return;
|
||||
}
|
||||
validationError = '';
|
||||
showInsertDialog = true;
|
||||
}} disabled={!selectedClass}>Editar</Button>
|
||||
<Button variant="outline" size="sm" onclick={handleDelete} disabled={!selectedClass}>Borrar</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Dialog para Insertar/Editar Clase de Activo Fijo -->
|
||||
<Dialog.Root bind:open={showInsertDialog}>
|
||||
<Dialog.Content class="!max-w-[1600px] !w-[1600px] !h-[90vh] p-0 overflow-hidden flex flex-col">
|
||||
<Dialog.Header class="p-6 pb-4 border-b">
|
||||
<Dialog.Title>{selectedClass ? 'Editar' : 'Nueva'} Clase de Activo Fijo</Dialog.Title>
|
||||
</Dialog.Header>
|
||||
|
||||
<!-- Mensaje de error de validación -->
|
||||
{#if validationError}
|
||||
<div class="mx-6 mt-4 p-4 bg-red-50 border border-red-200 rounded-lg">
|
||||
<div class="flex items-start gap-3">
|
||||
<div class="flex-shrink-0 w-5 h-5 rounded-full bg-red-500 text-white flex items-center justify-center text-sm font-bold mt-0.5">
|
||||
!
|
||||
</div>
|
||||
<div class="flex-1">
|
||||
<h3 class="text-sm font-semibold text-red-800 mb-1">Error de Validación</h3>
|
||||
<p class="text-sm text-red-700 whitespace-pre-line">{validationError}</p>
|
||||
</div>
|
||||
<button
|
||||
onclick={() => validationError = ''}
|
||||
class="flex-shrink-0 text-red-400 hover:text-red-600"
|
||||
aria-label="Cerrar mensaje de error">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="flex-1 overflow-auto p-6">
|
||||
<FixedAssetClassForm
|
||||
initialData={selectedClass}
|
||||
externalError={validationError}
|
||||
onClearError={() => validationError = ''}
|
||||
onSave={async (data: Partial<FixedAssetClassExtended>) => {
|
||||
// Evitar múltiples clics
|
||||
if (isSaving) {
|
||||
console.log('⚠️ Ya está guardando, ignorando clic');
|
||||
return;
|
||||
}
|
||||
isSaving = true;
|
||||
validationError = '';
|
||||
|
||||
console.log('========================================');
|
||||
console.log('=== INICIO ONSAVE ===');
|
||||
console.log('Datos recibidos:', data);
|
||||
console.log('selectedClass:', selectedClass);
|
||||
console.log('========================================');
|
||||
|
||||
try {
|
||||
const cleanData = $state.snapshot(data);
|
||||
const companyId = companyStore.activeCompany?.id;
|
||||
|
||||
if (!companyId) {
|
||||
throw new Error('No hay empresa seleccionada');
|
||||
}
|
||||
|
||||
let response;
|
||||
|
||||
if (selectedClass?.id) {
|
||||
// === ACTUALIZACIÓN ===
|
||||
console.log('🔄 MODO: ACTUALIZACIÓN');
|
||||
console.log('ID de clase:', selectedClass.id);
|
||||
|
||||
response = await classesApi.update(selectedClass.id, {
|
||||
class_code: cleanData.class_code?.trim() || '',
|
||||
description_es: cleanData.description_es?.trim() || '',
|
||||
description_en: cleanData.description_en?.trim() || '',
|
||||
material_key: cleanData.material_key?.trim() || '',
|
||||
unit_of_measure: cleanData.unit_of_measure?.trim() || '',
|
||||
fraction: cleanData.fraction?.trim() || '',
|
||||
us_fraction: cleanData.us_fraction || '',
|
||||
physical_review: cleanData.physical_review ? 1 : 0,
|
||||
iva_exempt_fraction: cleanData.iva_exempt_fraction || ''
|
||||
}, companyId);
|
||||
|
||||
// ¡IMPORTANTE! fetchApi NO lanza excepciones, retorna { error, status }
|
||||
if (response.error) {
|
||||
console.error('❌ Error en respuesta de actualización:', response);
|
||||
throw new Error(response.error);
|
||||
}
|
||||
|
||||
console.log('✅ Actualización exitosa');
|
||||
} else {
|
||||
// === CREACIÓN ===
|
||||
console.log('➕ MODO: CREACIÓN');
|
||||
|
||||
const payload = {
|
||||
class_code: cleanData.class_code?.trim() || '',
|
||||
description_es: cleanData.description_es?.trim() || '',
|
||||
description_en: cleanData.description_en?.trim() || '',
|
||||
material_key: cleanData.material_key?.trim() || '',
|
||||
unit_of_measure: cleanData.unit_of_measure?.trim() || '',
|
||||
fraction: cleanData.fraction?.trim() || '',
|
||||
us_fraction: cleanData.us_fraction?.trim() || '',
|
||||
sub_key: cleanData.sub_key || '',
|
||||
physical_review: cleanData.physical_review ? 1 : 0,
|
||||
iva_exempt_fraction: cleanData.iva_exempt_fraction || '',
|
||||
depreciation_rate: cleanData.depreciation_rate || null,
|
||||
fda_code: cleanData.fda_code || null,
|
||||
class_enabled: true
|
||||
};
|
||||
|
||||
console.log('Payload:', payload);
|
||||
|
||||
response = await classesApi.createFA(payload, companyId);
|
||||
|
||||
if (response.error) {
|
||||
console.error('❌ Error del servidor:', response.error);
|
||||
throw new Error(response.error);
|
||||
}
|
||||
|
||||
console.log('✅ Creación exitosa');
|
||||
}
|
||||
|
||||
// === ÉXITO TOTAL ===
|
||||
console.log('✅ GUARDADO EXITOSO - Cerrando diálogo');
|
||||
const wasUpdate = !!selectedClass?.id;
|
||||
await loadClasses();
|
||||
showInsertDialog = false;
|
||||
selectedClass = null;
|
||||
validationError = '';
|
||||
toast.success(wasUpdate ? 'Clase actualizada correctamente' : 'Clase creada correctamente');
|
||||
|
||||
} catch (error: any) {
|
||||
// === ERROR ===
|
||||
console.error('========================================');
|
||||
console.error('❌ ERROR CAPTURADO');
|
||||
console.error('Error:', error);
|
||||
console.error('Error.response:', error?.response);
|
||||
console.error('Error.response.data:', error?.response?.data);
|
||||
console.error('Error.detail:', error?.detail);
|
||||
console.error('========================================');
|
||||
|
||||
let errorMsg = 'Error al guardar';
|
||||
|
||||
// Primero intentar con error.detail (fetch directo)
|
||||
if (error?.detail) {
|
||||
if (typeof error.detail === 'string') {
|
||||
errorMsg = error.detail;
|
||||
} else if (Array.isArray(error.detail)) {
|
||||
errorMsg = error.detail.map((e: any) => e.msg || e).join(', ');
|
||||
}
|
||||
}
|
||||
// Luego con error.response.data.detail (axios)
|
||||
else if (error?.response?.data?.detail) {
|
||||
if (typeof error.response.data.detail === 'string') {
|
||||
errorMsg = error.response.data.detail;
|
||||
} else if (Array.isArray(error.response.data.detail)) {
|
||||
errorMsg = error.response.data.detail.map((e: any) => e.msg || e).join(', ');
|
||||
}
|
||||
}
|
||||
// Por último el mensaje genérico
|
||||
else if (error?.message) {
|
||||
errorMsg = error.message;
|
||||
}
|
||||
|
||||
console.error('📝 Mensaje de error extraído:', errorMsg);
|
||||
|
||||
validationError = errorMsg;
|
||||
console.error('🔴 validationError asignado:', validationError);
|
||||
console.error('🔴 showInsertDialog permanece:', showInsertDialog);
|
||||
console.error('========================================');
|
||||
|
||||
// NO cerramos el diálogo, permanece abierto
|
||||
} finally {
|
||||
isSaving = false;
|
||||
console.log('✅ isSaving = false');
|
||||
}
|
||||
}}
|
||||
onCancel={() => {
|
||||
showInsertDialog = false;
|
||||
selectedClass = null;
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<Dialog.Footer class="p-6 pt-4 border-t">
|
||||
<Button variant="outline" onclick={() => {
|
||||
validationError = '';
|
||||
showInsertDialog = false;
|
||||
selectedClass = null;
|
||||
}}>Cancelar</Button>
|
||||
<Button type="button" disabled={isSaving} onclick={() => {
|
||||
// Trigger the form's handleSave by getting a reference via DOM
|
||||
const saveEvent = new CustomEvent('save-form');
|
||||
document.dispatchEvent(saveEvent);
|
||||
}}>
|
||||
{#if isSaving}
|
||||
<RefreshCw class="h-4 w-4 mr-2 animate-spin" />
|
||||
Guardando...
|
||||
{:else}
|
||||
<Save class="h-4 w-4 mr-2" />
|
||||
Guardar
|
||||
{/if}
|
||||
</Button>
|
||||
</Dialog.Footer>
|
||||
</Dialog.Content>
|
||||
</Dialog.Root>
|
||||
|
||||
<!-- Dialog de confirmación para borrar -->
|
||||
<Dialog.Root bind:open={showDeleteDialog}>
|
||||
<Dialog.Content class="max-w-md">
|
||||
<Dialog.Header>
|
||||
<Dialog.Title>¿Confirmar eliminación?</Dialog.Title>
|
||||
</Dialog.Header>
|
||||
<div class="py-4">
|
||||
<p class="text-sm text-muted-foreground">
|
||||
¿Estás seguro que deseas eliminar la clase <strong class="text-foreground">{selectedClass?.class_code}</strong>?
|
||||
</p>
|
||||
<p class="text-sm text-muted-foreground mt-2">
|
||||
{selectedClass?.description_es}
|
||||
</p>
|
||||
<p class="text-sm text-destructive mt-4">
|
||||
Esta acción no se puede deshacer.
|
||||
</p>
|
||||
</div>
|
||||
<Dialog.Footer>
|
||||
<Button variant="outline" onclick={() => showDeleteDialog = false}>Cancelar</Button>
|
||||
<Button variant="destructive" onclick={confirmDelete}>Eliminar</Button>
|
||||
</Dialog.Footer>
|
||||
</Dialog.Content>
|
||||
</Dialog.Root>
|
||||
Reference in New Issue
Block a user