From e07525c10480a81cc5e9787a5f0974a46430f3a3 Mon Sep 17 00:00:00 2001 From: David Arranz Date: Wed, 15 Jan 2025 17:48:18 +0100 Subject: [PATCH] https://wopr.rodax-software.com/Uecko/Presupuestador_web/issues/2#issue-211 --- .../editors/BlocksPickerDialog/BlockList.tsx | 130 ------------------ .../editors/QuoteDetailsCardEditor.tsx | 2 +- 2 files changed, 1 insertion(+), 131 deletions(-) diff --git a/client/src/app/quotes/components/editors/BlocksPickerDialog/BlockList.tsx b/client/src/app/quotes/components/editors/BlocksPickerDialog/BlockList.tsx index 24770aa..f6394bc 100644 --- a/client/src/app/quotes/components/editors/BlocksPickerDialog/BlockList.tsx +++ b/client/src/app/quotes/components/editors/BlocksPickerDialog/BlockList.tsx @@ -18,13 +18,6 @@ const blockData: Record = { body: 'Thickness block: 19 mm / Thickness complements: 19 mm.\r\nHanging rods: CHROME/ BLACK\r\nGlass drawer fronts: STRAIGHT / "U" - FLOAT BRONZE C-424 \r\nDrawer handle: xxxxx / Drawers: 4 DE 180 MM.\r\nShoe rack door: YES/NO / Profile finish: BLACK LACQUER / SILVER MATTE\r\nShoe cabinet door glass finish: FLOAT BRONZE C-424\r\nComposed of:', }, - { - id: 2000000097, - code: "CAP_CLA_SEMI_SUSPENDIDO_TITULO_EN", - title: "CLASSIC DRESSER / SEMI-HUNG SUSPENDED / SUSPENDED", - body: "", - }, - { id: 2000000084, code: "CAP_FRE_ARM_ABATIBLE_EN", @@ -32,13 +25,6 @@ const blockData: Record = { body: "Size of opening: 2275x1390 mm.\r\nModel: ARGO / Finish: LACQUER / Colour: TO BE DETERMINED\r\nDoor thickness: 22 or 19 mm\r\nDoor finish: SMOOTH \r\nHandle: KNOB TO BE DETERMINED\r\nHardware finish: CHROME OR ANTHRACITE\r\nPerimetral doorposts: VISIBLE, REMETED OR COMBI TO BE DETERMINED.\r\nNumber of doors: 2 \r\nComposed of:", }, - { - id: 2000000086, - code: "CAP_FRE_ARM_ABATIBLE_TITULO_EN", - title: "FRONT OF THE HINGED WARDROBE", - body: "", - }, - { id: 2000000089, code: "CAP_FRE_ARM_CORREDERA_EN", @@ -46,27 +32,6 @@ const blockData: Record = { body: "Model: PANORAMIC P.O. / Finish: LACQUER / Colour: WHITE\r\nNo. of listers: NO LISTELS / Panels finish: LACQUERED PANEL \r\nHandle: \r\nPerimeter frame: \r\nNº of doors: \r\nINCORPORATED HYDRAULIC BRAKE (not available in lower doors of 650 mm.) OR INCORPORATED MAGNETIC BRAKE. \r\nComposed of:", }, - { - id: 2000000088, - code: "CAP_FRE_ARM_CORREDERA_TITULO_EN", - title: "SLIDING WARDROBE FRONT", - body: "", - }, - - { - id: 2000000113, - code: "CAP_INSTALACION_EN", - title: "Installation Cabinet x", - body: "", - }, - - { - id: 2000000115, - code: "CAP_INSTALACION_TITULO_EN", - title: "INSTALLATION SERVICE - NET PRICE", - body: "", - }, - { id: 2000000092, code: "CAP_INT_ARM_FORRADO_EN", @@ -74,13 +39,6 @@ const blockData: Record = { body: 'Thickness block: 19 mm / Thickness complements: 19 mm.\r\nHanging rods: CHROME/ BLACK\r\nGlass drawer fronts: STRAIGHT / "U" - FLOAT BRONZE C-424 \r\nDrawer handle: xxxxx / Drawers: 4 DE 180 MM.\r\nComposed of:', }, - { - id: 2000000091, - code: "CAP_INT_ARM_FORRADO_TITULO_EN", - title: "INTERIOR OF THE LINED WARDROBE", - body: "", - }, - { id: 2000000109, code: "CAP_INT_EST_CRISTAL_EN", @@ -88,40 +46,12 @@ const blockData: Record = { body: 'Side frame panel finish: BRONZE FLOAT BRONZE GLASS C-424\r\nRear panel finish: BRONZE FLOAT GLASS C-424\r\nComplements finish: MELAMIN / Colour: DENBER OAK M-242\r\nThickness of accessories: 25 mm.\r\nHanging bars: BLACK\r\nGlass drawer fronts: STRAIGHT / "U" - FLOAT BRONZE C-424 \r\nDrawer handle: xxxxx / Drawers: 4 DE 180 MM.\r\nComposed of:', }, - { - id: 2000000107, - code: "CAP_INT_EST_CRISTAL_TITULO_EN", - title: "INSIDE CHARACTERISTICS OF WARDROBE GLASS STRUCTURE", - body: "", - }, - { id: 2000000095, code: "CAP_SEP_AMBIENTES_EN", title: "CHARACTERISTICS SEPARATION OF ROOMS", body: "Size of opening: 2450x3000 mm.\r\nModel: LYN / Finish: ANODISED / Colour: BLACK\r\nNo. of crosspieces: 2 HORIZONTAL CROSSBARS\r\nPanel finish: TRANSPARENT TEMPLARED \r\nHandle: DOUBLE PER DOOR\r\nBrake: DOUBLE PER DOOR (OPENING AND CLOSING)\r\nGuide: VISTA (DOUBLE EMBELLECEDOR)\r\nNumber of panels: 2 SLIDING + 2 FIXED", }, - - { - id: 2000000094, - code: "CAP_SEP_AMBIENTES_TITULO_EN", - title: "SEPARATION OF ROOMS", - body: "", - }, - - { - id: 2000000110, - code: "CAP_SUMINISTRO_EN", - title: "Delivery of material to the customer's home", - body: "", - }, - - { - id: 2000000112, - code: "CAP_SUMINISTRO_TITULO_EN", - title: "SUPPLY SERVICE - NET PRICE", - body: "", - }, ], es: [ { @@ -130,96 +60,36 @@ const blockData: Record = { title: "Acabado: MELAMINA / color: A DETERMINAR", body: "Espesor bloque: 25 mm. / Espesor complementos: 25 mm.\r\nBarras de colgar: CROMO/ NEGRA/ BRONCE\r\nFrentes cristal cajones: RECTO / “U” – FLOAT BRONCE C-424\r\nTirador cajones: FRENTE BAJO / Cajones: 4 DE 180 MM. A DETERMINAR\r\nBaldas deslizantes: X DE 145 MM. A DETERMINAR\r\nCompuesto por:", }, - { - id: 2000000096, - code: "CAP_CLA_SEMI_SUSPENDIDO_TITULO_ES", - title: "CLASICO / SEMISUSPENDIDO / SUSPENDIDO", - body: "", - }, { id: 52, code: "CAP_FRE_ARM_ABATIBLE_ES", title: "CARACTERISTICAS FRENTE DE ARMARIO", body: "Medida de hueco: 2275x1390 mm.\r\nModelo: ARGO / Acabado: LACADO / Color: A DETERMINAR\r\nGrosor hoja: 22 o 19 mm\r\nAcabado de hojas: LISAS\r\nTirador: UÑERO A DETERMINAR\r\nAcabado herrajes: CROMADO O ANTRACITA\r\nJambas perimetrales: VISTAS, REMETIDAS O COMBI A DETERMINAR.\r\nNº de hojas: 2\r\nCompuesto por:", }, - { - id: 2000000085, - code: "CAP_FRE_ARM_ABATIBLE_TITULO_ES", - title: "FRENTE DE ARMARIO ABATIBLE", - body: "", - }, { id: 51, code: "CAP_FRE_ARM_CORREDERA_ES", title: "CARACTERISTICAS FRENTE DE ARMARIO", body: "Medida de Hueco:2440x5180mm.\r\nModelo: PANORAMIC P.O. / Acabado: LACADO / Color: BLANCO\r\nNº de lístelos: SIN LISTELOS / Acabado paneles: PANEL LACADO\r\nTirador:\r\nCerco perimetral: \r\nNº de hojas:\r\nFRENO HIDRAULICO INCORPORADO O FRENO MAGNETICO INCORPORADO\r\nCompuesto por:", }, - { - id: 2000000087, - code: "CAP_FRE_ARM_CORREDERA_TITULO_ES", - title: "FRENTE DE ARMARIO CORREDERA", - body: "", - }, - { - id: 55, - code: "CAP_INSTALACION_ES", - title: "Instalación Armario x", - body: "", - }, - { - id: 2000000114, - code: "CAP_INSTALACION_TITULO_ES", - title: "SERVICIO DE INSTALACIÓN - PRECIO NETO", - body: "", - }, { id: 53, code: "CAP_INT_ARM_FORRADO_ES", title: "CARACTERISTICAS INTERIOR DE ARMARIO", body: "Acabado: MELAMINA / color: A DETERMINAR\r\nEspesor bloque: 19 mm. / Espesor complementos: 19 mm.\r\nBarras de colgar: CROMO/ NEGRA/ BRONCE\r\nFrentes cristal cajones: RECTO / “U” – FLOAT BRONCE C-424\r\nTirador cajones: FRENTE BAJO / Cajones: 4 DE 180 MM. A DETERMINAR\r\nBaldas deslizantes: X DE 145 MM. A DETERMINAR\r\nCompuesto por:", }, - { - id: 2000000090, - code: "CAP_INT_ARM_FORRADO_TITULO_ES", - title: "INTERIOR DE ARMARIO FORRADO", - body: "", - }, { id: 2000000108, code: "CAP_INT_EST_CRISTAL_ES", title: "Acabado bastidores: ANODIZADO NEGRO", body: "Acabado panel bastidores laterales: CRISTAL TEMPLADO FLOAT BRONCE C-424\r\nAcabado trasera: CRISTAL TEMPLADO FLOAT BRONCE C-424\r\nAcabado complementos: MELAMINA / Color: ROBLE DENBER M-242\r\nEspesor complementos: 25 mm.\r\nBarras de colgar: NEGRA\r\nFrentes cristal cajones: RECTO / “U” – FLOAT BRONCE C-424 \r\nTirador cajones: xxxxx / Cajones: 4 DE 180 MM.\r\nCompuesto por:", }, - { - id: 2000000106, - code: "CAP_INT_EST_CRISTAL_TITULO_ES", - title: "INTERIOR DE ARMARIO ESTRUCTURA DE CRISTAL", - body: "", - }, { id: 50, code: "CAP_SEP_AMBIENTES_ES", title: "CARACTERISTICAS SEPARACIÓN DE AMBIENTES", body: "Medida de Hueco: 2450x3000 mm.\r\nModelo: LYN / Acabado: ANODIZADO / Color: NEGRO\r\nNº de travesaños: 2 TRAVESAÑOS HORIZONTALES\r\nAcabado paneles: TRANSPARENTE TEMPLADO \r\nTirador: DOBLE POR PUERTA\r\nFreno: DOBLE POR PUERTA (APERTURA Y CIERRE)\r\nGuía: VISTA (DOBLE EMBELLECEDOR)\r\nNº de hojas: 2 CORREDERAS + 2 FIJOS", }, - { - id: 2000000093, - code: "CAP_SEP_AMBIENTES_TITULO_ES", - title: "SEPARACIÓN DE AMBIENTES", - body: "", - }, - { - id: 56, - code: "CAP_SUMINISTRO_ES", - title: "Entrega de material en domicilio cliente", - body: "", - }, - { - id: 2000000111, - code: "CAP_SUMINISTRO_TITULO_ES", - title: "SERVICIO DE SUMINISTRO - PRECIO NETO", - body: "", - }, ], }; diff --git a/client/src/app/quotes/components/editors/QuoteDetailsCardEditor.tsx b/client/src/app/quotes/components/editors/QuoteDetailsCardEditor.tsx index ff30d01..9b3e927 100644 --- a/client/src/app/quotes/components/editors/QuoteDetailsCardEditor.tsx +++ b/client/src/app/quotes/components/editors/QuoteDetailsCardEditor.tsx @@ -240,7 +240,7 @@ export const QuoteDetailsCardEditor = ({ const handleAppendBlock = useCallback( (block: any) => { fieldActions.append({ - description: block.body, + description: `${block.title}\n${block.body}`, }); toast({ title: t("quotes.blocks_picker_dialog.toast_article_added"),