Rewrite frontend, added rooms, voltage selection per project, startet with todos

src/db/migrations/0001_global_devices.sql

@@ -0,0 +1,12 @@
+CREATE TABLE `global_devices` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`category` text,
+	`quantity` integer NOT NULL,
+	`installed_power_per_unit_kw` real NOT NULL,
+	`demand_factor` real NOT NULL,
+	`voltage_v` real,
+	`phase_count` integer,
+	`power_factor` real,
+	`note` text
+);

src/db/migrations/0002_project_voltage_defaults.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `projects` ADD COLUMN `single_phase_voltage_v` integer NOT NULL DEFAULT 230;
+--> statement-breakpoint
+ALTER TABLE `projects` ADD COLUMN `three_phase_voltage_v` integer NOT NULL DEFAULT 400;

src/db/migrations/0003_project_floors_rooms.sql

@@ -0,0 +1,19 @@
+CREATE TABLE `floors` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`name` text NOT NULL,
+	`sort_order` integer NOT NULL DEFAULT 0,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `rooms` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`floor_id` text,
+	`room_number` text NOT NULL,
+	`room_name` text NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`floor_id`) REFERENCES `floors`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `room_id` text REFERENCES `rooms`(`id`) ON UPDATE no action ON DELETE set null;

src/db/migrations/0004_circuit_lists_and_entry_fields.sql

@@ -0,0 +1,44 @@
+CREATE TABLE `circuit_lists` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`distribution_board_id` text NOT NULL,
+	`name` text NOT NULL,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`distribution_board_id`) REFERENCES `distribution_boards`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `circuit_lists_distribution_board_id_unique` ON `circuit_lists` (`distribution_board_id`);
+--> statement-breakpoint
+INSERT INTO `circuit_lists` (`id`, `project_id`, `distribution_board_id`, `name`)
+SELECT `id`, `project_id`, `id`, `name` || ' Stromkreisliste'
+FROM `distribution_boards`;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `circuit_list_id` text REFERENCES `circuit_lists`(`id`) ON UPDATE no action ON DELETE set null;
+--> statement-breakpoint
+UPDATE `consumers` SET `circuit_list_id` = `distribution_board_id` WHERE `distribution_board_id` IS NOT NULL;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `circuit_number` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `description` text;
+--> statement-breakpoint
+UPDATE `consumers` SET `description` = `name` WHERE `description` IS NULL;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `device_type` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `phase_type` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `trade_or_cost_group` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `group_name` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `protection_type` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `protection_rated_current` real;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `protection_characteristic` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `cable_type` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `cable_cross_section` text;
+--> statement-breakpoint
+ALTER TABLE `consumers` ADD COLUMN `comment` text;

src/db/migrations/0005_project_devices.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `project_devices` (
+	`id` text PRIMARY KEY NOT NULL,
+	`project_id` text NOT NULL,
+	`name` text NOT NULL,
+	`category` text,
+	`quantity` integer NOT NULL,
+	`installed_power_per_unit_kw` real NOT NULL,
+	`demand_factor` real NOT NULL,
+	`voltage_v` real,
+	`phase_count` integer,
+	`power_factor` real,
+	`note` text,
+	FOREIGN KEY (`project_id`) REFERENCES `projects`(`id`) ON UPDATE no action ON DELETE cascade
+);

src/db/migrations/meta/_journal.json

@@ -8,6 +8,41 @@
       "when": 1777565414148,
       "tag": "0000_bizarre_colossus",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1777577000000,
+      "tag": "0001_global_devices",
+      "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1777580000000,
+      "tag": "0002_project_voltage_defaults",
+      "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1777589000000,
+      "tag": "0003_project_floors_rooms",
+      "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1777594000000,
+      "tag": "0004_circuit_lists_and_entry_fields",
+      "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1777597000000,
+      "tag": "0005_project_devices",
+      "breakpoints": true
     }
   ]
-}
+}

src/db/repositories/circuit-list.repository.ts

