From 85678f574247fae7144295c6bedd9b77ff6acb6f Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Wed, 22 Jul 2026 19:49:24 -0500 Subject: [PATCH] changed order to job - updated model, --- ...260723004900_changedOrderToJob.Designer.cs | 294 ++++++++++++++++++ .../20260723004900_changedOrderToJob.cs | 176 +++++++++++ barkmanui/src/features/jobs/AddJob.tsx | 109 +++++++ 3 files changed, 579 insertions(+) create mode 100644 barkmanAPI/Migrations/20260723004900_changedOrderToJob.Designer.cs create mode 100644 barkmanAPI/Migrations/20260723004900_changedOrderToJob.cs create mode 100644 barkmanui/src/features/jobs/AddJob.tsx diff --git a/barkmanAPI/Migrations/20260723004900_changedOrderToJob.Designer.cs b/barkmanAPI/Migrations/20260723004900_changedOrderToJob.Designer.cs new file mode 100644 index 0000000..e39250b --- /dev/null +++ b/barkmanAPI/Migrations/20260723004900_changedOrderToJob.Designer.cs @@ -0,0 +1,294 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using barkmanapi; + +#nullable disable + +namespace barkmanapi.Migrations +{ + [DbContext(typeof(BarkContext))] + [Migration("20260723004900_changedOrderToJob")] + partial class changedOrderToJob + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.1") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("barkmanapi.Customers", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .HasColumnType("text") + .HasColumnName("address"); + + b.Property("BillingTerms") + .HasColumnType("text") + .HasColumnName("billing_terms"); + + b.Property("Company") + .HasColumnType("text") + .HasColumnName("company"); + + b.Property("Email") + .IsRequired() + .HasColumnType("text") + .HasColumnName("email"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("Notes") + .HasColumnType("text") + .HasColumnName("notes"); + + b.Property("PhoneNumber") + .HasColumnType("text") + .HasColumnName("phone_number"); + + b.HasKey("Id") + .HasName("pk_customers"); + + b.ToTable("customers", (string)null); + }); + + modelBuilder.Entity("barkmanapi.InventoryItems", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Barcode") + .IsRequired() + .HasColumnType("text") + .HasColumnName("barcode"); + + b.Property("Brand") + .IsRequired() + .HasColumnType("text") + .HasColumnName("brand"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("Notes") + .HasColumnType("text") + .HasColumnName("notes"); + + b.Property("RentalPrice") + .HasColumnType("real") + .HasColumnName("rental_price"); + + b.Property("ReplacementCost") + .HasColumnType("real") + .HasColumnName("replacement_cost"); + + b.Property("SerialNumber") + .HasColumnType("text") + .HasColumnName("serial_number"); + + b.Property("StatusId") + .HasColumnType("text") + .HasColumnName("status_id"); + + b.Property("Weight") + .HasColumnType("real") + .HasColumnName("weight"); + + b.HasKey("Id") + .HasName("pk_inventory"); + + b.HasIndex("Barcode") + .IsUnique() + .HasDatabaseName("ix_inventory_barcode"); + + b.HasIndex("StatusId") + .HasDatabaseName("ix_inventory_status_id"); + + b.ToTable("inventory", (string)null); + }); + + modelBuilder.Entity("barkmanapi.ItemStatus", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_item_status"); + + b.ToTable("item_status", (string)null); + }); + + modelBuilder.Entity("barkmanapi.JobItems", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ItemId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("item_id"); + + b.Property("JobsId") + .HasColumnType("integer") + .HasColumnName("jobs_id"); + + b.Property("OrderId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("order_id"); + + b.Property("Quantity") + .HasColumnType("integer") + .HasColumnName("quantity"); + + b.HasKey("Id") + .HasName("pk_job_items"); + + b.HasIndex("JobsId") + .HasDatabaseName("ix_job_items_jobs_id"); + + b.ToTable("job_items", (string)null); + }); + + modelBuilder.Entity("barkmanapi.JobStatus", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("pk_job_status"); + + b.ToTable("job_status", (string)null); + }); + + modelBuilder.Entity("barkmanapi.Jobs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .HasColumnType("text") + .HasColumnName("address"); + + b.Property("CustomerId") + .HasColumnType("integer") + .HasColumnName("customer_id"); + + b.Property("EndDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("end_date"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.Property("Notes") + .HasColumnType("text") + .HasColumnName("notes"); + + b.Property("StartDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("start_date"); + + b.Property("StatusId") + .HasColumnType("text") + .HasColumnName("status_id"); + + b.Property("TotalPrice") + .HasColumnType("numeric") + .HasColumnName("total_price"); + + b.Property("Venue") + .HasColumnType("text") + .HasColumnName("venue"); + + b.HasKey("Id") + .HasName("pk_jobs"); + + b.HasIndex("StatusId") + .HasDatabaseName("ix_jobs_status_id"); + + b.ToTable("jobs", (string)null); + }); + + modelBuilder.Entity("barkmanapi.InventoryItems", b => + { + b.HasOne("barkmanapi.ItemStatus", "Status") + .WithMany() + .HasForeignKey("StatusId") + .HasConstraintName("fk_inventory_item_status_status_id"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("barkmanapi.JobItems", b => + { + b.HasOne("barkmanapi.Jobs", null) + .WithMany("Items") + .HasForeignKey("JobsId") + .HasConstraintName("fk_job_items_jobs_jobs_id"); + }); + + modelBuilder.Entity("barkmanapi.Jobs", b => + { + b.HasOne("barkmanapi.JobStatus", "Status") + .WithMany() + .HasForeignKey("StatusId") + .HasConstraintName("fk_jobs_job_status_status_id"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("barkmanapi.Jobs", b => + { + b.Navigation("Items"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/barkmanAPI/Migrations/20260723004900_changedOrderToJob.cs b/barkmanAPI/Migrations/20260723004900_changedOrderToJob.cs new file mode 100644 index 0000000..81fde1b --- /dev/null +++ b/barkmanAPI/Migrations/20260723004900_changedOrderToJob.cs @@ -0,0 +1,176 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace barkmanapi.Migrations +{ + /// + public partial class changedOrderToJob : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "order_items"); + + migrationBuilder.DropTable( + name: "orders"); + + migrationBuilder.DropTable( + name: "order_status"); + + migrationBuilder.CreateTable( + name: "job_status", + columns: table => new + { + id = table.Column(type: "text", nullable: false), + name = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_job_status", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "jobs", + columns: table => new + { + id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + customer_id = table.Column(type: "integer", nullable: false), + name = table.Column(type: "text", nullable: false), + status_id = table.Column(type: "text", nullable: true), + start_date = table.Column(type: "timestamp with time zone", nullable: false), + end_date = table.Column(type: "timestamp with time zone", nullable: false), + total_price = table.Column(type: "numeric", nullable: false), + venue = table.Column(type: "text", nullable: true), + address = table.Column(type: "text", nullable: true), + notes = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_jobs", x => x.id); + table.ForeignKey( + name: "fk_jobs_job_status_status_id", + column: x => x.status_id, + principalTable: "job_status", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "job_items", + columns: table => new + { + id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + order_id = table.Column(type: "text", nullable: false), + item_id = table.Column(type: "text", nullable: false), + quantity = table.Column(type: "integer", nullable: false), + jobs_id = table.Column(type: "integer", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_job_items", x => x.id); + table.ForeignKey( + name: "fk_job_items_jobs_jobs_id", + column: x => x.jobs_id, + principalTable: "jobs", + principalColumn: "id"); + }); + + migrationBuilder.CreateIndex( + name: "ix_job_items_jobs_id", + table: "job_items", + column: "jobs_id"); + + migrationBuilder.CreateIndex( + name: "ix_jobs_status_id", + table: "jobs", + column: "status_id"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "job_items"); + + migrationBuilder.DropTable( + name: "jobs"); + + migrationBuilder.DropTable( + name: "job_status"); + + migrationBuilder.CreateTable( + name: "order_status", + columns: table => new + { + id = table.Column(type: "text", nullable: false), + name = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_order_status", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "orders", + columns: table => new + { + id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + status_id = table.Column(type: "text", nullable: true), + address = table.Column(type: "text", nullable: true), + customer_id = table.Column(type: "integer", nullable: false), + end_date = table.Column(type: "timestamp with time zone", nullable: false), + name = table.Column(type: "text", nullable: false), + notes = table.Column(type: "text", nullable: true), + start_date = table.Column(type: "timestamp with time zone", nullable: false), + total_price = table.Column(type: "numeric", nullable: false), + venue = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("pk_orders", x => x.id); + table.ForeignKey( + name: "fk_orders_order_status_status_id", + column: x => x.status_id, + principalTable: "order_status", + principalColumn: "id"); + }); + + migrationBuilder.CreateTable( + name: "order_items", + columns: table => new + { + id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + item_id = table.Column(type: "text", nullable: false), + order_id = table.Column(type: "text", nullable: false), + orders_id = table.Column(type: "integer", nullable: true), + quantity = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("pk_order_items", x => x.id); + table.ForeignKey( + name: "fk_order_items_orders_orders_id", + column: x => x.orders_id, + principalTable: "orders", + principalColumn: "id"); + }); + + migrationBuilder.CreateIndex( + name: "ix_order_items_orders_id", + table: "order_items", + column: "orders_id"); + + migrationBuilder.CreateIndex( + name: "ix_orders_status_id", + table: "orders", + column: "status_id"); + } + } +} diff --git a/barkmanui/src/features/jobs/AddJob.tsx b/barkmanui/src/features/jobs/AddJob.tsx new file mode 100644 index 0000000..15b46ac --- /dev/null +++ b/barkmanui/src/features/jobs/AddJob.tsx @@ -0,0 +1,109 @@ +import {Button, Group, TextInput, Container, Title, Flex} from '@mantine/core'; +import {useForm} from '@mantine/form'; +import {useMutation} from "@tanstack/react-query"; +import {NewJob} from "./types.ts"; +import {useNavigate} from "react-router"; +import {IconX, IconCheck} from '@tabler/icons-react'; +import {notifications} from '@mantine/notifications'; +import useJobList from "./hooks/useJobList.tsx"; + + +function AddJob() { + + const navigate = useNavigate(); + + const customerQuery = useCustomerList(); + + const newJobForm = useForm({ + mode: 'uncontrolled', + initialValues: { + name: "", + company: "", + email: "", + phone: "", + address: "", + }, + + validate: {}, + }); + + const updateCustomer = useMutation({ + mutationFn: async (values: newJob) => { + + const result = await fetch(import.meta.env.VITE_API_URL + '/customers', { + method: 'POST', + body: JSON.stringify(values), + headers: { + 'Content-Type': 'application/json' + } + }); + + if (result.ok) { + notifications.show({ + icon: , + color: "teal", + title: "All good!", + message: "Customer Created", + position: 'top-center', + }); + navigate("/customers"); + + } + + if (!result.ok) { + notifications.show({ + icon: , + color: "red", + title: "Bummer!", + message: "Something went wrong", + position: 'top-center', + }); + throw new Error('Failed to create customer'); + } + + }, + + + }) + + if (customerQuery.isPending) return 'Loading...' + if (customerQuery.error) return 'An error has occurred: ' + customerQuery.error.message + + + + + return ( + <> +
await + updateCustomer.mutateAsync(values))}> + + + + Add Item + + + + + + + + + + + +
+ + ); +} + +export default AddCustomer; \ No newline at end of file