admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Add a foreign key for WorkCategory table to the WorkItem model

Browse Source
This commit is contained in:
ashutosh.nehete 2025-05-12 13:18:19 +05:30
parent 4287bf7b2e
commit 7c9cd4697f
9 changed files with 2584 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2511
Marco.Pms.DataAccess/Migrations/20250511170748_Added_Foreign_key_For_WorkCategery_To_WorkItem.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

50
Marco.Pms.DataAccess/Migrations/20250511170748_Added_Foreign_key_For_WorkCategery_To_WorkItem.cs Normal file
View File

@ -0,0 +1,50 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Marco.Pms.DataAccess.Migrations
{
/// <inheritdoc />
public partial class Added_Foreign_key_For_WorkCategery_To_WorkItem : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "WorkCategoryId",
table: "WorkItems",
type: "char(36)",
nullable: true,
collation: "ascii_general_ci");
migrationBuilder.CreateIndex(
name: "IX_WorkItems_WorkCategoryId",
table: "WorkItems",
column: "WorkCategoryId");
migrationBuilder.AddForeignKey(
name: "FK_WorkItems_WorkCategoryMasters_WorkCategoryId",
table: "WorkItems",
column: "WorkCategoryId",
principalTable: "WorkCategoryMasters",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_WorkItems_WorkCategoryMasters_WorkCategoryId",
table: "WorkItems");
migrationBuilder.DropIndex(
name: "IX_WorkItems_WorkCategoryId",
table: "WorkItems");
migrationBuilder.DropColumn(
name: "WorkCategoryId",
table: "WorkItems");
}
}
}

11
Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -1596,6 +1596,9 @@ namespace Marco.Pms.DataAccess.Migrations
b.Property<Guid>("WorkAreaId")
.HasColumnType("char(36)");
b.Property<Guid?>("WorkCategoryId")
.HasColumnType("char(36)");
b.HasKey("Id");
b.HasIndex("ActivityId");
@ -1604,6 +1607,8 @@ namespace Marco.Pms.DataAccess.Migrations
b.HasIndex("WorkAreaId");
b.HasIndex("WorkCategoryId");
b.ToTable("WorkItems");
});
@ -2404,11 +2409,17 @@ namespace Marco.Pms.DataAccess.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
.WithMany()
.HasForeignKey("WorkCategoryId");
b.Navigation("ActivityMaster");
b.Navigation("Tenant");
b.Navigation("WorkArea");
b.Navigation("WorkCategoryMaster");
});
modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>

2
Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
View File

@ -7,7 +7,7 @@ namespace Marco.Pms.Model.Dtos.Project
[Key]
public Guid? Id { get; set; }
public Guid WorkAreaID { get; set; }
public Guid WorkCategoryId { get; set; }
public Guid ActivityID { get; set; }
public int PlannedWork { get; set; }
public int CompletedWork { get; set; }

1
Marco.Pms.Model/Mapper/InfraMapper.cs
View File

@ -56,6 +56,7 @@ namespace Marco.Pms.Model.Mapper
ActivityId = model.ActivityID,
CompletedWork = model.CompletedWork,
PlannedWork = model.PlannedWork,
WorkCategoryId = model.WorkCategoryId,
TaskDate = DateTime.Now,
TenantId = tenantId,
WorkAreaId = model.WorkAreaID

7
Marco.Pms.Model/Projects/WorkItem.cs
View File

@ -9,17 +9,20 @@ namespace Marco.Pms.Model.Projects
{
public Guid Id { get; set; }
public Guid ActivityId { get; set; }
public Guid? WorkCategoryId { get; set; }
public Guid WorkAreaId { get; set; }
[ForeignKey("WorkAreaId")]
[ValidateNever]
public WorkArea? WorkArea { get; set; }
[ForeignKey("ActivityId")]
[ValidateNever]
public ActivityMaster? ActivityMaster { get; set; }
[ForeignKey("WorkCategoryId")]
[ValidateNever]
public WorkCategoryMaster? WorkCategoryMaster { get; set; }
public double PlannedWork { get; set; }
public double CompletedWork { get; set; }
public DateTime TaskDate { get; set; }

2
Marco.Pms.Services/Controllers/EmployeeController.cs
View File

@ -207,7 +207,7 @@ namespace MarcoBMS.Services.Controllers
// Create Identity User
var result = await _userManager.CreateAsync(user, "User@123");
if (!result.Succeeded)
return Ok(ApiResponse<object>.ErrorResponse("Failed to create user", result.Errors, 400));
return BadRequest(ApiResponse<object>.ErrorResponse("Failed to create user", result.Errors, 400));
if (existingEmployee == null)
{

3
Marco.Pms.Services/Controllers/ProjectController.cs
View File

@ -208,7 +208,7 @@ namespace MarcoBMS.Services.Controllers
List<WorkArea> workAreas = await _context.WorkAreas.Where(c => idList.Contains(c.FloorId)).ToListAsync();
idList = workAreas.Select(o => o.Id).ToList();
List<WorkItem> workItems = await _context.WorkItems.Where(c => idList.Contains(c.WorkAreaId)).Include(c => c.ActivityMaster).ToListAsync();
List<WorkItem> workItems = await _context.WorkItems.Include(c => c.WorkCategoryMaster).Where(c => idList.Contains(c.WorkAreaId)).Include(c => c.ActivityMaster).ToListAsync();
// List <WorkItem> workItems = _unitOfWork.WorkItem.GetAll(c => idList.Contains(c.WorkAreaId), includeProperties: "ActivityMaster").ToList();
vm.project = project;
@ -522,6 +522,7 @@ namespace MarcoBMS.Services.Controllers
workItems.Add(result);
}
var activity = await _context.ActivityMasters.ToListAsync();
var category = await _context.WorkCategoryMasters.ToListAsync();
return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
}

3
Marco.Pms.Services/appsettings.Development.json
View File

@ -11,7 +11,8 @@
"AllowedHeaders": "*"
},
"ConnectionStrings": {
"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
//"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS10"
},
"MongoDB": {
"SerilogDatabaseUrl": "mongodb://localhost:27017/DotNetLogs"