@@ -0,0 +1,56 @@
+import { and, eq } from "drizzle-orm";
+import { db } from "../client.js";
+import { circuitLists } from "../schema/circuit-lists.js";
+
+export class CircuitListRepository {
+  async listByProject(projectId: string) {
+    return db.select().from(circuitLists).where(eq(circuitLists.projectId, projectId));
+  }
+
+  async createForDistributionBoard(input: {
+    projectId: string;
+    distributionBoardId: string;
+    name: string;
+  }) {
+    const entry = {
+      id: input.distributionBoardId,
+      projectId: input.projectId,
+      distributionBoardId: input.distributionBoardId,
+      name: input.name,
+    };
+    await db.insert(circuitLists).values(entry);
+    return entry;
+  }
+
+  async findByDistributionBoardId(projectId: string, distributionBoardId: string) {
+    const [row] = await db
+      .select()
+      .from(circuitLists)
+      .where(
+        and(
+          eq(circuitLists.projectId, projectId),
+          eq(circuitLists.distributionBoardId, distributionBoardId)
+        )
+      )
+      .limit(1);
+    return row ?? null;
+  }
+
+  async existsInProject(projectId: string, circuitListId: string) {
+    const [row] = await db
+      .select({ id: circuitLists.id })
+      .from(circuitLists)
+      .where(and(eq(circuitLists.projectId, projectId), eq(circuitLists.id, circuitListId)))
+      .limit(1);
+    return Boolean(row);
+  }
+
+  async findById(projectId: string, circuitListId: string) {
+    const [row] = await db
+      .select()
+      .from(circuitLists)
+      .where(and(eq(circuitLists.projectId, projectId), eq(circuitLists.id, circuitListId)))
+      .limit(1);
+    return row ?? null;
+  }
+}

src/db/repositories/consumer.repository.ts

