From 19d273ff4914f4c6be66d3c4a2de3d70bb011f41 Mon Sep 17 00:00:00 2001
From: Marco Pedone <m.pedone98@gmail.com>
Date: Wed, 27 Aug 2025 12:33:14 +0200
Subject: [PATCH] fix: enhance pricing component formatting and update sorting
 logic in PrezzarioTable

---
 apps/infoalloggi/src/components/prezzi.tsx    |  6 +++-
 .../components/tables/prezziario-tables.tsx   |  2 +-
 apps/infoalloggi/src/forms/FormPrezzo.tsx     |  5 +++-
 .../src/server/api/routers/prezziario.ts      |  3 +-
 .../controllers/prezziario.controller.ts      | 18 ------------
 .../src/server/services/prezziario.service.ts | 28 +++++++++++++++++--
 6 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100644 apps/infoalloggi/src/server/controllers/prezziario.controller.ts

diff --git a/apps/infoalloggi/src/components/prezzi.tsx b/apps/infoalloggi/src/components/prezzi.tsx
index 6589229..671452a 100644
--- a/apps/infoalloggi/src/components/prezzi.tsx
+++ b/apps/infoalloggi/src/components/prezzi.tsx
@@ -172,7 +172,11 @@ export const PricingComponent = ({
               className="xs:text-3xl text-2xl font-semibold sm:text-6xl"
               data-role="amount"
             >
-              <AnimatedNumber value={secondPayment} format={customFormat} />
+              <AnimatedNumber
+                value={secondPayment}
+                format={customFormat}
+                precision={secondPayment % 1 === 0 ? 0 : 2}
+              />
             </p>
           </div>
 
diff --git a/apps/infoalloggi/src/components/tables/prezziario-tables.tsx b/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
index b133a88..49e4336 100644
--- a/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
+++ b/apps/infoalloggi/src/components/tables/prezziario-tables.tsx
@@ -207,7 +207,7 @@ export const PrezzarioTable = ({
         pinnedFiltri={pinnedFiltri}
         searchColumn={searchFiltro}
         columns_titles={columns_titles}
-        defaultSort={[{ desc: false, id: "categoria" }]}
+        defaultSort={[{ desc: false, id: "id" }]}
       />
     </div>
   );
diff --git a/apps/infoalloggi/src/forms/FormPrezzo.tsx b/apps/infoalloggi/src/forms/FormPrezzo.tsx
index ba93315..3ccf1c8 100644
--- a/apps/infoalloggi/src/forms/FormPrezzo.tsx
+++ b/apps/infoalloggi/src/forms/FormPrezzo.tsx
@@ -26,6 +26,7 @@ import {
   SelectValue,
 } from "~/components/ui/select";
 import { useEffect } from "react";
+import { DevTool } from "@hookform/devtools";
 
 type FormPrezzoProps = {
   initialValues: Prezziario | null;
@@ -130,6 +131,7 @@ export const FormPrezzo = ({
   return (
     <>
       <Form {...form}>
+        <DevTool control={form.control} />
         <form
           onSubmit={form.handleSubmit(onSubmit)}
           className="space-y-4 px-0.5"
@@ -237,10 +239,11 @@ export const FormPrezzo = ({
                   <Input
                     {...field}
                     type="number"
+                    step={0.01}
                     id="prezzo"
                     value={Number(field.value) / 100}
                     onChange={(v) => {
-                      field.onChange(parseInt(v.target.value) * 100);
+                      field.onChange(parseFloat(v.target.value) * 100);
                     }}
                   />
                 </FormControl>
diff --git a/apps/infoalloggi/src/server/api/routers/prezziario.ts b/apps/infoalloggi/src/server/api/routers/prezziario.ts
index adfdf75..eb523d4 100644
--- a/apps/infoalloggi/src/server/api/routers/prezziario.ts
+++ b/apps/infoalloggi/src/server/api/routers/prezziario.ts
@@ -9,12 +9,13 @@ import {
   createTRPCRouter,
   publicProcedure,
 } from "~/server/api/trpc";
-import { getPrezziarioByIdHandler } from "~/server/controllers/prezziario.controller";
+
 import { db } from "~/server/db";
 import {
   addPrezziario,
   deletePrezziario,
   getPrezziario,
+  getPrezziarioByIdHandler,
   getPrezziarioByTipologia,
   getPrezziarioConsulenza,
   updatePrezziario,
diff --git a/apps/infoalloggi/src/server/controllers/prezziario.controller.ts b/apps/infoalloggi/src/server/controllers/prezziario.controller.ts
deleted file mode 100644
index ed7cab7..0000000
--- a/apps/infoalloggi/src/server/controllers/prezziario.controller.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { PrezziarioIdprezziario } from "~/schemas/public/Prezziario";
-import type { Querier } from "~/server/db";
-
-export const getPrezziarioByIdHandler = async ({
-  db,
-  input,
-}: {
-  db: Querier;
-  input: {
-    idprezziario: PrezziarioIdprezziario;
-  };
-}) => {
-  return await db
-    .selectFrom("prezziario")
-    .selectAll()
-    .where("prezziario.idprezziario", "=", input.idprezziario)
-    .executeTakeFirst();
-};
diff --git a/apps/infoalloggi/src/server/services/prezziario.service.ts b/apps/infoalloggi/src/server/services/prezziario.service.ts
index 4670deb..743c026 100644
--- a/apps/infoalloggi/src/server/services/prezziario.service.ts
+++ b/apps/infoalloggi/src/server/services/prezziario.service.ts
@@ -7,6 +7,7 @@ import type {
 import { db, type Querier } from "~/server/db";
 import { TRPCError } from "@trpc/server";
 import TipologiaPosizioneEnum from "~/schemas/public/TipologiaPosizioneEnum";
+import { sql } from "kysely";
 
 export const getPrezziario = async () => {
   try {
@@ -14,7 +15,7 @@ export const getPrezziario = async () => {
       .selectFrom("prezziario")
       .selectAll()
       .where("isActive", "=", true)
-      .orderBy("prezzo_cent", "asc")
+      .orderBy("idprezziario", "asc")
       .execute();
   } catch (error) {
     throw new TRPCError({
@@ -24,6 +25,22 @@ export const getPrezziario = async () => {
   }
 };
 
+export const getPrezziarioByIdHandler = async ({
+  db,
+  input,
+}: {
+  db: Querier;
+  input: {
+    idprezziario: PrezziarioIdprezziario;
+  };
+}) => {
+  return await db
+    .selectFrom("prezziario")
+    .selectAll()
+    .where("prezziario.idprezziario", "=", input.idprezziario)
+    .executeTakeFirst();
+};
+
 export const addPrezziario = async ({
   db,
   input,
@@ -139,7 +156,14 @@ export const getPrezziarioByTipologia = async ({
       } else if (tipologia == TipologiaPosizioneEnum.Stabile) {
         qry2 = qry2.where("isStabile", "=", true);
       }
-      const saldi = await qry2.orderBy("prezzo_cent", "asc").execute();
+      // query with order by numeric part of idprezziario, handling '+' at the end
+      const saldi = await qry2
+        .orderBy(
+          sql`CAST(REGEXP_REPLACE(idprezziario, '[^0-9]+', '', 'g') AS INTEGER),
+  CASE WHEN idprezziario LIKE '%+%' THEN 1 ELSE 0 END`,
+        )
+        .execute();
+      //const saldi = await qry2.orderBy("prezzo_cent", "asc").execute();
 
       if (!saldi) {
         throw new TRPCError({