client/src/pages/guards.tsx

@@ -7,7 +7,6 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, Di
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { insertGuardSchema, insertCertificationSchema } from "@shared/schema";
@@ -32,12 +31,8 @@ export default function Guards() {
   const form = useForm<InsertGuard>({
     resolver: zodResolver(insertGuardSchema),
     defaultValues: {
-      firstName: "",
-      lastName: "",
-      email: "",
       badgeNumber: "",
       phoneNumber: "",
-      location: "roccapiemonte",
       isArmed: false,
       hasFireSafety: false,
       hasFirstAid: false,
@@ -49,12 +44,8 @@ export default function Guards() {
   const editForm = useForm<InsertGuard>({
     resolver: zodResolver(insertGuardSchema),
     defaultValues: {
-      firstName: "",
-      lastName: "",
-      email: "",
       badgeNumber: "",
       phoneNumber: "",
-      location: "roccapiemonte",
       isArmed: false,
       hasFireSafety: false,
       hasFirstAid: false,
@@ -120,12 +111,8 @@ export default function Guards() {
   const openEditDialog = (guard: GuardWithCertifications) => {
     setEditingGuard(guard);
     editForm.reset({
-      firstName: guard.firstName || "",
-      lastName: guard.lastName || "",
-      email: guard.email || "",
       badgeNumber: guard.badgeNumber,
       phoneNumber: guard.phoneNumber || "",
-      location: guard.location || "roccapiemonte",
       isArmed: guard.isArmed,
       hasFireSafety: guard.hasFireSafety,
       hasFirstAid: guard.hasFirstAid,
@@ -159,50 +146,6 @@ export default function Guards() {
             </DialogHeader>
             <Form {...form}>
               <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-                <div className="grid grid-cols-2 gap-4">
-                  <FormField
-                    control={form.control}
-                    name="firstName"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>Nome</FormLabel>
-                        <FormControl>
-                          <Input placeholder="Mario" {...field} data-testid="input-first-name" />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="lastName"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>Cognome</FormLabel>
-                        <FormControl>
-                          <Input placeholder="Rossi" {...field} data-testid="input-last-name" />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-                </div>
-
-                <FormField
-                  control={form.control}
-                  name="email"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Email</FormLabel>
-                      <FormControl>
-                        <Input placeholder="mario.rossi@esempio.it" type="email" {...field} value={field.value || ""} data-testid="input-email" />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
                 <FormField
                   control={form.control}
                   name="badgeNumber"
@@ -222,7 +165,7 @@ export default function Guards() {
                   name="phoneNumber"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>Cellulare</FormLabel>
+                      <FormLabel>Telefono</FormLabel>
                       <FormControl>
                         <Input placeholder="+39 123 456 7890" {...field} value={field.value || ""} data-testid="input-phone" />
                       </FormControl>
@@ -231,29 +174,6 @@ export default function Guards() {
                   )}
                 />
 
-                <FormField
-                  control={form.control}
-                  name="location"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Sede di Appartenenza</FormLabel>
-                      <FormControl>
-                        <Select value={field.value} onValueChange={field.onChange}>
-                          <SelectTrigger data-testid="select-location">
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
-                            <SelectItem value="milano">Milano</SelectItem>
-                            <SelectItem value="roma">Roma</SelectItem>
-                          </SelectContent>
-                        </Select>
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
                 <div className="space-y-3">
                   <p className="text-sm font-medium">Competenze</p>
                   <div className="grid grid-cols-2 gap-4">
@@ -342,55 +262,11 @@ export default function Guards() {
           <DialogHeader>
             <DialogTitle>Modifica Guardia</DialogTitle>
             <DialogDescription>
-              Modifica i dati della guardia {editingGuard?.firstName} {editingGuard?.lastName}
+              Modifica i dati della guardia {editingGuard?.user?.firstName} {editingGuard?.user?.lastName}
             </DialogDescription>
           </DialogHeader>
           <Form {...editForm}>
             <form onSubmit={editForm.handleSubmit(onEditSubmit)} className="space-y-4">
-              <div className="grid grid-cols-2 gap-4">
-                <FormField
-                  control={editForm.control}
-                  name="firstName"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Nome</FormLabel>
-                      <FormControl>
-                        <Input placeholder="Mario" {...field} data-testid="input-edit-first-name" />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={editForm.control}
-                  name="lastName"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Cognome</FormLabel>
-                      <FormControl>
-                        <Input placeholder="Rossi" {...field} data-testid="input-edit-last-name" />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
-
-              <FormField
-                control={editForm.control}
-                name="email"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Email</FormLabel>
-                    <FormControl>
-                      <Input placeholder="mario.rossi@esempio.it" type="email" {...field} value={field.value || ""} data-testid="input-edit-email" />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
               <FormField
                 control={editForm.control}
                 name="badgeNumber"
@@ -410,7 +286,7 @@ export default function Guards() {
                 name="phoneNumber"
                 render={({ field }) => (
                   <FormItem>
-                    <FormLabel>Cellulare</FormLabel>
+                    <FormLabel>Telefono</FormLabel>
                     <FormControl>
                       <Input placeholder="+39 123 456 7890" {...field} value={field.value || ""} data-testid="input-edit-phone" />
                     </FormControl>
@@ -419,29 +295,6 @@ export default function Guards() {
                 )}
               />
 
-              <FormField
-                control={editForm.control}
-                name="location"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Sede di Appartenenza</FormLabel>
-                    <FormControl>
-                      <Select value={field.value} onValueChange={field.onChange}>
-                        <SelectTrigger data-testid="select-edit-location">
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
-                          <SelectItem value="milano">Milano</SelectItem>
-                          <SelectItem value="roma">Roma</SelectItem>
-                        </SelectContent>
-                      </Select>
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
               <div className="space-y-3">
                 <p className="text-sm font-medium">Competenze</p>
                 <div className="grid grid-cols-2 gap-4">
@@ -538,20 +391,15 @@ export default function Guards() {
                   <Avatar>
                     <AvatarImage src={guard.user?.profileImageUrl || undefined} />
                     <AvatarFallback>
-                      {guard.firstName?.[0]}{guard.lastName?.[0]}
+                      {guard.user?.firstName?.[0]}{guard.user?.lastName?.[0]}
                     </AvatarFallback>
                   </Avatar>
                   <div className="flex-1 min-w-0">
                     <CardTitle className="text-lg truncate">
-                      {guard.firstName} {guard.lastName}
+                      {guard.user?.firstName} {guard.user?.lastName}
                     </CardTitle>
-                    <CardDescription className="space-y-0.5">
+                    <CardDescription className="font-mono text-xs">
-                      <div className="font-mono text-xs">{guard.badgeNumber}</div>
+                      {guard.badgeNumber}
-                      {guard.email && <div className="text-xs truncate">{guard.email}</div>}
-                      {guard.phoneNumber && <div className="text-xs">{guard.phoneNumber}</div>}
-                      <Badge variant="outline" className="text-xs mt-1">
-                        {guard.location === "roccapiemonte" ? "Roccapiemonte" : guard.location === "milano" ? "Milano" : "Roma"}
-                      </Badge>
                     </CardDescription>
                   </div>
                   <Button

shared/schema.ts

@@ -122,11 +122,6 @@ export const users = pgTable("users", {
 export const guards = pgTable("guards", {
   id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
   userId: varchar("user_id").references(() => users.id),
-  
-  // Anagrafica
-  firstName: varchar("first_name").notNull(),
-  lastName: varchar("last_name").notNull(),
-  email: varchar("email"),
   badgeNumber: varchar("badge_number").notNull().unique(),
   phoneNumber: varchar("phone_number"),
   location: locationEnum("location").notNull().default("roccapiemonte"), // Sede di appartenenza
@@ -649,13 +644,6 @@ export const insertGuardSchema = createInsertSchema(guards).omit({
   id: true,
   createdAt: true,
   updatedAt: true,
-}).extend({
-  firstName: z.string().min(1, "Nome obbligatorio"),
-  lastName: z.string().min(1, "Cognome obbligatorio"),
-  email: z.string().email("Email non valida").optional().or(z.literal("")),
-  badgeNumber: z.string().min(1, "Matricola obbligatoria"),
-  phoneNumber: z.string().optional().or(z.literal("")),
-  location: z.enum(["roccapiemonte", "milano", "roma"]),
 });
 
 export const insertCertificationSchema = createInsertSchema(certifications).omit({

version.json

@@ -1,13 +1,7 @@
 {
-  "version": "1.0.24",
+  "version": "1.0.23",
-  "lastUpdate": "2025-10-18T10:25:34.931Z",
+  "lastUpdate": "2025-10-18T09:20:55.191Z",
   "changelog": [
-    {
-      "version": "1.0.24",
-      "date": "2025-10-18",
-      "type": "patch",
-      "description": "Deployment automatico v1.0.24"
-    },
     {
       "version": "1.0.23",
       "date": "2025-10-18",