New_REP_SYSTEM/ERP-core
8
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

emloyee and user fixings

Browse Source
This commit is contained in:
Sasanka20
2026-09-11 10:32:47 +05:30
parent 629f3d1f44
commit cb41d503c4
61 changed files with 35831 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Backend/ERPCore/Migrations/20260909101932_MoveVendorsUnderProcurement.Designer.cs
Generated
+8005
View File
File diff suppressed because it is too large Load Diff
Backend/ERPCore/Migrations/20260909101932_MoveVendorsUnderProcurement.cs
+55
View File
@@ -0,0 +1,55 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace ERPCore.Migrations
{
/// <inheritdoc />
public partial class MoveVendorsUnderProcurement : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
// Order matters: Permission.NavItemId cascades on delete, so the permission row must be
// repointed off NavItemId 3 (via the new sub_nav_item) before that nav_item is deleted —
// otherwise the delete cascades and removes the permission row first.
migrationBuilder.InsertData(
table: "sub_nav_items",
columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
values: new object[] { 30, "procurement.vendors", "/dashboard/vendors", null, "Vendors", 4, 0 });
migrationBuilder.UpdateData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 3,
columns: new[] { "Code", "NavItemId", "SubNavItemId" },
values: new object[] { "NAV:procurement.vendors", null, 30 });
migrationBuilder.DeleteData(
table: "nav_items",
keyColumn: "NavItemId",
keyValue: 3);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 30);
migrationBuilder.InsertData(
table: "nav_items",
columns: new[] { "NavItemId", "Code", "Href", "Icon", "Label", "SortOrder", "Status" },
values: new object[] { 3, "vendors", "/dashboard/vendors", null, "Vendors", 3, "Active" });
migrationBuilder.UpdateData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 3,
columns: new[] { "Code", "NavItemId", "SubNavItemId" },
values: new object[] { "NAV:vendors", 3, null });
}
}
}
Backend/ERPCore/Migrations/20260909102452_AddStockSubNavItems.Designer.cs
Generated
+8133
View File
File diff suppressed because it is too large Load Diff
Backend/ERPCore/Migrations/20260909102452_AddStockSubNavItems.cs
+130
View File
@@ -0,0 +1,130 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
namespace ERPCore.Migrations
{
/// <inheritdoc />
public partial class AddStockSubNavItems : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "sub_nav_items",
columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
values: new object[,]
{
{ 31, "stock.ledger", "/dashboard/stock/ledger", null, "Stock Ledger", 6, 1 },
{ 32, "stock.enquiry", "/dashboard/stock/enquiry", null, "Stock Enquiry", 6, 2 },
{ 33, "stock.valuation", "/dashboard/stock/valuation", null, "Valuation", 6, 3 },
{ 34, "stock.transfers", "/dashboard/stock/transfers", null, "Transfers", 6, 4 },
{ 35, "stock.adjustments", "/dashboard/stock/adjustments", null, "Adjustments", 6, 5 },
{ 36, "stock.counts", "/dashboard/stock/counts", null, "Counts", 6, 6 },
{ 37, "stock.reorder-alerts", "/dashboard/stock/reorder-alerts", null, "Reorder Alerts", 6, 7 },
{ 38, "stock.wastage", "/dashboard/stock/wastage", null, "Wastage", 6, 8 }
});
migrationBuilder.InsertData(
table: "permissions",
columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
values: new object[,]
{
{ 41, "NAV:stock.ledger", null, 31 },
{ 42, "NAV:stock.enquiry", null, 32 },
{ 43, "NAV:stock.valuation", null, 33 },
{ 44, "NAV:stock.transfers", null, 34 },
{ 45, "NAV:stock.adjustments", null, 35 },
{ 46, "NAV:stock.counts", null, 36 },
{ 47, "NAV:stock.reorder-alerts", null, 37 },
{ 48, "NAV:stock.wastage", null, 38 }
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 41);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 42);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 43);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 44);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 45);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 46);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 47);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 48);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 31);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 32);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 33);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 34);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 35);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 36);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 37);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 38);
}
}
}
Backend/ERPCore/Migrations/20260909103002_AddSalesSubNavItems.Designer.cs
Generated
+8187
View File
File diff suppressed because it is too large Load Diff
Backend/ERPCore/Migrations/20260909103002_AddSalesSubNavItems.cs
+94
View File
@@ -0,0 +1,94 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
namespace ERPCore.Migrations
{
/// <inheritdoc />
public partial class AddSalesSubNavItems : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "permissions",
columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
values: new object[] { 49, "NAV:sales.bundle-templates", null, 23 });
migrationBuilder.UpdateData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 23,
columns: new[] { "Code", "Href", "Label", "SortOrder" },
values: new object[] { "sales.bundle-templates", "/dashboard/sales/bundles/templates", "Bundle Templates", 2 });
migrationBuilder.InsertData(
table: "sub_nav_items",
columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
values: new object[,]
{
{ 40, "sales.invoices", "/dashboard/sales/invoices", null, "Sales", 13, 1 },
{ 41, "sales.free-issues", "/dashboard/sales/free-issues", null, "Free Issues", 13, 3 },
{ 42, "sales.day-end", "/dashboard/sales/day-end", null, "Day End", 13, 4 }
});
migrationBuilder.InsertData(
table: "permissions",
columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
values: new object[,]
{
{ 50, "NAV:sales.invoices", null, 40 },
{ 51, "NAV:sales.free-issues", null, 41 },
{ 52, "NAV:sales.day-end", null, 42 }
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 49);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 50);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 51);
migrationBuilder.DeleteData(
table: "permissions",
keyColumn: "PermissionId",
keyValue: 52);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 40);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 41);
migrationBuilder.DeleteData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 42);
migrationBuilder.UpdateData(
table: "sub_nav_items",
keyColumn: "SubNavItemId",
keyValue: 23,
columns: new[] { "Code", "Href", "Label", "SortOrder" },
values: new object[] { "sales.bundle-sales", "/dashboard/sales/bundles", "Bundle Sales", 1 });
}
}
}
Backend/ERPCore/Migrations/20260910092607_AddLoginActivity.Designer.cs
Generated
+8231
View File
File diff suppressed because it is too large Load Diff
Backend/ERPCore/Migrations/20260910092607_AddLoginActivity.cs
+51
View File
@@ -0,0 +1,51 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace ERPCore.Migrations
{
/// <inheritdoc />
public partial class AddLoginActivity : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "login_activities",
columns: table => new
{
LoginActivityId = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
UserId = table.Column<int>(type: "integer", nullable: false),
IpAddress = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
UserAgent = table.Column<string>(type: "character varying(500)", maxLength: 500, nullable: true),
DeviceLabel = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
LoginAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_login_activities", x => x.LoginActivityId);
table.ForeignKey(
name: "FK_login_activities_users_UserId",
column: x => x.UserId,
principalTable: "users",
principalColumn: "UserId",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_login_activities_UserId_LoginAt",
table: "login_activities",
columns: new[] { "UserId", "LoginAt" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "login_activities");
}
}
}
Backend/ERPCore/Migrations/ErpDbContextModelSnapshot.cs
+242 -15
View File
@@ -2171,6 +2171,39 @@ namespace ERPCore.Migrations
b.ToTable("hr_loan_installments", (string)null);
});
modelBuilder.Entity("ERPCore.Domain.Entities.LoginActivity", b =>
{
b.Property<int>("LoginActivityId")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LoginActivityId"));
b.Property<string>("DeviceLabel")
.HasMaxLength(200)
.HasColumnType("character varying(200)");
b.Property<string>("IpAddress")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<DateTime>("LoginAt")
.HasColumnType("timestamp with time zone");
b.Property<string>("UserAgent")
.HasMaxLength(500)
.HasColumnType("character varying(500)");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("LoginActivityId");
b.HasIndex("UserId", "LoginAt");
b.ToTable("login_activities", (string)null);
});
modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
{
b.Property<int>("NavItemId")
@@ -2234,15 +2267,6 @@ namespace ERPCore.Migrations
Status = "Active"
},
new
{
NavItemId = 3,
Code = "vendors",
Href = "/dashboard/vendors",
Label = "Vendors",
SortOrder = 3,
Status = "Active"
},
new
{
NavItemId = 4,
Code = "procurement",
@@ -2766,8 +2790,8 @@ namespace ERPCore.Migrations
new
{
PermissionId = 3,
Code = "NAV:vendors",
NavItemId = 3
Code = "NAV:procurement.vendors",
SubNavItemId = 30
},
new
{
@@ -2990,6 +3014,78 @@ namespace ERPCore.Migrations
PermissionId = 40,
Code = "NAV:settings.branches",
SubNavItemId = 29
},
new
{
PermissionId = 41,
Code = "NAV:stock.ledger",
SubNavItemId = 31
},
new
{
PermissionId = 42,
Code = "NAV:stock.enquiry",
SubNavItemId = 32
},
new
{
PermissionId = 43,
Code = "NAV:stock.valuation",
SubNavItemId = 33
},
new
{
PermissionId = 44,
Code = "NAV:stock.transfers",
SubNavItemId = 34
},
new
{
PermissionId = 45,
Code = "NAV:stock.adjustments",
SubNavItemId = 35
},
new
{
PermissionId = 46,
Code = "NAV:stock.counts",
SubNavItemId = 36
},
new
{
PermissionId = 47,
Code = "NAV:stock.reorder-alerts",
SubNavItemId = 37
},
new
{
PermissionId = 48,
Code = "NAV:stock.wastage",
SubNavItemId = 38
},
new
{
PermissionId = 49,
Code = "NAV:sales.bundle-templates",
SubNavItemId = 23
},
new
{
PermissionId = 50,
Code = "NAV:sales.invoices",
SubNavItemId = 40
},
new
{
PermissionId = 51,
Code = "NAV:sales.free-issues",
SubNavItemId = 41
},
new
{
PermissionId = 52,
Code = "NAV:sales.day-end",
SubNavItemId = 42
});
});
@@ -5502,15 +5598,55 @@ namespace ERPCore.Migrations
},
new
{
SubNavItemId = 23,
Code = "sales.bundle-sales",
Href = "/dashboard/sales/bundles",
Label = "Bundle Sales",
SubNavItemId = 40,
Code = "sales.invoices",
Href = "/dashboard/sales/invoices",
Label = "Sales",
NavItemId = 13,
SortOrder = 1,
Status = "Active"
},
new
{
SubNavItemId = 23,
Code = "sales.bundle-templates",
Href = "/dashboard/sales/bundles/templates",
Label = "Bundle Templates",
NavItemId = 13,
SortOrder = 2,
Status = "Active"
},
new
{
SubNavItemId = 41,
Code = "sales.free-issues",
Href = "/dashboard/sales/free-issues",
Label = "Free Issues",
NavItemId = 13,
SortOrder = 3,
Status = "Active"
},
new
{
SubNavItemId = 42,
Code = "sales.day-end",
Href = "/dashboard/sales/day-end",
Label = "Day End",
NavItemId = 13,
SortOrder = 4,
Status = "Active"
},
new
{
SubNavItemId = 30,
Code = "procurement.vendors",
Href = "/dashboard/vendors",
Label = "Vendors",
NavItemId = 4,
SortOrder = 0,
Status = "Active"
},
new
{
SubNavItemId = 17,
Code = "procurement.requisitions",
@@ -5689,6 +5825,86 @@ namespace ERPCore.Migrations
NavItemId = 14,
SortOrder = 3,
Status = "Active"
},
new
{
SubNavItemId = 31,
Code = "stock.ledger",
Href = "/dashboard/stock/ledger",
Label = "Stock Ledger",
NavItemId = 6,
SortOrder = 1,
Status = "Active"
},
new
{
SubNavItemId = 32,
Code = "stock.enquiry",
Href = "/dashboard/stock/enquiry",
Label = "Stock Enquiry",
NavItemId = 6,
SortOrder = 2,
Status = "Active"
},
new
{
SubNavItemId = 33,
Code = "stock.valuation",
Href = "/dashboard/stock/valuation",
Label = "Valuation",
NavItemId = 6,
SortOrder = 3,
Status = "Active"
},
new
{
SubNavItemId = 34,
Code = "stock.transfers",
Href = "/dashboard/stock/transfers",
Label = "Transfers",
NavItemId = 6,
SortOrder = 4,
Status = "Active"
},
new
{
SubNavItemId = 35,
Code = "stock.adjustments",
Href = "/dashboard/stock/adjustments",
Label = "Adjustments",
NavItemId = 6,
SortOrder = 5,
Status = "Active"
},
new
{
SubNavItemId = 36,
Code = "stock.counts",
Href = "/dashboard/stock/counts",
Label = "Counts",
NavItemId = 6,
SortOrder = 6,
Status = "Active"
},
new
{
SubNavItemId = 37,
Code = "stock.reorder-alerts",
Href = "/dashboard/stock/reorder-alerts",
Label = "Reorder Alerts",
NavItemId = 6,
SortOrder = 7,
Status = "Active"
},
new
{
SubNavItemId = 38,
Code = "stock.wastage",
Href = "/dashboard/stock/wastage",
Label = "Wastage",
NavItemId = 6,
SortOrder = 8,
Status = "Active"
});
});
@@ -6618,6 +6834,17 @@ namespace ERPCore.Migrations
b.Navigation("PayrollRun");
});
modelBuilder.Entity("ERPCore.Domain.Entities.LoginActivity", b =>
{
b.HasOne("ERPCore.Domain.Entities.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
});
modelBuilder.Entity("ERPCore.Domain.Entities.NotificationConfig", b =>
{
b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")