@@ -18,8 +18,22 @@ export class ConsumerRepository {
       id,
       projectId: input.projectId,
       distributionBoardId: input.distributionBoardId ?? null,
+      circuitListId: input.circuitListId ?? null,
+      roomId: input.roomId ?? null,
+      circuitNumber: input.circuitNumber ?? null,
+      description: input.description ?? null,
       name: input.name,
       category: input.category ?? null,
+      deviceType: input.deviceType ?? null,
+      phaseType: input.phaseType ?? null,
+      tradeOrCostGroup: input.tradeOrCostGroup ?? null,
+      group: input.group ?? null,
+      protectionType: input.protectionType ?? null,
+      protectionRatedCurrent: input.protectionRatedCurrent ?? null,
+      protectionCharacteristic: input.protectionCharacteristic ?? null,
+      cableType: input.cableType ?? null,
+      cableCrossSection: input.cableCrossSection ?? null,
+      comment: input.comment ?? null,
       quantity: input.quantity,
       installedPowerPerUnitKw: input.installedPowerPerUnitKw,
       demandFactor: input.demandFactor,
@@ -37,8 +51,22 @@ export class ConsumerRepository {
       .set({
         projectId: input.projectId,
         distributionBoardId: input.distributionBoardId ?? null,
+        circuitListId: input.circuitListId ?? null,
+        roomId: input.roomId ?? null,
+        circuitNumber: input.circuitNumber ?? null,
+        description: input.description ?? null,
         name: input.name,
         category: input.category ?? null,
+        deviceType: input.deviceType ?? null,
+        phaseType: input.phaseType ?? null,
+        tradeOrCostGroup: input.tradeOrCostGroup ?? null,
+        group: input.group ?? null,
+        protectionType: input.protectionType ?? null,
+        protectionRatedCurrent: input.protectionRatedCurrent ?? null,
+        protectionCharacteristic: input.protectionCharacteristic ?? null,
+        cableType: input.cableType ?? null,
+        cableCrossSection: input.cableCrossSection ?? null,
+        comment: input.comment ?? null,
         quantity: input.quantity,
         installedPowerPerUnitKw: input.installedPowerPerUnitKw,
         demandFactor: input.demandFactor,

src/db/repositories/floor.repository.ts

@@ -0,0 +1,36 @@
+import crypto from "node:crypto";
+import { and, asc, eq } from "drizzle-orm";
+import { db } from "../client.js";
+import { floors } from "../schema/floors.js";
+
+export class FloorRepository {
+  async listByProject(projectId: string) {
+    return db
+      .select()
+      .from(floors)
+      .where(eq(floors.projectId, projectId))
+      .orderBy(asc(floors.sortOrder), asc(floors.name));
+  }
+
+  async create(projectId: string, name: string) {
+    const id = crypto.randomUUID();
+    const existing = await this.listByProject(projectId);
+    const floor = {
+      id,
+      projectId,
+      name,
+      sortOrder: existing.length,
+    };
+    await db.insert(floors).values(floor);
+    return floor;
+  }
+
+  async existsInProject(projectId: string, floorId: string) {
+    const [row] = await db
+      .select({ id: floors.id })
+      .from(floors)
+      .where(and(eq(floors.projectId, projectId), eq(floors.id, floorId)))
+      .limit(1);
+    return Boolean(row);
+  }
+}

src/db/repositories/global-device.repository.ts

@@ -0,0 +1,57 @@
+import crypto from "node:crypto";
+import { eq } from "drizzle-orm";
+import { db } from "../client.js";
+import { globalDevices } from "../schema/global-devices.js";
+import type {
+  CreateGlobalDeviceInput,
+  UpdateGlobalDeviceInput,
+} from "../../shared/validation/global-device.schemas.js";
+
+export class GlobalDeviceRepository {
+  async list() {
+    return db.select().from(globalDevices);
+  }
+
+  async create(input: CreateGlobalDeviceInput) {
+    const id = crypto.randomUUID();
+    await db.insert(globalDevices).values({
+      id,
+      name: input.name,
+      category: input.category ?? null,
+      quantity: input.quantity,
+      installedPowerPerUnitKw: input.installedPowerPerUnitKw,
+      demandFactor: input.demandFactor,
+      voltageV: input.voltageV ?? null,
+      phaseCount: input.phaseCount ?? null,
+      powerFactor: input.powerFactor ?? null,
+      note: input.note ?? null,
+    });
+    return { id, ...input };
+  }
+
+  async update(globalDeviceId: string, input: UpdateGlobalDeviceInput) {
+    await db
+      .update(globalDevices)
+      .set({
+        name: input.name,
+        category: input.category ?? null,
+        quantity: input.quantity,
+        installedPowerPerUnitKw: input.installedPowerPerUnitKw,
+        demandFactor: input.demandFactor,
+        voltageV: input.voltageV ?? null,
+        phaseCount: input.phaseCount ?? null,
+        powerFactor: input.powerFactor ?? null,
+        note: input.note ?? null,
+      })
+      .where(eq(globalDevices.id, globalDeviceId));
+  }
+
+  async findById(globalDeviceId: string) {
+    const [row] = await db.select().from(globalDevices).where(eq(globalDevices.id, globalDeviceId)).limit(1);
+    return row ?? null;
+  }
+
+  async delete(globalDeviceId: string) {
+    await db.delete(globalDevices).where(eq(globalDevices.id, globalDeviceId));
+  }
+}

src/db/repositories/project-device.repository.ts

@@ -0,0 +1,70 @@
+import crypto from "node:crypto";
+import { and, eq } from "drizzle-orm";
+import { db } from "../client.js";
+import { projectDevices } from "../schema/project-devices.js";
+import type {
+  CreateProjectDeviceInput,
+  UpdateProjectDeviceInput,
+} from "../../shared/validation/project-device.schemas.js";
+
+export class ProjectDeviceRepository {
+  async listByProject(projectId: string) {
+    return db.select().from(projectDevices).where(eq(projectDevices.projectId, projectId));
+  }
+
+  async create(projectId: string, input: CreateProjectDeviceInput) {
+    const id = crypto.randomUUID();
+    await db.insert(projectDevices).values({
+      id,
+      projectId,
+      name: input.name,
+      category: input.category ?? null,
+      quantity: input.quantity,
+      installedPowerPerUnitKw: input.installedPowerPerUnitKw,
+      demandFactor: input.demandFactor,
+      voltageV: input.voltageV ?? null,
+      phaseCount: input.phaseCount ?? null,
+      powerFactor: input.powerFactor ?? null,
+      note: input.note ?? null,
+    });
+    return { id, projectId, ...input };
+  }
+
+  async findById(projectId: string, projectDeviceId: string) {
+    const [row] = await db
+      .select()
+      .from(projectDevices)
+      .where(
+        and(eq(projectDevices.id, projectDeviceId), eq(projectDevices.projectId, projectId))
+      )
+      .limit(1);
+    return row ?? null;
+  }
+
+  async update(projectId: string, projectDeviceId: string, input: UpdateProjectDeviceInput) {
+    await db
+      .update(projectDevices)
+      .set({
+        name: input.name,
+        category: input.category ?? null,
+        quantity: input.quantity,
+        installedPowerPerUnitKw: input.installedPowerPerUnitKw,
+        demandFactor: input.demandFactor,
+        voltageV: input.voltageV ?? null,
+        phaseCount: input.phaseCount ?? null,
+        powerFactor: input.powerFactor ?? null,
+        note: input.note ?? null,
+      })
+      .where(
+        and(eq(projectDevices.id, projectDeviceId), eq(projectDevices.projectId, projectId))
+      );
+  }
+
+  async delete(projectId: string, projectDeviceId: string) {
+    await db
+      .delete(projectDevices)
+      .where(
+        and(eq(projectDevices.id, projectDeviceId), eq(projectDevices.projectId, projectId))
+      );
+  }
+}

src/db/repositories/project.repository.ts

@@ -2,20 +2,44 @@ import crypto from "node:crypto";
 import { eq } from "drizzle-orm";
 import { db } from "../client.js";
 import { projects } from "../schema/projects.js";
+import type {
+  CreateProjectInput,
+  UpdateProjectSettingsInput,
+} from "../../shared/validation/consumer.schemas.js";
 
 export class ProjectRepository {
   async list() {
     return db.select().from(projects);
   }
 
-  async create(name: string) {
+  async create(input: CreateProjectInput) {
     const id = crypto.randomUUID();
-    await db.insert(projects).values({ id, name });
-    return { id, name };
+    const project = {
+      id,
+      name: input.name,
+      singlePhaseVoltageV: input.singlePhaseVoltageV ?? 230,
+      threePhaseVoltageV: input.threePhaseVoltageV ?? 400,
+    };
+    await db.insert(projects).values(project);
+    return project;
+  }
+
+  async findById(projectId: string) {
+    const [row] = await db.select().from(projects).where(eq(projects.id, projectId)).limit(1);
+    return row ?? null;
+  }
+
+  async updateSettings(projectId: string, input: UpdateProjectSettingsInput) {
+    await db
+      .update(projects)
+      .set({
+        singlePhaseVoltageV: input.singlePhaseVoltageV,
+        threePhaseVoltageV: input.threePhaseVoltageV,
+      })
+      .where(eq(projects.id, projectId));
   }
 
   async delete(projectId: string) {
     await db.delete(projects).where(eq(projects.id, projectId));
   }
 }
-

src/db/repositories/room.repository.ts

@@ -0,0 +1,42 @@
+import crypto from "node:crypto";
+import { and, asc, eq } from "drizzle-orm";
+import { db } from "../client.js";
+import { rooms } from "../schema/rooms.js";
+import type { CreateRoomInput } from "../../shared/validation/consumer.schemas.js";
+
+export class RoomRepository {
+  async listByProject(projectId: string) {
+    return db
+      .select()
+      .from(rooms)
+      .where(eq(rooms.projectId, projectId))
+      .orderBy(asc(rooms.roomNumber), asc(rooms.roomName));
+  }
+
+  async create(projectId: string, input: CreateRoomInput) {
+    const id = crypto.randomUUID();
+    const room = {
+      id,
+      projectId,
+      floorId: input.floorId ?? null,
+      roomNumber: input.roomNumber,
+      roomName: input.roomName,
+    };
+    await db.insert(rooms).values(room);
+    return room;
+  }
+
+  async existsInProject(projectId: string, roomId: string) {
+    const [row] = await db
+      .select({ id: rooms.id })
+      .from(rooms)
+      .where(and(eq(rooms.projectId, projectId), eq(rooms.id, roomId)))
+      .limit(1);
+    return Boolean(row);
+  }
+
+  async findById(roomId: string) {
+    const [row] = await db.select().from(rooms).where(eq(rooms.id, roomId)).limit(1);
+    return row ?? null;
+  }
+}

src/db/schema/circuit-lists.ts

@@ -0,0 +1,18 @@
+import { sqliteTable, text, unique } from "drizzle-orm/sqlite-core";
+import { distributionBoards } from "./distribution-boards.js";
+import { projects } from "./projects.js";
+
+export const circuitLists = sqliteTable(
+  "circuit_lists",
+  {
+    id: text("id").primaryKey(),
+    projectId: text("project_id")
+      .notNull()
+      .references(() => projects.id, { onDelete: "cascade" }),
+    distributionBoardId: text("distribution_board_id")
+      .notNull()
+      .references(() => distributionBoards.id, { onDelete: "cascade" }),
+    name: text("name").notNull(),
+  },
+  (table) => [unique("circuit_lists_distribution_board_id_unique").on(table.distributionBoardId)]
+);

src/db/schema/consumers.ts

@@ -1,6 +1,8 @@
 import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { circuitLists } from "./circuit-lists.js";
 import { distributionBoards } from "./distribution-boards.js";
 import { projects } from "./projects.js";
+import { rooms } from "./rooms.js";
 
 export const consumers = sqliteTable("consumers", {
   id: text("id").primaryKey(),
@@ -10,8 +12,26 @@ export const consumers = sqliteTable("consumers", {
   distributionBoardId: text("distribution_board_id").references(() => distributionBoards.id, {
     onDelete: "set null",
   }),
+  circuitListId: text("circuit_list_id").references(() => circuitLists.id, {
+    onDelete: "set null",
+  }),
+  roomId: text("room_id").references(() => rooms.id, {
+    onDelete: "set null",
+  }),
+  circuitNumber: text("circuit_number"),
+  description: text("description"),
   name: text("name").notNull(),
   category: text("category"),
+  deviceType: text("device_type"),
+  phaseType: text("phase_type"),
+  tradeOrCostGroup: text("trade_or_cost_group"),
+  group: text("group_name"),
+  protectionType: text("protection_type"),
+  protectionRatedCurrent: real("protection_rated_current"),
+  protectionCharacteristic: text("protection_characteristic"),
+  cableType: text("cable_type"),
+  cableCrossSection: text("cable_cross_section"),
+  comment: text("comment"),
   quantity: integer("quantity").notNull(),
   installedPowerPerUnitKw: real("installed_power_per_unit_kw").notNull(),
   demandFactor: real("demand_factor").notNull(),
@@ -20,4 +40,3 @@ export const consumers = sqliteTable("consumers", {
   powerFactor: real("power_factor"),
   note: text("note"),
 });
-

src/db/schema/floors.ts

@@ -0,0 +1,11 @@
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { projects } from "./projects.js";
+
+export const floors = sqliteTable("floors", {
+  id: text("id").primaryKey(),
+  projectId: text("project_id")
+    .notNull()
+    .references(() => projects.id, { onDelete: "cascade" }),
+  name: text("name").notNull(),
+  sortOrder: integer("sort_order").notNull().default(0),
+});

src/db/schema/global-devices.ts

@@ -0,0 +1,14 @@
+import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
+
+export const globalDevices = sqliteTable("global_devices", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  category: text("category"),
+  quantity: integer("quantity").notNull(),
+  installedPowerPerUnitKw: real("installed_power_per_unit_kw").notNull(),
+  demandFactor: real("demand_factor").notNull(),
+  voltageV: real("voltage_v"),
+  phaseCount: integer("phase_count"),
+  powerFactor: real("power_factor"),
+  note: text("note"),
+});

src/db/schema/project-devices.ts

@@ -0,0 +1,18 @@
+import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { projects } from "./projects.js";
+
+export const projectDevices = sqliteTable("project_devices", {
+  id: text("id").primaryKey(),
+  projectId: text("project_id")
+    .notNull()
+    .references(() => projects.id, { onDelete: "cascade" }),
+  name: text("name").notNull(),
+  category: text("category"),
+  quantity: integer("quantity").notNull(),
+  installedPowerPerUnitKw: real("installed_power_per_unit_kw").notNull(),
+  demandFactor: real("demand_factor").notNull(),
+  voltageV: real("voltage_v"),
+  phaseCount: integer("phase_count"),
+  powerFactor: real("power_factor"),
+  note: text("note"),
+});

src/db/schema/projects.ts

@@ -1,7 +1,8 @@
-import { sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
 export const projects = sqliteTable("projects", {
   id: text("id").primaryKey(),
   name: text("name").notNull(),
+  singlePhaseVoltageV: integer("single_phase_voltage_v").notNull().default(230),
+  threePhaseVoltageV: integer("three_phase_voltage_v").notNull().default(400),
 });
-

src/db/schema/rooms.ts

@@ -0,0 +1,13 @@
+import { sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { floors } from "./floors.js";
+import { projects } from "./projects.js";
+
+export const rooms = sqliteTable("rooms", {
+  id: text("id").primaryKey(),
+  projectId: text("project_id")
+    .notNull()
+    .references(() => projects.id, { onDelete: "cascade" }),
+  floorId: text("floor_id").references(() => floors.id, { onDelete: "set null" }),
+  roomNumber: text("room_number").notNull(),
+  roomName: text("room_name").notNull(),
+});