Compare commits

..

6 Commits

Author SHA1 Message Date
drew ec2a756bf5 fixed typo 2026-07-25 16:41:18 -05:00
drew b2bb60a4a3 added paths and stuff 2026-07-25 16:39:36 -05:00
drew cc8e8cdfc6 created inital detail page 2026-07-25 16:36:56 -05:00
drew fb25b8aba6 fixed a lot of stuff 2026-07-25 16:19:23 -05:00
drew 1b478cd7ba seperated out start and end date and time into seprate date and time fields 2026-07-25 15:59:46 -05:00
drew 5517924259 Fix duplicate changedOrderToJob migration blocking build
Two divergent copies of this branch each independently regenerated an
EF migration named changedOrderToJob, and merging both left two files
with the same C# class name (compile error) plus an orphaned
fixedOrderCustomerID migration referencing the already-renamed orders
table. Removed the dead/unapplied migrations, committed the two
migrations already live on the shared dev DB, and added
FixJobsCustomerIdType to bring jobs.customer_id in line with the model
(text -> integer) using an explicit USING cast.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-25 15:45:09 -05:00
19 changed files with 853 additions and 259 deletions
@@ -1,34 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class fixedOrderCustomerID : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "customer_id",
table: "orders",
type: "integer",
nullable: false,
oldClrType: typeof(string),
oldType: "text");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "customer_id",
table: "orders",
type: "text",
nullable: false,
oldClrType: typeof(int),
oldType: "integer");
}
}
}
@@ -1,176 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class changedOrderToJob : Migration
{
/// <inheritdoc />
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<string>(type: "text", nullable: false),
name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("pk_job_status", x => x.id);
});
migrationBuilder.CreateTable(
name: "jobs",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
customer_id = table.Column<int>(type: "integer", nullable: false),
name = table.Column<string>(type: "text", nullable: false),
status_id = table.Column<string>(type: "text", nullable: true),
start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
total_price = table.Column<decimal>(type: "numeric", nullable: false),
venue = table.Column<string>(type: "text", nullable: true),
address = table.Column<string>(type: "text", nullable: true),
notes = table.Column<string>(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<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
order_id = table.Column<string>(type: "text", nullable: false),
item_id = table.Column<string>(type: "text", nullable: false),
quantity = table.Column<int>(type: "integer", nullable: false),
jobs_id = table.Column<int>(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");
}
/// <inheritdoc />
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<string>(type: "text", nullable: false),
name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("pk_order_status", x => x.id);
});
migrationBuilder.CreateTable(
name: "orders",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
status_id = table.Column<string>(type: "text", nullable: true),
address = table.Column<string>(type: "text", nullable: true),
customer_id = table.Column<int>(type: "integer", nullable: false),
end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
name = table.Column<string>(type: "text", nullable: false),
notes = table.Column<string>(type: "text", nullable: true),
start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
total_price = table.Column<decimal>(type: "numeric", nullable: false),
venue = table.Column<string>(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<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
item_id = table.Column<string>(type: "text", nullable: false),
order_id = table.Column<string>(type: "text", nullable: false),
orders_id = table.Column<int>(type: "integer", nullable: true),
quantity = table.Column<int>(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");
}
}
}
@@ -12,8 +12,8 @@ using barkmanapi;
namespace barkmanapi.Migrations
{
[DbContext(typeof(BarkContext))]
[Migration("20260723004900_changedOrderToJob")]
partial class changedOrderToJob
[Migration("20260723200239_maybethisworks")]
partial class maybethisworks
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class maybethisworks : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
@@ -12,8 +12,8 @@ using barkmanapi;
namespace barkmanapi.Migrations
{
[DbContext(typeof(BarkContext))]
[Migration("20260723003407_fixedOrderCustomerID")]
partial class fixedOrderCustomerID
[Migration("20260723200547_changedordertojobpt2")]
partial class changedordertojobpt2
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -148,7 +148,7 @@ namespace barkmanapi.Migrations
b.ToTable("item_status", (string)null);
});
modelBuilder.Entity("barkmanapi.OrderItems", b =>
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -162,29 +162,29 @@ namespace barkmanapi.Migrations
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("OrderId")
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("order_id");
.HasColumnName("job_id");
b.Property<int?>("OrdersId")
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("orders_id");
.HasColumnName("jobs_id");
b.Property<int>("Quantity")
.HasColumnType("integer")
.HasColumnName("quantity");
b.HasKey("Id")
.HasName("pk_order_items");
.HasName("pk_job_items");
b.HasIndex("OrdersId")
.HasDatabaseName("ix_order_items_orders_id");
b.HasIndex("JobsId")
.HasDatabaseName("ix_job_items_jobs_id");
b.ToTable("order_items", (string)null);
b.ToTable("job_items", (string)null);
});
modelBuilder.Entity("barkmanapi.OrderStatus", b =>
modelBuilder.Entity("barkmanapi.JobStatus", b =>
{
b.Property<string>("Id")
.HasColumnType("text")
@@ -196,12 +196,12 @@ namespace barkmanapi.Migrations
.HasColumnName("name");
b.HasKey("Id")
.HasName("pk_order_status");
.HasName("pk_job_status");
b.ToTable("order_status", (string)null);
b.ToTable("job_status", (string)null);
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -248,12 +248,12 @@ namespace barkmanapi.Migrations
.HasColumnName("venue");
b.HasKey("Id")
.HasName("pk_orders");
.HasName("pk_jobs");
b.HasIndex("StatusId")
.HasDatabaseName("ix_orders_status_id");
.HasDatabaseName("ix_jobs_status_id");
b.ToTable("orders", (string)null);
b.ToTable("jobs", (string)null);
});
modelBuilder.Entity("barkmanapi.InventoryItems", b =>
@@ -266,25 +266,25 @@ namespace barkmanapi.Migrations
b.Navigation("Status");
});
modelBuilder.Entity("barkmanapi.OrderItems", b =>
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.HasOne("barkmanapi.Orders", null)
b.HasOne("barkmanapi.Jobs", null)
.WithMany("Items")
.HasForeignKey("OrdersId")
.HasConstraintName("fk_order_items_orders_orders_id");
.HasForeignKey("JobsId")
.HasConstraintName("fk_job_items_jobs_jobs_id");
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.HasOne("barkmanapi.OrderStatus", "Status")
b.HasOne("barkmanapi.JobStatus", "Status")
.WithMany()
.HasForeignKey("StatusId")
.HasConstraintName("fk_orders_order_status_status_id");
.HasConstraintName("fk_jobs_job_status_status_id");
b.Navigation("Status");
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Navigation("Items");
});
@@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class changedordertojobpt2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "order_id",
table: "job_items",
newName: "job_id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "job_id",
table: "job_items",
newName: "order_id");
}
}
}
@@ -0,0 +1,294 @@
// <auto-generated />
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("20260725204039_FixJobsCustomerIdType")]
partial class FixJobsCustomerIdType
{
/// <inheritdoc />
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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<string>("BillingTerms")
.HasColumnType("text")
.HasColumnName("billing_terms");
b.Property<string>("Company")
.HasColumnType("text")
.HasColumnName("company");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("text")
.HasColumnName("email");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<string>("PhoneNumber")
.HasColumnType("text")
.HasColumnName("phone_number");
b.HasKey("Id")
.HasName("pk_customers");
b.ToTable("customers", (string)null);
});
modelBuilder.Entity("barkmanapi.InventoryItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Barcode")
.IsRequired()
.HasColumnType("text")
.HasColumnName("barcode");
b.Property<string>("Brand")
.IsRequired()
.HasColumnType("text")
.HasColumnName("brand");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<float?>("RentalPrice")
.HasColumnType("real")
.HasColumnName("rental_price");
b.Property<float?>("ReplacementCost")
.HasColumnType("real")
.HasColumnName("replacement_cost");
b.Property<string>("SerialNumber")
.HasColumnType("text")
.HasColumnName("serial_number");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<float?>("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<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ItemId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("job_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<int>("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<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<int>("CustomerId")
.HasColumnType("integer")
.HasColumnName("customer_id");
b.Property<DateTimeOffset>("EndDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("end_date");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<DateTimeOffset>("StartDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("start_date");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<decimal>("TotalPrice")
.HasColumnType("numeric")
.HasColumnName("total_price");
b.Property<string>("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
}
}
}
@@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class FixJobsCustomerIdType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql(
"ALTER TABLE jobs ALTER COLUMN customer_id TYPE integer USING customer_id::integer;");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql(
"ALTER TABLE jobs ALTER COLUMN customer_id TYPE text USING customer_id::text;");
}
}
}
@@ -0,0 +1,294 @@
// <auto-generated />
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("20260725205242_change_datetimeoffset_to_datetime")]
partial class change_datetimeoffset_to_datetime
{
/// <inheritdoc />
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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<string>("BillingTerms")
.HasColumnType("text")
.HasColumnName("billing_terms");
b.Property<string>("Company")
.HasColumnType("text")
.HasColumnName("company");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("text")
.HasColumnName("email");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<string>("PhoneNumber")
.HasColumnType("text")
.HasColumnName("phone_number");
b.HasKey("Id")
.HasName("pk_customers");
b.ToTable("customers", (string)null);
});
modelBuilder.Entity("barkmanapi.InventoryItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Barcode")
.IsRequired()
.HasColumnType("text")
.HasColumnName("barcode");
b.Property<string>("Brand")
.IsRequired()
.HasColumnType("text")
.HasColumnName("brand");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<float?>("RentalPrice")
.HasColumnType("real")
.HasColumnName("rental_price");
b.Property<float?>("ReplacementCost")
.HasColumnType("real")
.HasColumnName("replacement_cost");
b.Property<string>("SerialNumber")
.HasColumnType("text")
.HasColumnName("serial_number");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<float?>("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<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ItemId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("job_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<int>("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<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<int>("CustomerId")
.HasColumnType("integer")
.HasColumnName("customer_id");
b.Property<DateTime>("EndDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("end_date");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<DateTime>("StartDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("start_date");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<decimal>("TotalPrice")
.HasColumnType("numeric")
.HasColumnName("total_price");
b.Property<string>("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
}
}
}
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class change_datetimeoffset_to_datetime : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
@@ -159,15 +159,15 @@ namespace barkmanapi.Migrations
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("job_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<string>("OrderId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("order_id");
b.Property<int>("Quantity")
.HasColumnType("integer")
.HasColumnName("quantity");
@@ -215,7 +215,7 @@ namespace barkmanapi.Migrations
.HasColumnType("integer")
.HasColumnName("customer_id");
b.Property<DateTimeOffset>("EndDate")
b.Property<DateTime>("EndDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("end_date");
@@ -228,7 +228,7 @@ namespace barkmanapi.Migrations
.HasColumnType("text")
.HasColumnName("notes");
b.Property<DateTimeOffset>("StartDate")
b.Property<DateTime>("StartDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("start_date");
+3 -2
View File
@@ -290,6 +290,7 @@ jobGroup.MapPost("", async (Jobs newJobInput, BarkContext db) =>
EndDate = newJobInput.EndDate,
Venue = newJobInput.Venue,
Address = newJobInput.Address,
Notes = newJobInput.Notes,
};
db.Jobs.Add(newJob);
@@ -370,7 +371,7 @@ jobItemGroup.MapPut("/{id}", async (int id, JobItems updatedJobItems, BarkContex
return Results.NotFound(new { Message = "Job Items not found" });
}
existingJobItems.OrderId = updatedJobItems.OrderId;
existingJobItems.JobId = updatedJobItems.JobId;
existingJobItems.ItemId = updatedJobItems.ItemId;
existingJobItems.Quantity = updatedJobItems.Quantity;
@@ -382,7 +383,7 @@ jobItemGroup.MapPost("", async (JobItems newJobItemsInput, BarkContext db) =>
{
var newJobItem = new JobItems()
{
OrderId = newJobItemsInput.OrderId,
JobId = newJobItemsInput.JobId,
ItemId = newJobItemsInput.ItemId,
Quantity = newJobItemsInput.Quantity,
};
+4 -3
View File
@@ -1,3 +1,4 @@
using System.Runtime.InteropServices.JavaScript;
using Microsoft.EntityFrameworkCore;
namespace barkmanapi;
@@ -53,8 +54,8 @@ public class Jobs
public required string Name { get; set; }
public JobStatus Status { get; set; }
public string? StatusId { get; set; }
public DateTimeOffset StartDate { get; set; }
public DateTimeOffset EndDate { get; set; }
public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; }
public decimal TotalPrice { get; set; }
public string? Venue { get; set; }
public string? Address { get; set; }
@@ -65,7 +66,7 @@ public class Jobs
public class JobItems
{
public int Id { get; set; }
public required string OrderId { get; set; }
public required string JobId { get; set; }
public required string ItemId { get; set; }
public int Quantity { get; set; }
}
+6
View File
@@ -14,6 +14,9 @@ import CustomerList from "@/features/customers/CustomerList.tsx";
import AddCustomer from "@/features/customers/AddCustomer.tsx";
import CustomerDetail from "@/features/customers/CustomerDetail.tsx";
import EditCustomer from "@/features/customers/EditCustomer.tsx";
import AddJob from "@/features/jobs/AddJob.tsx";
import JobList from "@/features/jobs/JobList.tsx";
import JobDetail from "@/features/jobs/JobDetail.tsx";
// Create a client
const queryClient = new QueryClient()
@@ -54,6 +57,9 @@ function App() {
<Route path="customers/addCustomer" element={<AddCustomer/>}/>
<Route path="customers/customerDetail/:customerId" element={<CustomerDetail/>}/>
<Route path="customers/editCustomer/:customerId" element={<EditCustomer/>}/>
<Route path="jobs" element={<JobList/>}/>
<Route path="jobs/addJob" element={<AddJob/>}/>
<Route path="jobs/jobDetail/:jobId" element={<JobDetail/>}/>
</Routes>
</>
@@ -8,6 +8,7 @@ import BarkLogo from '@/assets/barklogo.png';
const links = [
{ link: '/', label: 'Home' },
{ link: '/customers', label: 'Customers' },
{ link: '/jobs', label: 'Jobs' },
{ link: '/inventory', label: 'Inventory' },
];
+7 -3
View File
@@ -20,8 +20,8 @@ function AddJob() {
initialValues: {
customerId: 0,
name: "",
startDate: new Date(),
endDate: new Date(),
startDate: "",
endDate: "",
address: "",
venue: "",
notes: "",
@@ -35,7 +35,11 @@ function AddJob() {
const result = await fetch(import.meta.env.VITE_API_URL + '/jobs', {
method: 'POST',
body: JSON.stringify(values),
body: JSON.stringify({
...values,
startDate: new Date(values.startDate).toISOString(),
endDate: new Date(values.endDate).toISOString(),
}),
headers: {
'Content-Type': 'application/json'
}
+47
View File
@@ -0,0 +1,47 @@
import {Container, Text, Title} from "@mantine/core";
import {Link, useParams} from "react-router";
import {Job} from "./types.ts";
import {useQuery} from "@tanstack/react-query";
function JobDetail() {
const params = useParams();
const {isPending, error, data, isFetching} = useQuery({
queryKey: ['jobs', params.jobId],
queryFn: async (): Promise<Job> => {
const response = await fetch(
import.meta.env.VITE_API_URL + '/jobs/' + params.jobId,
)
if (!response.ok) throw new Error('Failed to fetch jobs ' + response.statusText)
return await response.json()
},
});
if (isPending) return 'Loading...'
if (error) return 'An error has occurred: ' + error.message
return (
<>
<Container m="lg">
<Title order={1}>Job Detail</Title>
<div>{isFetching ? 'Updating...' : ''}</div>
<Text>Customer ID: {data.customerId}</Text>
<Text>Name: {data.name}</Text>
{/*<Text>Status: {data.status.name}</Text>*/}
<Text>Start Date: {data.startDate}</Text>
<Text>End Date: {data.endDate}</Text>
<Text>Venue: {data.venue}</Text>
<Text>Address: {data.address}</Text>
<Text>Notes: {data.notes}</Text>
<Link to={`/inventory/editItem/${data.id}`}>Edit</Link>
</Container>
</>
)
}
export default JobDetail
+60
View File
@@ -0,0 +1,60 @@
import {Flex, Table} from '@mantine/core';
import BarkButton from "../../common/components/BarkButton.tsx";
import {Link, NavLink} from "react-router";
import useJobList from "./hooks/useJobList.tsx";
function JobList() {
const jobQuery = useJobList();
if (jobQuery.isPending) return 'Loading...'
if (jobQuery.error) return 'An error has occurred: ' + jobQuery.error.message
return (
<>
<Flex
mih={50}
gap="xl"
justify="center"
align="center"
direction="row"
wrap="wrap"
>
<p>
ARFF ARFF BARK BARK
</p>
<NavLink to={'/jobs/addJob'}><BarkButton>Add Job</BarkButton></NavLink>
</Flex>
<Table striped>
<Table.Thead>
<Table.Tr>
<Table.Th c="red">Customer ID</Table.Th>
<Table.Th c="red">Name</Table.Th>
<Table.Th c="red">Venue</Table.Th>
<Table.Th c="red">Status</Table.Th>
<Table.Th c="red">Start Date</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{jobQuery.data?.map((data) => (
<Table.Tr key={data.id}>
<Table.Td>{data.customerId}</Table.Td>
<Table.Td>{data.name}</Table.Td>
<Table.Td>{data.venue}</Table.Td>
<Table.Td>{data.status?.name ?? '—'}</Table.Td>
<Table.Td>{new Date(data.startDate).toLocaleDateString()}</Table.Td>
<Table.Td>
<Link to={`/jobs/jobDetail/${data.id}`}>Details</Link>
</Table.Td>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</>
)
}
export default JobList;
+6 -6
View File
@@ -2,10 +2,10 @@ export interface Job {
id: number,
customerId: number,
name: string,
status: {id: string; name: string},
statusId: string;
startDate: Date;
endDate: Date;
status: {id: string; name: string} | null,
statusId: string | null;
startDate: string;
endDate: string;
totalPrice: string,
venue: string,
address: string,
@@ -15,8 +15,8 @@ export interface Job {
export interface NewJob {
customerId: number,
name: string,
startDate: Date;
endDate: Date;
startDate: string;
endDate: string;
venue: string,
address: string,
notes: string,