Compare commits
	
		
			No commits in common. "7b1cce26c827dc50839446b5df486de6a3423149" and "41b8aa012667e5379f8ce18d197bc253b1a2f093" have entirely different histories.
		
	
	
		
			7b1cce26c8
			...
			41b8aa0126
		
	
		
| @ -5,7 +5,6 @@ using Marco.Pms.Model.Employees; | |||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Marco.Pms.Model.Industries; | using Marco.Pms.Model.Industries; | ||||||
| using Marco.Pms.Model.Projects; | using Marco.Pms.Model.Projects; | ||||||
| using Marco.Pms.Model.Utilities; |  | ||||||
| using Marco.Pms.Utility; | using Marco.Pms.Utility; | ||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Identity; | using Microsoft.AspNetCore.Identity; | ||||||
| @ -40,19 +39,11 @@ namespace Marco.Pms.DataAccess.Data | |||||||
| 
 | 
 | ||||||
|         public DbSet<WorkArea> WorkAreas { get; set; } |         public DbSet<WorkArea> WorkAreas { get; set; } | ||||||
|         public DbSet<WorkItem> WorkItems { get; set; } |         public DbSet<WorkItem> WorkItems { get; set; } | ||||||
|         //public DbSet<WorkItemMapping> WorkItemMapping { get; set; } |         public DbSet<WorkItemMapping> WorkItemMapping { get; set; } | ||||||
| 
 | 
 | ||||||
|         public DbSet<WorkShift> WorkShifts { get; set; } |         public DbSet<WorkShift> WorkShifts { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
|         public DbSet<TaskAllocation> TaskAllocations { get; set; } |         public DbSet<TaskAllocation> TaskAllocations { get; set; } | ||||||
|         public DbSet<TaskComment> TaskComments { get; set; } |  | ||||||
|         public DbSet<TaskMembers> TaskMembers { get; set; } |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
|        // public DbSet<Attendance> Attendances { get; set; } |        // public DbSet<Attendance> Attendances { get; set; } | ||||||
|         public DbSet<Attendance> Attendes { get; set; } |         public DbSet<Attendance> Attendes { get; set; } | ||||||
| 
 | 
 | ||||||
| @ -73,9 +64,6 @@ namespace Marco.Pms.DataAccess.Data | |||||||
|         public DbSet<RolePermissionMappings> RolePermissionMappings { get; set; } |         public DbSet<RolePermissionMappings> RolePermissionMappings { get; set; } | ||||||
| 
 | 
 | ||||||
|         public DbSet<Industry>Industries { get; set; } |         public DbSet<Industry>Industries { get; set; } | ||||||
|         public DbSet<ActivityCheckList>ActivityCheckLists { get; set; } |  | ||||||
|         public DbSet<CheckListMappings> CheckListMappings { get; set; } |  | ||||||
|         public DbSet<Inquiries> Inquiries { get; set; } |  | ||||||
| 
 | 
 | ||||||
|         protected override void OnModelCreating(ModelBuilder modelBuilder) |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -79,7 +79,7 @@ namespace Marco.Pms.DataAccess.Initializer | |||||||
|                     ApplicationUserId = user.Id, |                     ApplicationUserId = user.Id, | ||||||
|                     BirthDate = DateTime.MinValue, |                     BirthDate = DateTime.MinValue, | ||||||
|                     PanNumber = "", |                     PanNumber = "", | ||||||
|                     PermanentAddress = "", |                     PeramnentAddress = "", | ||||||
|                     PhoneNumber = "", |                     PhoneNumber = "", | ||||||
|                     TenantId = user.TenantId |                     TenantId = user.TenantId | ||||||
|                 }; |                 }; | ||||||
|  | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,543 +0,0 @@ | |||||||
| using System; |  | ||||||
| using Microsoft.EntityFrameworkCore.Metadata; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class TaskAllocationModels : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_ActivityMasters_TaskAllocations_TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Buildings_BuildingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Employees_EmployeeId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Projects_ProjectId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkAreas_WorkAreaId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropIndex( |  | ||||||
|                 name: "IX_TaskAllocations_BuildingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropIndex( |  | ||||||
|                 name: "IX_TaskAllocations_EmployeeId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropIndex( |  | ||||||
|                 name: "IX_ActivityMasters_TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "BuildingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "EmployeeId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "WorkAreaId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "WorkItemMappingId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "ReAllocationDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "ReportedDate"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "ProjectId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "WorkItemId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "EmployeeRole", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "AssignedBy"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "AllocationDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "AssignmentDate"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameIndex( |  | ||||||
|                 name: "IX_TaskAllocations_WorkAreaId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "IX_TaskAllocations_WorkItemMappingId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameIndex( |  | ||||||
|                 name: "IX_TaskAllocations_ProjectId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "IX_TaskAllocations_WorkItemId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<double>( |  | ||||||
|                 name: "PlannedWork", |  | ||||||
|                 table: "WorkItems", |  | ||||||
|                 type: "double", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(int), |  | ||||||
|                 oldType: "int"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<double>( |  | ||||||
|                 name: "CompletedWork", |  | ||||||
|                 table: "WorkItems", |  | ||||||
|                 type: "double", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(int), |  | ||||||
|                 oldType: "int"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<long>( |  | ||||||
|                 name: "Id", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "bigint", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(int), |  | ||||||
|                 oldType: "int") |  | ||||||
|                 .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) |  | ||||||
|                 .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<double>( |  | ||||||
|                 name: "CompletedTask", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "double", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: 0.0); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<double>( |  | ||||||
|                 name: "PlannedTask", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "double", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: 0.0); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "TaskComments", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<long>(type: "bigint", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     TaskAllocationId = table.Column<long>(type: "bigint", nullable: false), |  | ||||||
|                     CommentDate = table.Column<DateTime>(type: "datetime(6)", nullable: false), |  | ||||||
|                     Comment = table.Column<string>(type: "longtext", nullable: false) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     CommentedBy = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     TenantId = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_TaskComments", x => x.Id); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskComments_Employees_CommentedBy", |  | ||||||
|                         column: x => x.CommentedBy, |  | ||||||
|                         principalTable: "Employees", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskComments_TaskAllocations_TaskAllocationId", |  | ||||||
|                         column: x => x.TaskAllocationId, |  | ||||||
|                         principalTable: "TaskAllocations", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskComments_Tenants_TenantId", |  | ||||||
|                         column: x => x.TenantId, |  | ||||||
|                         principalTable: "Tenants", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "TaskMembers", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<long>(type: "bigint", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     TaskAllocationId = table.Column<long>(type: "bigint", nullable: false), |  | ||||||
|                     EmployeeId = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     TenantId = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_TaskMembers", x => x.Id); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskMembers_Employees_EmployeeId", |  | ||||||
|                         column: x => x.EmployeeId, |  | ||||||
|                         principalTable: "Employees", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskMembers_TaskAllocations_TaskAllocationId", |  | ||||||
|                         column: x => x.TaskAllocationId, |  | ||||||
|                         principalTable: "TaskAllocations", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_TaskMembers_Tenants_TenantId", |  | ||||||
|                         column: x => x.TenantId, |  | ||||||
|                         principalTable: "Tenants", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskAllocations_AssignedBy", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "AssignedBy"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskComments_CommentedBy", |  | ||||||
|                 table: "TaskComments", |  | ||||||
|                 column: "CommentedBy"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskComments_TaskAllocationId", |  | ||||||
|                 table: "TaskComments", |  | ||||||
|                 column: "TaskAllocationId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskComments_TenantId", |  | ||||||
|                 table: "TaskComments", |  | ||||||
|                 column: "TenantId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskMembers_EmployeeId", |  | ||||||
|                 table: "TaskMembers", |  | ||||||
|                 column: "EmployeeId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskMembers_TaskAllocationId", |  | ||||||
|                 table: "TaskMembers", |  | ||||||
|                 column: "TaskAllocationId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskMembers_TenantId", |  | ||||||
|                 table: "TaskMembers", |  | ||||||
|                 column: "TenantId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Employees_AssignedBy", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "AssignedBy", |  | ||||||
|                 principalTable: "Employees", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItemMapping_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "WorkItemMappingId", |  | ||||||
|                 principalTable: "WorkItemMapping", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItems_WorkItemId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "WorkItemId", |  | ||||||
|                 principalTable: "WorkItems", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Employees_AssignedBy", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItemMapping_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItems_WorkItemId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "TaskComments"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "TaskMembers"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropIndex( |  | ||||||
|                 name: "IX_TaskAllocations_AssignedBy", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "CompletedTask", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "PlannedTask", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "WorkAreaId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "WorkItemId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "ProjectId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "ReportedDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "ReAllocationDate"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "AssignmentDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "AllocationDate"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameColumn( |  | ||||||
|                 name: "AssignedBy", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "EmployeeRole"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameIndex( |  | ||||||
|                 name: "IX_TaskAllocations_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "IX_TaskAllocations_WorkAreaId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.RenameIndex( |  | ||||||
|                 name: "IX_TaskAllocations_WorkItemId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 newName: "IX_TaskAllocations_ProjectId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<int>( |  | ||||||
|                 name: "PlannedWork", |  | ||||||
|                 table: "WorkItems", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(double), |  | ||||||
|                 oldType: "double"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<int>( |  | ||||||
|                 name: "CompletedWork", |  | ||||||
|                 table: "WorkItems", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(double), |  | ||||||
|                 oldType: "double"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<int>( |  | ||||||
|                 name: "Id", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(long), |  | ||||||
|                 oldType: "bigint") |  | ||||||
|                 .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn) |  | ||||||
|                 .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<int>( |  | ||||||
|                 name: "BuildingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: 0); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<int>( |  | ||||||
|                 name: "EmployeeId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: 0); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<int>( |  | ||||||
|                 name: "TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 1, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 2, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 3, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 4, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 5, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 6, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 7, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 8, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 9, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 10, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 11, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 12, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 13, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 14, |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 value: null); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskAllocations_BuildingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "BuildingId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskAllocations_EmployeeId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "EmployeeId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_ActivityMasters_TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 column: "TaskAllocationId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_ActivityMasters_TaskAllocations_TaskAllocationId", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 column: "TaskAllocationId", |  | ||||||
|                 principalTable: "TaskAllocations", |  | ||||||
|                 principalColumn: "Id"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Buildings_BuildingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "BuildingId", |  | ||||||
|                 principalTable: "Buildings", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Employees_EmployeeId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "EmployeeId", |  | ||||||
|                 principalTable: "Employees", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_Projects_ProjectId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "ProjectId", |  | ||||||
|                 principalTable: "Projects", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkAreas_WorkAreaId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "WorkAreaId", |  | ||||||
|                 principalTable: "WorkAreas", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,37 +0,0 @@ | |||||||
| using System; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class Make_ReportDate_Nullable : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.AlterColumn<DateTime>( |  | ||||||
|                 name: "ReportedDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "datetime(6)", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(DateTime), |  | ||||||
|                 oldType: "datetime(6)"); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.AlterColumn<DateTime>( |  | ||||||
|                 name: "ReportedDate", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "datetime(6)", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), |  | ||||||
|                 oldClrType: typeof(DateTime), |  | ||||||
|                 oldType: "datetime(6)", |  | ||||||
|                 oldNullable: true); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,131 +0,0 @@ | |||||||
| using Microsoft.EntityFrameworkCore.Metadata; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class Removed_WorkItemMapping : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItemMapping_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "WorkItemMapping"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropIndex( |  | ||||||
|                 name: "IX_TaskAllocations_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<int>( |  | ||||||
|                 name: "WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 type: "int", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: 0); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "WorkItemMapping", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     TenantId = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     WorkAreaId = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     WorkItemId = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_WorkItemMapping", x => x.Id); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_WorkItemMapping_Tenants_TenantId", |  | ||||||
|                         column: x => x.TenantId, |  | ||||||
|                         principalTable: "Tenants", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_WorkItemMapping_WorkAreas_WorkAreaId", |  | ||||||
|                         column: x => x.WorkAreaId, |  | ||||||
|                         principalTable: "WorkAreas", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                     table.ForeignKey( |  | ||||||
|                         name: "FK_WorkItemMapping_WorkItems_WorkItemId", |  | ||||||
|                         column: x => x.WorkItemId, |  | ||||||
|                         principalTable: "WorkItems", |  | ||||||
|                         principalColumn: "Id", |  | ||||||
|                         onDelete: ReferentialAction.Cascade); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_TaskAllocations_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "WorkItemMappingId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_WorkItemMapping_TenantId", |  | ||||||
|                 table: "WorkItemMapping", |  | ||||||
|                 column: "TenantId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_WorkItemMapping_WorkAreaId", |  | ||||||
|                 table: "WorkItemMapping", |  | ||||||
|                 column: "WorkAreaId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateIndex( |  | ||||||
|                 name: "IX_WorkItemMapping_WorkItemId", |  | ||||||
|                 table: "WorkItemMapping", |  | ||||||
|                 column: "WorkItemId"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddForeignKey( |  | ||||||
|                 name: "FK_TaskAllocations_WorkItemMapping_WorkItemMappingId", |  | ||||||
|                 table: "TaskAllocations", |  | ||||||
|                 column: "WorkItemMappingId", |  | ||||||
|                 principalTable: "WorkItemMapping", |  | ||||||
|                 principalColumn: "Id", |  | ||||||
|                 onDelete: ReferentialAction.Cascade); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,984 +0,0 @@ | |||||||
| using Microsoft.EntityFrameworkCore.Metadata; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class Added_Check_List_Table : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "PeramnentAddress", |  | ||||||
|                 table: "Employees"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "WorkShifts", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "DomainName", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactNumber", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactName", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Status", |  | ||||||
|                 table: "StatusMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "UserId", |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 type: "varchar(255)", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "varchar(255)") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Token", |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ProjectAddress", |  | ||||||
|                 table: "Projects", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactPerson", |  | ||||||
|                 table: "Projects", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Modules", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "JobRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Industries", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Features", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Features", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "PhoneNumber", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "LastName", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Gender", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "FirstName", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "EmergencyPhoneNumber", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "EmergencyContactPerson", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "CurrentAddress", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<string>( |  | ||||||
|                 name: "PermanentAddress", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Role", |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "UnitOfMeasurement", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ActivityName", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: true, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext") |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<bool>( |  | ||||||
|                 name: "IsActive", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "tinyint(1)", |  | ||||||
|                 nullable: false, |  | ||||||
|                 defaultValue: false); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "ActivityCheckLists", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     ActivityId = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     Description = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     IsChecked = table.Column<bool>(type: "tinyint(1)", nullable: false), |  | ||||||
|                     IsMandatory = table.Column<bool>(type: "tinyint(1)", nullable: false), |  | ||||||
|                     TenantId = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_ActivityCheckLists", x => x.Id); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 1, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 2, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 3, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 4, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 5, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 6, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 7, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 8, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 9, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 10, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 11, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 12, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 13, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "Id", |  | ||||||
|                 keyValue: 14, |  | ||||||
|                 column: "IsActive", |  | ||||||
|                 value: true); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "ActivityCheckLists"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "PermanentAddress", |  | ||||||
|                 table: "Employees"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.DropColumn( |  | ||||||
|                 name: "IsActive", |  | ||||||
|                 table: "ActivityMasters"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "WorkShifts", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "WorkShifts", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 keyColumn: "DomainName", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "DomainName", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "DomainName", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 keyColumn: "ContactNumber", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "ContactNumber", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactNumber", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 keyColumn: "ContactName", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "ContactName", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactName", |  | ||||||
|                 table: "Tenants", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "StatusMasters", |  | ||||||
|                 keyColumn: "Status", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Status", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Status", |  | ||||||
|                 table: "StatusMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 keyColumn: "UserId", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "UserId", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "UserId", |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 type: "varchar(255)", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "varchar(255)", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 keyColumn: "Token", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Token", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Token", |  | ||||||
|                 table: "RefreshTokens", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Projects", |  | ||||||
|                 keyColumn: "ProjectAddress", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "ProjectAddress", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ProjectAddress", |  | ||||||
|                 table: "Projects", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Projects", |  | ||||||
|                 keyColumn: "ContactPerson", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "ContactPerson", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ContactPerson", |  | ||||||
|                 table: "Projects", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Modules", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Modules", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "JobRoles", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "JobRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Industries", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Industries", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Features", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "Features", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Features", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "Features", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 keyColumn: "Name", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Name", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Name", |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "FeaturePermissions", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "PhoneNumber", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "PhoneNumber", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "PhoneNumber", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "LastName", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "LastName", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "LastName", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "Gender", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Gender", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Gender", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "FirstName", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "FirstName", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "FirstName", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "EmergencyPhoneNumber", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "EmergencyPhoneNumber", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "EmergencyPhoneNumber", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "EmergencyContactPerson", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "EmergencyContactPerson", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "EmergencyContactPerson", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "Employees", |  | ||||||
|                 keyColumn: "CurrentAddress", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "CurrentAddress", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "CurrentAddress", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AddColumn<string>( |  | ||||||
|                 name: "PeramnentAddress", |  | ||||||
|                 table: "Employees", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 keyColumn: "Role", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Role", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Role", |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 keyColumn: "Description", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "Description", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "Description", |  | ||||||
|                 table: "ApplicationRoles", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "UnitOfMeasurement", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "UnitOfMeasurement", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "UnitOfMeasurement", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.UpdateData( |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 keyColumn: "ActivityName", |  | ||||||
|                 keyValue: null, |  | ||||||
|                 column: "ActivityName", |  | ||||||
|                 value: ""); |  | ||||||
| 
 |  | ||||||
|             migrationBuilder.AlterColumn<string>( |  | ||||||
|                 name: "ActivityName", |  | ||||||
|                 table: "ActivityMasters", |  | ||||||
|                 type: "longtext", |  | ||||||
|                 nullable: false, |  | ||||||
|                 oldClrType: typeof(string), |  | ||||||
|                 oldType: "longtext", |  | ||||||
|                 oldNullable: true) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 .OldAnnotation("MySql:CharSet", "utf8mb4"); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,37 +0,0 @@ | |||||||
| using Microsoft.EntityFrameworkCore.Metadata; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class Added_CheckListMappings_Table : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "CheckListMappings", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     TaskAllocationId = table.Column<long>(type: "bigint", nullable: false), |  | ||||||
|                     CheckListId = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_CheckListMappings", x => x.Id); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "CheckListMappings"); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,48 +0,0 @@ | |||||||
| using Microsoft.EntityFrameworkCore.Metadata; |  | ||||||
| using Microsoft.EntityFrameworkCore.Migrations; |  | ||||||
| 
 |  | ||||||
| #nullable disable |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.DataAccess.Migrations |  | ||||||
| { |  | ||||||
|     /// <inheritdoc /> |  | ||||||
|     public partial class Added_Inquiries_table : Migration |  | ||||||
|     { |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Up(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.CreateTable( |  | ||||||
|                 name: "Inquiries", |  | ||||||
|                 columns: table => new |  | ||||||
|                 { |  | ||||||
|                     Id = table.Column<int>(type: "int", nullable: false) |  | ||||||
|                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), |  | ||||||
|                     OrganizatioinName = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     Email = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     About = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     OragnizationSize = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     IndustryId = table.Column<int>(type: "int", nullable: false), |  | ||||||
|                     ContactPerson = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4"), |  | ||||||
|                     ContactNumber = table.Column<string>(type: "longtext", nullable: true) |  | ||||||
|                         .Annotation("MySql:CharSet", "utf8mb4") |  | ||||||
|                 }, |  | ||||||
|                 constraints: table => |  | ||||||
|                 { |  | ||||||
|                     table.PrimaryKey("PK_Inquiries", x => x.Id); |  | ||||||
|                 }) |  | ||||||
|                 .Annotation("MySql:CharSet", "utf8mb4"); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         /// <inheritdoc /> |  | ||||||
|         protected override void Down(MigrationBuilder migrationBuilder) |  | ||||||
|         { |  | ||||||
|             migrationBuilder.DropTable( |  | ||||||
|                 name: "Inquiries"); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -24,108 +24,114 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b => |             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b => | ||||||
|                 { |                 { | ||||||
|                     b.Property<long>("Id") |                     b.Property<int>("Id") | ||||||
|                         .ValueGeneratedOnAdd() |                         .ValueGeneratedOnAdd() | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("AssignedBy") |  | ||||||
|                         .HasColumnType("int"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<DateTime>("AssignmentDate") |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
|  | 
 | ||||||
|  |                     b.Property<DateTime>("AllocationDate") | ||||||
|                         .HasColumnType("datetime(6)"); |                         .HasColumnType("datetime(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<double>("CompletedTask") |                     b.Property<int>("BuildingId") | ||||||
|                         .HasColumnType("double"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<int>("EmployeeId") | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<double>("PlannedTask") |                     b.Property<int>("EmployeeRole") | ||||||
|                         .HasColumnType("double"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<DateTime?>("ReportedDate") |                     b.Property<int>("ProjectId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<DateTime>("ReAllocationDate") | ||||||
|                         .HasColumnType("datetime(6)"); |                         .HasColumnType("datetime(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("TenantId") |                     b.Property<int>("TenantId") | ||||||
|                         .HasColumnType("int"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|  |                     b.Property<int>("WorkAreaId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.HasKey("Id"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("BuildingId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("EmployeeId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("ProjectId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("TenantId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("WorkAreaId"); | ||||||
|  | 
 | ||||||
|  |                     b.ToTable("TaskAllocations"); | ||||||
|  |                 }); | ||||||
|  | 
 | ||||||
|  |             modelBuilder.Entity("Marco.Pms.Model.Activities.WorkItem", b => | ||||||
|  |                 { | ||||||
|  |                     b.Property<int>("Id") | ||||||
|  |                         .ValueGeneratedOnAdd() | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("ActivityId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("CompletedWork") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("PlannedWork") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<DateTime>("TaskDate") | ||||||
|  |                         .HasColumnType("datetime(6)"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("TenantId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("WorkAreaId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.HasKey("Id"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("ActivityId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("TenantId"); | ||||||
|  | 
 | ||||||
|  |                     b.HasIndex("WorkAreaId"); | ||||||
|  | 
 | ||||||
|  |                     b.ToTable("WorkItems"); | ||||||
|  |                 }); | ||||||
|  | 
 | ||||||
|  |             modelBuilder.Entity("Marco.Pms.Model.Activities.WorkItemMapping", b => | ||||||
|  |                 { | ||||||
|  |                     b.Property<int>("Id") | ||||||
|  |                         .ValueGeneratedOnAdd() | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("TenantId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|  |                     b.Property<int>("WorkAreaId") | ||||||
|  |                         .HasColumnType("int"); | ||||||
|  | 
 | ||||||
|                     b.Property<int>("WorkItemId") |                     b.Property<int>("WorkItemId") | ||||||
|                         .HasColumnType("int"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| 
 | 
 | ||||||
|                     b.HasIndex("AssignedBy"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TenantId"); |                     b.HasIndex("TenantId"); | ||||||
| 
 | 
 | ||||||
|  |                     b.HasIndex("WorkAreaId"); | ||||||
|  | 
 | ||||||
|                     b.HasIndex("WorkItemId"); |                     b.HasIndex("WorkItemId"); | ||||||
| 
 | 
 | ||||||
|                     b.ToTable("TaskAllocations"); |                     b.ToTable("WorkItemMapping"); | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<long>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("Comment") |  | ||||||
|                         .IsRequired() |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<DateTime>("CommentDate") |  | ||||||
|                         .HasColumnType("datetime(6)"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("CommentedBy") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<long>("TaskAllocationId") |  | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("TenantId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("CommentedBy"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TaskAllocationId"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TenantId"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("TaskComments"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<long>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<long>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("EmployeeId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<long>("TaskAllocationId") |  | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("TenantId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("EmployeeId"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TaskAllocationId"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TenantId"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("TaskMembers"); |  | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b => |             modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b => | ||||||
| @ -258,9 +264,11 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("datetime(6)"); |                         .HasColumnType("datetime(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Token") |                     b.Property<string>("Token") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("UserId") |                     b.Property<string>("UserId") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("varchar(255)"); |                         .HasColumnType("varchar(255)"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| @ -288,21 +296,26 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("datetime(6)"); |                         .HasColumnType("datetime(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("CurrentAddress") |                     b.Property<string>("CurrentAddress") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Email") |                     b.Property<string>("Email") | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("EmergencyContactPerson") |                     b.Property<string>("EmergencyContactPerson") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("EmergencyPhoneNumber") |                     b.Property<string>("EmergencyPhoneNumber") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("FirstName") |                     b.Property<string>("FirstName") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Gender") |                     b.Property<string>("Gender") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<bool>("IsActive") |                     b.Property<bool>("IsActive") | ||||||
| @ -315,6 +328,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("datetime(6)"); |                         .HasColumnType("datetime(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("LastName") |                     b.Property<string>("LastName") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("MiddleName") |                     b.Property<string>("MiddleName") | ||||||
| @ -323,10 +337,12 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     b.Property<string>("PanNumber") |                     b.Property<string>("PanNumber") | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("PermanentAddress") |                     b.Property<string>("PeramnentAddress") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("PhoneNumber") |                     b.Property<string>("PhoneNumber") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<byte[]>("Photo") |                     b.Property<byte[]>("Photo") | ||||||
| @ -361,6 +377,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("time(6)"); |                         .HasColumnType("time(6)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<TimeOnly>("StartTime") |                     b.Property<TimeOnly>("StartTime") | ||||||
| @ -376,34 +393,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     b.ToTable("WorkShifts"); |                     b.ToTable("WorkShifts"); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<int>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("ActivityId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("Description") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<bool>("IsChecked") |  | ||||||
|                         .HasColumnType("tinyint(1)"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<bool>("IsMandatory") |  | ||||||
|                         .HasColumnType("tinyint(1)"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("TenantId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("ActivityCheckLists"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b => |             modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b => | ||||||
|                 { |                 { | ||||||
|                     b.Property<int>("Id") |                     b.Property<int>("Id") | ||||||
| @ -413,19 +402,23 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("ActivityName") |                     b.Property<string>("ActivityName") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<bool>("IsActive") |                     b.Property<int?>("TaskAllocationId") | ||||||
|                         .HasColumnType("tinyint(1)"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("TenantId") |                     b.Property<int>("TenantId") | ||||||
|                         .HasColumnType("int"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("UnitOfMeasurement") |                     b.Property<string>("UnitOfMeasurement") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| 
 | 
 | ||||||
|  |                     b.HasIndex("TaskAllocationId"); | ||||||
|  | 
 | ||||||
|                     b.HasIndex("TenantId"); |                     b.HasIndex("TenantId"); | ||||||
| 
 | 
 | ||||||
|                     b.ToTable("ActivityMasters"); |                     b.ToTable("ActivityMasters"); | ||||||
| @ -435,7 +428,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 1, |                             Id = 1, | ||||||
|                             ActivityName = "Core Cutting", |                             ActivityName = "Core Cutting", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }, |                         }, | ||||||
| @ -443,7 +435,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 2, |                             Id = 2, | ||||||
|                             ActivityName = "Fabrication", |                             ActivityName = "Fabrication", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -451,7 +442,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 3, |                             Id = 3, | ||||||
|                             ActivityName = "Lifting", |                             ActivityName = "Lifting", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -459,7 +449,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 4, |                             Id = 4, | ||||||
|                             ActivityName = "Hanging", |                             ActivityName = "Hanging", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -467,7 +456,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 5, |                             Id = 5, | ||||||
|                             ActivityName = "Tapping", |                             ActivityName = "Tapping", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -475,7 +463,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 6, |                             Id = 6, | ||||||
|                             ActivityName = "Welding", |                             ActivityName = "Welding", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -483,7 +470,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 7, |                             Id = 7, | ||||||
|                             ActivityName = "Testing", |                             ActivityName = "Testing", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Area" |                             UnitOfMeasurement = "Area" | ||||||
|                         }, |                         }, | ||||||
| @ -491,7 +477,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 8, |                             Id = 8, | ||||||
|                             ActivityName = "Painting", |                             ActivityName = "Painting", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -499,7 +484,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 9, |                             Id = 9, | ||||||
|                             ActivityName = "Marking Area", |                             ActivityName = "Marking Area", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Meter" |                             UnitOfMeasurement = "Meter" | ||||||
|                         }, |                         }, | ||||||
| @ -507,7 +491,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 10, |                             Id = 10, | ||||||
|                             ActivityName = "Drilling", |                             ActivityName = "Drilling", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }, |                         }, | ||||||
| @ -515,7 +498,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 11, |                             Id = 11, | ||||||
|                             ActivityName = "MS Support Fabrication", |                             ActivityName = "MS Support Fabrication", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }, |                         }, | ||||||
| @ -523,7 +505,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 12, |                             Id = 12, | ||||||
|                             ActivityName = "MS Support Hanging", |                             ActivityName = "MS Support Hanging", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }, |                         }, | ||||||
| @ -531,7 +512,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 13, |                             Id = 13, | ||||||
|                             ActivityName = "Hydrant Volve", |                             ActivityName = "Hydrant Volve", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }, |                         }, | ||||||
| @ -539,7 +519,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         { |                         { | ||||||
|                             Id = 14, |                             Id = 14, | ||||||
|                             ActivityName = "Sprinkler Installation", |                             ActivityName = "Sprinkler Installation", | ||||||
|                             IsActive = true, |  | ||||||
|                             TenantId = 1, |                             TenantId = 1, | ||||||
|                             UnitOfMeasurement = "Number" |                             UnitOfMeasurement = "Number" | ||||||
|                         }); |                         }); | ||||||
| @ -552,9 +531,11 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("char(36)"); |                         .HasColumnType("char(36)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<string>("Description") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Role") |                     b.Property<string>("Role") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("TenantId") |                     b.Property<int>("TenantId") | ||||||
| @ -604,25 +585,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         }); |                         }); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<int>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("CheckListId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<long>("TaskAllocationId") |  | ||||||
|                         .HasColumnType("bigint"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("CheckListMappings"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.EmployeeRoleMapping", b => |             modelBuilder.Entity("Marco.Pms.Model.Entitlements.EmployeeRoleMapping", b => | ||||||
|                 { |                 { | ||||||
|                     b.Property<Guid>("Id") |                     b.Property<Guid>("Id") | ||||||
| @ -659,6 +621,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("char(36)"); |                         .HasColumnType("char(36)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<string>("Description") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<bool>("IsActive") |                     b.Property<bool>("IsActive") | ||||||
| @ -668,6 +631,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("int"); |                         .HasColumnType("int"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| @ -750,6 +714,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("char(36)"); |                         .HasColumnType("char(36)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<string>("Description") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<Guid>("FeatureId") |                     b.Property<Guid>("FeatureId") | ||||||
| @ -759,6 +724,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("tinyint(1)"); |                         .HasColumnType("tinyint(1)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| @ -926,6 +892,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("TenantId") |                     b.Property<int>("TenantId") | ||||||
| @ -947,6 +914,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<string>("Description") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Key") |                     b.Property<string>("Key") | ||||||
| @ -1009,6 +977,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Status") |                     b.Property<string>("Status") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("TenantId") |                     b.Property<int>("TenantId") | ||||||
| @ -1056,15 +1025,19 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("ContactName") |                     b.Property<string>("ContactName") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("ContactNumber") |                     b.Property<string>("ContactNumber") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Description") |                     b.Property<string>("Description") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("DomainName") |                     b.Property<string>("DomainName") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int?>("IndustryId") |                     b.Property<int?>("IndustryId") | ||||||
| @ -1074,6 +1047,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("tinyint(1)"); |                         .HasColumnType("tinyint(1)"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<DateTime>("OnBoardingDate") |                     b.Property<DateTime>("OnBoardingDate") | ||||||
| @ -1112,6 +1086,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("Name") |                     b.Property<string>("Name") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.HasKey("Id"); |                     b.HasKey("Id"); | ||||||
| @ -1230,6 +1205,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("ContactPerson") |                     b.Property<string>("ContactPerson") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<DateTime?>("EndDate") |                     b.Property<DateTime?>("EndDate") | ||||||
| @ -1240,6 +1216,7 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<string>("ProjectAddress") |                     b.Property<string>("ProjectAddress") | ||||||
|  |                         .IsRequired() | ||||||
|                         .HasColumnType("longtext"); |                         .HasColumnType("longtext"); | ||||||
| 
 | 
 | ||||||
|                     b.Property<int>("ProjectStatusId") |                     b.Property<int>("ProjectStatusId") | ||||||
| @ -1356,77 +1333,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     b.ToTable("WorkAreas"); |                     b.ToTable("WorkAreas"); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<int>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("ActivityId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<double>("CompletedWork") |  | ||||||
|                         .HasColumnType("double"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<double>("PlannedWork") |  | ||||||
|                         .HasColumnType("double"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<DateTime>("TaskDate") |  | ||||||
|                         .HasColumnType("datetime(6)"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("TenantId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("WorkAreaId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("ActivityId"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("TenantId"); |  | ||||||
| 
 |  | ||||||
|                     b.HasIndex("WorkAreaId"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("WorkItems"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b => |  | ||||||
|                 { |  | ||||||
|                     b.Property<int>("Id") |  | ||||||
|                         .ValueGeneratedOnAdd() |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id")); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("About") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("ContactNumber") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("ContactPerson") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("Email") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<int>("IndustryId") |  | ||||||
|                         .HasColumnType("int"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("OragnizationSize") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.Property<string>("OrganizatioinName") |  | ||||||
|                         .HasColumnType("longtext"); |  | ||||||
| 
 |  | ||||||
|                     b.HasKey("Id"); |  | ||||||
| 
 |  | ||||||
|                     b.ToTable("Inquiries"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => |             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => | ||||||
|                 { |                 { | ||||||
|                     b.Property<string>("Id") |                     b.Property<string>("Id") | ||||||
| @ -1650,69 +1556,21 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b => |             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b => | ||||||
|                 { |                 { | ||||||
|                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee") |                     b.HasOne("Marco.Pms.Model.Projects.Building", "Building") | ||||||
|                         .WithMany() |                         .WithMany() | ||||||
|                         .HasForeignKey("AssignedBy") |                         .HasForeignKey("BuildingId") | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|                         .IsRequired(); |                         .IsRequired(); | ||||||
| 
 | 
 | ||||||
|                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("TenantId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("WorkItemId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("Employee"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("Tenant"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("WorkItem"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b => |  | ||||||
|                 { |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("CommentedBy") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("TaskAllocationId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("TenantId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("Employee"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("TaskAllocation"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("Tenant"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b => |  | ||||||
|                 { |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee") |                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee") | ||||||
|                         .WithMany() |                         .WithMany() | ||||||
|                         .HasForeignKey("EmployeeId") |                         .HasForeignKey("EmployeeId") | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|                         .IsRequired(); |                         .IsRequired(); | ||||||
| 
 | 
 | ||||||
|                     b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation") |                     b.HasOne("Marco.Pms.Model.Projects.Project", "Project") | ||||||
|                         .WithMany() |                         .WithMany() | ||||||
|                         .HasForeignKey("TaskAllocationId") |                         .HasForeignKey("ProjectId") | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|                         .IsRequired(); |                         .IsRequired(); | ||||||
| 
 | 
 | ||||||
| @ -1722,11 +1580,75 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .OnDelete(DeleteBehavior.Cascade) |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|                         .IsRequired(); |                         .IsRequired(); | ||||||
| 
 | 
 | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("WorkAreaId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("Building"); | ||||||
|  | 
 | ||||||
|                     b.Navigation("Employee"); |                     b.Navigation("Employee"); | ||||||
| 
 | 
 | ||||||
|                     b.Navigation("TaskAllocation"); |                     b.Navigation("Project"); | ||||||
| 
 | 
 | ||||||
|                     b.Navigation("Tenant"); |                     b.Navigation("Tenant"); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("WorkArea"); | ||||||
|  |                 }); | ||||||
|  | 
 | ||||||
|  |             modelBuilder.Entity("Marco.Pms.Model.Activities.WorkItem", b => | ||||||
|  |                 { | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Entitlements.ActivityMaster", "ActivityMaster") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("ActivityId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("TenantId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("WorkAreaId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("ActivityMaster"); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("Tenant"); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("WorkArea"); | ||||||
|  |                 }); | ||||||
|  | 
 | ||||||
|  |             modelBuilder.Entity("Marco.Pms.Model.Activities.WorkItemMapping", b => | ||||||
|  |                 { | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("TenantId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("WorkAreaId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Activities.WorkItem", "WorkItem") | ||||||
|  |                         .WithMany() | ||||||
|  |                         .HasForeignKey("WorkItemId") | ||||||
|  |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("Tenant"); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("WorkArea"); | ||||||
|  | 
 | ||||||
|  |                     b.Navigation("WorkItem"); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b => |             modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b => | ||||||
| @ -1786,7 +1708,8 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User") |                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User") | ||||||
|                         .WithMany() |                         .WithMany() | ||||||
|                         .HasForeignKey("UserId") |                         .HasForeignKey("UserId") | ||||||
|                         .OnDelete(DeleteBehavior.Cascade); |                         .OnDelete(DeleteBehavior.Cascade) | ||||||
|  |                         .IsRequired(); | ||||||
| 
 | 
 | ||||||
|                     b.Navigation("User"); |                     b.Navigation("User"); | ||||||
|                 }); |                 }); | ||||||
| @ -1827,6 +1750,10 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b => |             modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityMaster", b => | ||||||
|                 { |                 { | ||||||
|  |                     b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", null) | ||||||
|  |                         .WithMany("AllotedTask") | ||||||
|  |                         .HasForeignKey("TaskAllocationId"); | ||||||
|  | 
 | ||||||
|                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") |                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") | ||||||
|                         .WithMany() |                         .WithMany() | ||||||
|                         .HasForeignKey("TenantId") |                         .HasForeignKey("TenantId") | ||||||
| @ -2035,33 +1962,6 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                     b.Navigation("Tenant"); |                     b.Navigation("Tenant"); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b => |  | ||||||
|                 { |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Entitlements.ActivityMaster", "ActivityMaster") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("ActivityId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("TenantId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea") |  | ||||||
|                         .WithMany() |  | ||||||
|                         .HasForeignKey("WorkAreaId") |  | ||||||
|                         .OnDelete(DeleteBehavior.Cascade) |  | ||||||
|                         .IsRequired(); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("ActivityMaster"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("Tenant"); |  | ||||||
| 
 |  | ||||||
|                     b.Navigation("WorkArea"); |  | ||||||
|                 }); |  | ||||||
| 
 |  | ||||||
|             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b => |             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b => | ||||||
|                 { |                 { | ||||||
|                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) |                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) | ||||||
| @ -2113,6 +2013,11 @@ namespace Marco.Pms.DataAccess.Migrations | |||||||
|                         .IsRequired(); |                         .IsRequired(); | ||||||
|                 }); |                 }); | ||||||
| 
 | 
 | ||||||
|  |             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b => | ||||||
|  |                 { | ||||||
|  |                     b.Navigation("AllotedTask"); | ||||||
|  |                 }); | ||||||
|  | 
 | ||||||
|             modelBuilder.Entity("Marco.Pms.Model.Entitlements.Feature", b => |             modelBuilder.Entity("Marco.Pms.Model.Entitlements.Feature", b => | ||||||
|                 { |                 { | ||||||
|                     b.Navigation("FeaturePermissions"); |                     b.Navigation("FeaturePermissions"); | ||||||
|  | |||||||
| @ -1,43 +1,52 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Marco.Pms.Model.Employees; | ||||||
| using Marco.Pms.Model.Employees; |  | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Marco.Pms.Model.Projects; | using Marco.Pms.Model.Projects; | ||||||
|  | using Marco.Pms.Utility; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Activities | namespace Marco.Pms.Model.Activities | ||||||
| { | { | ||||||
|     public class TaskAllocation |     public class TaskAllocation | ||||||
|     { |     { | ||||||
|         public long Id { get; set; } |         public int Id { get; set; } | ||||||
| 
 |         public int EmployeeId { get; set; } | ||||||
| 
 |         [ForeignKey("EmployeeId")] | ||||||
|         public DateTime AssignmentDate { get; set; } |  | ||||||
|         public double PlannedTask { get; set; } |  | ||||||
|         public double CompletedTask { get; set; } |  | ||||||
|         public DateTime? ReportedDate { get; set; } |  | ||||||
| 
 |  | ||||||
|         public string? Description { get; set; } |  | ||||||
| 
 |  | ||||||
|         //public int? WorkItemMappingId { get; set; } |  | ||||||
|         //[ForeignKey("WorkItemMappingId")] |  | ||||||
|         //[ValidateNever] |  | ||||||
|         //public WorkItemMapping? WorkItemMapping { get; set; } |  | ||||||
| 
 |  | ||||||
|         public int AssignedBy { get; set; }   //Employee Id |  | ||||||
|         [ForeignKey("AssignedBy")] |  | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Employee? Employee { get; set; } |         public Employee Employee { get; set; } | ||||||
|  |         public EMP_ROLES EmployeeRole { get; set; } | ||||||
| 
 | 
 | ||||||
|         public int WorkItemId { get; set; } |         public int ProjectId { get; set; } | ||||||
|         [ForeignKey("WorkItemId")] |         [ForeignKey("ProjectId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public WorkItem? WorkItem { get; set; } |         public Project Project { get; set; } | ||||||
| 
 | 
 | ||||||
|  |         public int BuildingId { get; set; } | ||||||
|  | 
 | ||||||
|  |         [ForeignKey("BuildingId")] | ||||||
|  |         [ValidateNever] | ||||||
|  |         public Building Building { get; set; } | ||||||
|  | 
 | ||||||
|  |         public DateTime AllocationDate { get; set; } | ||||||
|  |         public DateTime ReAllocationDate { get; set; } | ||||||
|  | 
 | ||||||
|  |         public int WorkAreaId { get; set; } | ||||||
|  | 
 | ||||||
|  |         [ForeignKey("WorkAreaId")] | ||||||
|  |         [ValidateNever] | ||||||
|  |         public WorkArea WorkArea { get; set; } | ||||||
|  | 
 | ||||||
|  |         public List<ActivityMaster> AllotedTask { get; set; } | ||||||
|  | 
 | ||||||
|  |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; }       |         public Tenant Tenant { get; set; } | ||||||
|  | 
 | ||||||
|  |        | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,26 +0,0 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Employees; |  | ||||||
| using Marco.Pms.Model.Utilities; |  | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.Activities |  | ||||||
| { |  | ||||||
|     public class TaskComment : TenantTest |  | ||||||
|     { |  | ||||||
|         public long Id { get; set; } |  | ||||||
| 
 |  | ||||||
|         public long TaskAllocationId { get; set; } |  | ||||||
|         [ValidateNever] |  | ||||||
|         [ForeignKey(nameof(TaskAllocationId))] |  | ||||||
|         public TaskAllocation? TaskAllocation { get; set; } |  | ||||||
| 
 |  | ||||||
|         public DateTime CommentDate { get; set; } |  | ||||||
|         public string Comment { get; set; } = string.Empty; |  | ||||||
|         public int CommentedBy { get; set; } |  | ||||||
|         [ForeignKey("CommentedBy")] |  | ||||||
|         [ValidateNever] |  | ||||||
|         public Employee? Employee { get; set; } |  | ||||||
| 
 |  | ||||||
|         |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,17 +0,0 @@ | |||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |  | ||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.Activities |  | ||||||
| { |  | ||||||
|     public class TaskImages |  | ||||||
|     { |  | ||||||
|         public long Id { get; set; } |  | ||||||
| 
 |  | ||||||
|         public long TaskAllocationId { get; set; } |  | ||||||
|         [ValidateNever] |  | ||||||
|         [ForeignKey(nameof(TaskAllocationId))] |  | ||||||
|         public TaskAllocation? TaskAllocation { get; set; } |  | ||||||
| 
 |  | ||||||
|         public string? ImagePath { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,27 +0,0 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Employees; |  | ||||||
| using Marco.Pms.Model.Entitlements; |  | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.Activities |  | ||||||
| { |  | ||||||
|     public class TaskMembers |  | ||||||
|     { |  | ||||||
|         public long Id { get; set; } |  | ||||||
| 
 |  | ||||||
|         public long TaskAllocationId { get; set; } |  | ||||||
|         [ValidateNever] |  | ||||||
|         [ForeignKey(nameof(TaskAllocationId))] |  | ||||||
|         public TaskAllocation? TaskAllocation { get; set; } |  | ||||||
| 
 |  | ||||||
|         public int EmployeeId { get; set; } |  | ||||||
|         [ForeignKey("EmployeeId")] |  | ||||||
|         [ValidateNever] |  | ||||||
|         public Employee? Employee { get; set; } |  | ||||||
|         public int TenantId { get; set; } |  | ||||||
| 
 |  | ||||||
|         [ValidateNever] |  | ||||||
|         [ForeignKey(nameof(TenantId))] |  | ||||||
|         public Tenant? Tenant { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,9 +1,10 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Marco.Pms.Model.Projects; | ||||||
| using Marco.Pms.Model.Entitlements; |  | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Activities | ||||||
| { | { | ||||||
|     public class WorkItem |     public class WorkItem | ||||||
|     { |     { | ||||||
| @ -13,15 +14,15 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int WorkAreaId { get; set; } |         public int WorkAreaId { get; set; } | ||||||
|         [ForeignKey("WorkAreaId")] |         [ForeignKey("WorkAreaId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public WorkArea? WorkArea { get; set; } |         public WorkArea WorkArea { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [ForeignKey("ActivityId")] |         [ForeignKey("ActivityId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public ActivityMaster? ActivityMaster { get; set; } |         public ActivityMaster ActivityMaster { get; set; } | ||||||
| 
 | 
 | ||||||
|         public double PlannedWork { get; set; } |         public int PlannedWork { get; set; } | ||||||
|         public double CompletedWork { get; set; } |         public int CompletedWork { get; set; } | ||||||
|         public DateTime TaskDate { get; set; } |         public DateTime TaskDate { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
| @ -29,6 +30,6 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -1,28 +1,29 @@ | |||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Marco.Pms.Model.Projects; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
| using System.ComponentModel; | using System.ComponentModel; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Activities | ||||||
| { | { | ||||||
|     public class WorkItemMapping1 |     public class WorkItemMapping | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public int WorkAreaId { get; set; } |         public int WorkAreaId { get; set; } | ||||||
|         [ForeignKey("WorkAreaId")] |         [ForeignKey("WorkAreaId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public WorkArea? WorkArea { get; set; } |         public WorkArea WorkArea { get; set; } | ||||||
|         public int WorkItemId { get; set; } |         public int WorkItemId { get; set; } | ||||||
|         [ForeignKey("WorkItemId")] |         [ForeignKey("WorkItemId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public WorkItem? WorkItem { get; set; } |         public WorkItem WorkItem { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -1,9 +1,10 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Dtos.Attendance; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Dtos.Attendance; |  | ||||||
| using Marco.Pms.Model.Employees; | using Marco.Pms.Model.Employees; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using Microsoft.Extensions.Logging; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.AttendanceModule | namespace Marco.Pms.Model.AttendanceModule | ||||||
| { | { | ||||||
| @ -26,14 +27,14 @@ namespace Marco.Pms.Model.AttendanceModule | |||||||
|         public int? ApprovedBy { get; set; } |         public int? ApprovedBy { get; set; } | ||||||
|         [ForeignKey("EmployeeID")] |         [ForeignKey("EmployeeID")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Employee? Approver { get; set; } |         public Employee Approver { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,9 +1,9 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Dtos.Attendance; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Dtos.Attendance; |  | ||||||
| using Marco.Pms.Model.Employees; | using Marco.Pms.Model.Employees; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.AttendanceModule | namespace Marco.Pms.Model.AttendanceModule | ||||||
| @ -46,6 +46,6 @@ namespace Marco.Pms.Model.AttendanceModule | |||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -2,9 +2,9 @@ | |||||||
| { | { | ||||||
|     public class JwtSettings |     public class JwtSettings | ||||||
|     { |     { | ||||||
|         public string? Key { get; set; } |         public string Key { get; set; } | ||||||
|         public string? Issuer { get; set; } |         public string Issuer { get; set; } | ||||||
|         public string? Audience { get; set; } |         public string Audience { get; set; } | ||||||
|         public int ExpiresInMinutes { get; set; } |         public int ExpiresInMinutes { get; set; } | ||||||
|         public int RefreshTokenExpiresInDays { get; set; } |         public int RefreshTokenExpiresInDays { get; set; } | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -5,8 +5,8 @@ namespace Marco.Pms.Model.Authentication | |||||||
|     public class RefreshToken |     public class RefreshToken | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Token { get; set; } |         public string Token { get; set; } | ||||||
|         public string? UserId { get; set; } |         public string UserId { get; set; } | ||||||
|         public DateTime ExpiryDate { get; set; } |         public DateTime ExpiryDate { get; set; } | ||||||
|         public bool IsRevoked { get; set; } |         public bool IsRevoked { get; set; } | ||||||
|         public bool IsUsed { get; set; } |         public bool IsUsed { get; set; } | ||||||
| @ -15,6 +15,6 @@ namespace Marco.Pms.Model.Authentication | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         // Relationship with the User |         // Relationship with the User | ||||||
|         public IdentityUser? User { get; set; } |         public IdentityUser User { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,12 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class AssignTaskDto |  | ||||||
|     { |  | ||||||
|         public DateTime AssignmentDate { get; set; } |  | ||||||
|         public double PlannedTask { get; set; } |  | ||||||
|         public string? Description { get; set; } |  | ||||||
|         public List<int>? TaskTeam { get; set; }   //Employee Ids |  | ||||||
|         public int WorkItemId { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| @ -1,9 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class CreateActivityMasterDto |  | ||||||
|     { |  | ||||||
|         public string? ActivityName { get; set; } |  | ||||||
|         public string? UnitOfMeasurement { get; set; } |  | ||||||
|         public List<CreateCheckListDto>? CheckList { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,9 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class CreateCheckListDto |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public string? Description { get; set; } |  | ||||||
|         public bool IsMandatory { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,11 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class CreateCommentDto |  | ||||||
|     { |  | ||||||
|         public long TaskAllocationId { get; set; } |  | ||||||
| 
 |  | ||||||
|         public DateTime CommentDate { get; set; } |  | ||||||
|         public string? Comment { get; set; } |  | ||||||
| 
 |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,10 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class ReportCheckListDto |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public string Description { get; set; }= string.Empty; |  | ||||||
|         public bool IsMandatory { get; set; } |  | ||||||
|         public bool IsChecked { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,11 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Activities |  | ||||||
| { |  | ||||||
|     public class ReportTaskDto |  | ||||||
|     { |  | ||||||
|         public long Id { get; set; } |  | ||||||
|         public double CompletedTask { get; set; } |  | ||||||
|         public DateTime ReportedDate { get; set; } |  | ||||||
|         public string? Comment { get; set; } |  | ||||||
|         public List<ReportCheckListDto>? CheckList { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -5,15 +5,15 @@ namespace Marco.Pms.Model.Dtos.Attendance | |||||||
|     public class RecordAttendanceDot |     public class RecordAttendanceDot | ||||||
|     { |     { | ||||||
|         public int? Id { get; set; } |         public int? Id { get; set; } | ||||||
|         public string? Comment { get; set; } |         public string Comment { get; set; } | ||||||
|         public int EmployeeID { get; set; } |         public int EmployeeID { get; set; } | ||||||
|         public int ProjectID { get; set; } |         public int ProjectID { get; set; } | ||||||
| 
 | 
 | ||||||
|         public DateTime Date { get; set; } |         public DateTime Date { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? MarkTime { get; set; } |         public string? MarkTime { get; set; } | ||||||
|         public string? Latitude { get; set; } |         public string Latitude { get; set; } | ||||||
|         public string? Longitude { get; set; } |         public string Longitude { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public ATTENDANCE_MARK_TYPE Action { get; set; } |         public ATTENDANCE_MARK_TYPE Action { get; set; } | ||||||
|  | |||||||
| @ -7,27 +7,27 @@ namespace Marco.Pms.Model.Dtos.Employees | |||||||
|     { |     { | ||||||
|         public ApplicationUserDto() { } |         public ApplicationUserDto() { } | ||||||
|         public int? Id { get; set; } |         public int? Id { get; set; } | ||||||
|         public string? FirstName { get; set; } |         public string FirstName { get; set; } | ||||||
|         public string? LastName { get; set; } |         public string LastName { get; set; } | ||||||
|         public string? MiddleName { get; set; } |         public string? MiddleName { get; set; } | ||||||
|         public string? Email { get; set; } |         public string? Email { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? Gender { get; set; } |         public string Gender { get; set; } | ||||||
|         public DateTime? BirthDate { get; set; } |         public DateTime? BirthDate { get; set; } | ||||||
|         public DateTime? JoiningDate { get; set; } |         public DateTime? JoiningDate { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? PermanentAddress { get; set; } |         public string PeramnentAddress { get; set; } | ||||||
|         public string? CurrentAddress { get; set; } |         public string CurrentAddress { get; set; } | ||||||
|         public string? PhoneNumber { get; set; } |         public string PhoneNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? EmergencyPhoneNumber { get; set; } |         public string EmergencyPhoneNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? AadharNumber { get; set; } |         public string? AadharNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? PanNumber { get; set; } |         public string? PanNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public IFormFile? Photo { get; set; } // To store the captured photo |         public IFormFile? Photo { get; set; } // To store the captured photo | ||||||
|         public List<IFormFile>? Documents { get; set; } |         public List<IFormFile> Documents { get; set; } | ||||||
|         public string? ApplicationUserId { get; set; } |         public string? ApplicationUserId { get; set; } | ||||||
| 
 | 
 | ||||||
|         public Guid RoleId { get; set; } |         public Guid RoleId { get; set; } | ||||||
|  | |||||||
| @ -1,8 +1,19 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Employees | using Marco.Pms.Model.Employees; | ||||||
|  | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Employees | ||||||
| { | { | ||||||
|     public class AttendanceDto |     public class AttendanceDto | ||||||
|     { |     { | ||||||
|         public string? Comment { get; set; } |         public string Comment { get; set; } | ||||||
|         public int EmployeeID { get; set; } |         public int EmployeeID { get; set; } | ||||||
|         public DateTime? InTime { get; set; } |         public DateTime? InTime { get; set; } | ||||||
|         public DateTime? OutTime { get; set; } |         public DateTime? OutTime { get; set; } | ||||||
|  | |||||||
| @ -1,23 +1,30 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Employees | using Microsoft.AspNetCore.Http; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Employees | ||||||
| { | { | ||||||
|     public class CreateUserDto |     public class CreateUserDto | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? FirstName { get; set; } |         public string FirstName { get; set; } | ||||||
|         public string? LastName { get; set; } |         public string LastName { get; set; } | ||||||
|         public string? MiddleName { get; set; } |         public string? MiddleName { get; set; } | ||||||
|         public string? Email { get; set; } |         public string? Email { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? Gender { get; set; } |         public string Gender { get; set; } | ||||||
|         public string? BirthDate { get; set; } |         public string? BirthDate { get; set; } | ||||||
|         public string? JoiningDate { get; set; } |         public string JoiningDate { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? PermanentAddress { get; set; } |         public string? PeramnentAddress { get; set; } | ||||||
|         public string? CurrentAddress { get; set; }   |         public string? CurrentAddress { get; set; }   | ||||||
|         public string? PhoneNumber { get; set; } |         public string PhoneNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? EmergencyPhoneNumber { get; set; } |         public string EmergencyPhoneNumber { get; set; } | ||||||
|         public string? EmergencyContactPerson { get; set; } |         public string EmergencyContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? AadharNumber { get; set; } |         public string? AadharNumber { get; set; } | ||||||
| 
 | 
 | ||||||
| @ -26,25 +33,25 @@ | |||||||
|         //public IFormFile? Photo { get; set; } // To store the captured photo |         //public IFormFile? Photo { get; set; } // To store the captured photo | ||||||
|         //public List<IFormFile>? Documents { get; set; } |         //public List<IFormFile>? Documents { get; set; } | ||||||
| 
 | 
 | ||||||
|        public string? JobRoleId { get; set; } |        public string JobRoleId { get; set; } | ||||||
| 
 | 
 | ||||||
|        // public int TenantId { get; set; } |        // public int TenantId { get; set; } | ||||||
|     } |     } | ||||||
|     public class CreateQuickUserDto |     public class CreateQuickUserDto | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? FirstName { get; set; } |         public string FirstName { get; set; } | ||||||
|         public string? LastName { get; set; }        |         public string LastName { get; set; }        | ||||||
| 
 | 
 | ||||||
|         public string? Gender { get; set; }      |         public string Gender { get; set; }      | ||||||
| 
 | 
 | ||||||
|         public string? CurrentAddress { get; set; } |         public string? CurrentAddress { get; set; } | ||||||
|         public string? PhoneNumber { get; set; } |         public string PhoneNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? EmergencyPhoneNumber { get; set; } |         public string EmergencyPhoneNumber { get; set; } | ||||||
|         public string? EmergencyContactPerson { get; set; } |         public string EmergencyContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? JobRoleId { get; set; } |         public string JobRoleId { get; set; } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,4 +1,9 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos | namespace Marco.Pms.Model.Dtos | ||||||
| { | { | ||||||
| @ -6,6 +11,6 @@ namespace Marco.Pms.Model.Dtos | |||||||
|     { |     { | ||||||
|         [Required] |         [Required] | ||||||
|         [EmailAddress] |         [EmailAddress] | ||||||
|         public string Email { get; set; } = string.Empty; |         public string Email { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,14 @@ | |||||||
| namespace Marco.Pms.Model.Dtos | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos | ||||||
| { | { | ||||||
|     public class LoginDto |     public class LoginDto | ||||||
|     { |     { | ||||||
|         public string? Username { get; set; } |         public string Username { get; set; } | ||||||
|         public string? Password { get; set; } |         public string Password { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -2,6 +2,6 @@ | |||||||
| namespace Marco.Pms.Model.Dtos | namespace Marco.Pms.Model.Dtos | ||||||
| { | { | ||||||
|     public class LogoutDto |     public class LogoutDto | ||||||
|     {        public string? RefreshToken { get; set; } |     {        public string RefreshToken { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,13 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -9,7 +17,7 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Building Name")] |         [DisplayName("Building Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
|         public int ProjectId { get; set; } |         public int ProjectId { get; set; } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,10 +5,10 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
|     public class BuildingVM |     public class BuildingVM | ||||||
|     { |     { | ||||||
|         public int Id { get; set; }       |         public int Id { get; set; }       | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
| 
 | 
 | ||||||
|         public List<FloorsVM>? Floors { get; set; } |         public List<FloorsVM> Floors { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -8,15 +8,15 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
|         //public int Id { get; set; } |         //public int Id { get; set; } | ||||||
|         [Required(ErrorMessage = "Project Name is required!")] |         [Required(ErrorMessage = "Project Name is required!")] | ||||||
|         [DisplayName("Project Name")] |         [DisplayName("Project Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Project Address")] |         [DisplayName("Project Address")] | ||||||
|         [Required(ErrorMessage = "Project Address is required!")] |         [Required(ErrorMessage = "Project Address is required!")] | ||||||
|         public string? ProjectAddress { get; set; } |         public string ProjectAddress { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Contact Person")] |         [DisplayName("Contact Person")] | ||||||
|         public string? ContactPerson { get; set; } |         public string ContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public DateTime? StartDate { get; set; } |         public DateTime? StartDate { get; set; } | ||||||
|  | |||||||
| @ -1,5 +1,14 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Marco.Pms.Model.Projects; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -9,7 +18,7 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Floor Name")] |         [DisplayName("Floor Name")] | ||||||
|         public string? FloorName { get; set; } |         public string FloorName { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public int BuildingId { get; set; } |         public int BuildingId { get; set; } | ||||||
|  | |||||||
| @ -1,5 +1,10 @@ | |||||||
| using System.ComponentModel; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -9,9 +14,9 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Floor Name")] |         [DisplayName("Floor Name")] | ||||||
|         public string? FloorName { get; set; } |         public string FloorName { get; set; } | ||||||
| 
 | 
 | ||||||
|         public List<WorkAreaVM>? WorkAreas { get; set; } |         public List<WorkAreaVM> WorkAreas { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,4 +1,11 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Project | using Marco.Pms.Model.Projects; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
|     public class InfraDot |     public class InfraDot | ||||||
|     { |     { | ||||||
|  | |||||||
| @ -1,5 +1,14 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Marco.Pms.Model.Projects; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -8,15 +17,15 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [Required(ErrorMessage = "Project Name is required!")] |         [Required(ErrorMessage = "Project Name is required!")] | ||||||
|         [DisplayName("Project Name")] |         [DisplayName("Project Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Project Address")] |         [DisplayName("Project Address")] | ||||||
|         [Required(ErrorMessage = "Project Address is required!")] |         [Required(ErrorMessage = "Project Address is required!")] | ||||||
|         public string? ProjectAddress { get; set; } |         public string ProjectAddress { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Contact Person")] |         [DisplayName("Contact Person")] | ||||||
|         public string? ContactPerson { get; set; } |         public string ContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public DateTime? StartDate { get; set; } |         public DateTime? StartDate { get; set; } | ||||||
|  | |||||||
| @ -1,8 +1,15 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Project | using Marco.Pms.Model.Projects; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
|     public class ProjectVM : ProjectDto |     public class ProjectVM : ProjectDto | ||||||
|     { |     { | ||||||
|         public List<BuildingVM>? Buildings { get; set; } |         public List<BuildingVM> Buildings { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -8,15 +8,15 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [Required(ErrorMessage = "Project Name is required!")] |         [Required(ErrorMessage = "Project Name is required!")] | ||||||
|         [DisplayName("Project Name")] |         [DisplayName("Project Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Project Address")] |         [DisplayName("Project Address")] | ||||||
|         [Required(ErrorMessage = "Project Address is required!")] |         [Required(ErrorMessage = "Project Address is required!")] | ||||||
|         public string? ProjectAddress { get; set; } |         public string ProjectAddress { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Contact Person")] |         [DisplayName("Contact Person")] | ||||||
|         public string? ContactPerson { get; set; } |         public string ContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public DateTime? StartDate { get; set; } |         public DateTime? StartDate { get; set; } | ||||||
|  | |||||||
| @ -1,5 +1,14 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Marco.Pms.Model.Projects; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -10,7 +19,7 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Area Name")] |         [DisplayName("Area Name")] | ||||||
|         public string? AreaName { get; set; } |         public string AreaName { get; set; } | ||||||
| 
 | 
 | ||||||
|         public int FloorId { get; set; } |         public int FloorId { get; set; } | ||||||
|         |         | ||||||
|  | |||||||
| @ -1,5 +1,10 @@ | |||||||
| using System.ComponentModel; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
| @ -9,9 +14,9 @@ namespace Marco.Pms.Model.Dtos.Project | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Area Name")] |         [DisplayName("Area Name")] | ||||||
|         public string? AreaName { get; set; } |         public string AreaName { get; set; } | ||||||
| 
 | 
 | ||||||
|         public List<WorkItemVM>? WorkItems { get; set; } |         public List<WorkItemVM> WorkItems { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,10 +1,10 @@ | |||||||
| using Marco.Pms.Model.Projects; | using Marco.Pms.Model.Activities; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Project | namespace Marco.Pms.Model.Dtos.Project | ||||||
| { | { | ||||||
|     public class WorkItemVM |     public class WorkItemVM | ||||||
|     { |     { | ||||||
|         public int WorkItemId { get; set; } |         public int WorkItemId { get; set; } | ||||||
|         public WorkItem? WorkItem { get; set; } |         public WorkItem WorkItem { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,14 @@ | |||||||
| namespace Marco.Pms.Model.Dtos | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos | ||||||
| { | { | ||||||
|     public class RefreshTokenDto |     public class RefreshTokenDto | ||||||
|     { |     { | ||||||
|         public string? Token { get; set; } |         public string Token { get; set; } | ||||||
|         public string? RefreshToken { get; set; } |         public string RefreshToken { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,21 +1,26 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos | namespace Marco.Pms.Model.Dtos | ||||||
| { | { | ||||||
|     public class RegisterDto |     public class RegisterDto | ||||||
|     { |     { | ||||||
|         [Required] |         [Required] | ||||||
|         public string? Username { get; set; } |         public string Username { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [EmailAddress] |         [EmailAddress] | ||||||
|         public string? Email { get; set; } |         public string Email { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [MinLength(6)] |         [MinLength(6)] | ||||||
|         public string? Password { get; set; } |         public string Password { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Compare("Password", ErrorMessage = "Passwords do not match.")] |         [Compare("Password", ErrorMessage = "Passwords do not match.")] | ||||||
|         public string? ConfirmPassword { get; set; } |         public string ConfirmPassword { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -6,13 +6,13 @@ namespace Marco.Pms.Model.Dtos | |||||||
|     { |     { | ||||||
|         [Required] |         [Required] | ||||||
|         [EmailAddress] |         [EmailAddress] | ||||||
|         public string? Email { get; set; } |         public string Email { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         public string Token { get; set; }= string.Empty; |         public string Token { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [MinLength(6)] |         [MinLength(6)] | ||||||
|         public string? NewPassword { get; set; } |         public string NewPassword { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,8 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Roles | namespace Marco.Pms.Model.Dtos.Roles | ||||||
| { | { | ||||||
| @ -8,13 +11,13 @@ namespace Marco.Pms.Model.Dtos.Roles | |||||||
|         [Required(ErrorMessage = "Role Name is required!")] |         [Required(ErrorMessage = "Role Name is required!")] | ||||||
|         [DisplayName("Name")] |         [DisplayName("Name")] | ||||||
| 
 | 
 | ||||||
|         public string? Role { get; set; } |         public string Role { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required(ErrorMessage = "Role Description is required!")] |         [Required(ErrorMessage = "Role Description is required!")] | ||||||
|         [DisplayName("Description")] |         [DisplayName("Description")] | ||||||
| 
 | 
 | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
| 
 | 
 | ||||||
|         public List<FeaturesPermissionDto>? FeaturesPermission { get; set; } // Features assigned to this role |         public List<FeaturesPermissionDto> FeaturesPermission { get; set; } // Features assigned to this role | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,14 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Roles | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Roles | ||||||
| { | { | ||||||
|     public class CreateJobRoleDto |     public class CreateJobRoleDto | ||||||
|     { |     { | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using System.ComponentModel; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Dtos.Roles | namespace Marco.Pms.Model.Dtos.Roles | ||||||
| @ -10,15 +11,15 @@ namespace Marco.Pms.Model.Dtos.Roles | |||||||
|         [Required(ErrorMessage = "Role Name is required!")] |         [Required(ErrorMessage = "Role Name is required!")] | ||||||
|         [DisplayName("Name")] |         [DisplayName("Name")] | ||||||
| 
 | 
 | ||||||
|         public string? Role { get; set; } |         public string Role { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required(ErrorMessage = "Role Description is required!")] |         [Required(ErrorMessage = "Role Description is required!")] | ||||||
|         [DisplayName("Description")] |         [DisplayName("Description")] | ||||||
| 
 | 
 | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public List<FeaturesPermissionDto>? FeaturesPermission { get; set; } // Features assigned to this role |         public List<FeaturesPermissionDto> FeaturesPermission { get; set; } // Features assigned to this role | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public class FeaturesPermissionDto |     public class FeaturesPermissionDto | ||||||
|  | |||||||
| @ -1,9 +1,15 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Roles | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Dtos.Roles | ||||||
| { | { | ||||||
|     public class UpdateJobRoleDto |     public class UpdateJobRoleDto | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -2,10 +2,10 @@ | |||||||
| { | { | ||||||
|     public class EmailDot |     public class EmailDot | ||||||
|     { |     { | ||||||
|         public string? ToEmail { get; set; } |         public string ToEmail { get; set; } | ||||||
|         public string? FromEmail { get; set; } |         public string FromEmail { get; set; } | ||||||
|         public string? MailBody { get; set; } |         public string MailBody { get; set; } | ||||||
|         public string? MailSubject { get; set; } |         public string MailSubject { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,13 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Dtos.Util |  | ||||||
| { |  | ||||||
|     public class InquiryDto |  | ||||||
|     { |  | ||||||
|         public string? OrganizatioinName { get; set; } |  | ||||||
|         public string? Email { get; set; } |  | ||||||
|         public string? About { get; set; } |  | ||||||
|         public string? OragnizationSize { get; set; } |  | ||||||
|         public int IndustryId { get; set; } |  | ||||||
|         public string? ContactPerson { get; set; } |  | ||||||
|         public string? ContactNumber { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -8,21 +8,21 @@ namespace Marco.Pms.Model.Employees | |||||||
|     public class Employee |     public class Employee | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? FirstName { get; set; } |         public string FirstName { get; set; } | ||||||
|         public string? LastName { get; set; } |         public string LastName { get; set; } | ||||||
|         public string? MiddleName { get; set; } |         public string? MiddleName { get; set; } | ||||||
|         public string? Email { get; set; } |         public string? Email { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? Gender { get; set; } |         public string Gender { get; set; } | ||||||
|         public DateTime? BirthDate { get; set; } |         public DateTime? BirthDate { get; set; } | ||||||
|         public DateTime? JoiningDate { get; set; } |         public DateTime? JoiningDate { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? PermanentAddress { get; set; } |         public string PeramnentAddress { get; set; } | ||||||
|         public string? CurrentAddress { get; set; } |         public string CurrentAddress { get; set; } | ||||||
|         public string? PhoneNumber { get; set; } |         public string PhoneNumber { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? EmergencyPhoneNumber { get; set; } |         public string EmergencyPhoneNumber { get; set; } | ||||||
|         public string? EmergencyContactPerson { get; set; } |         public string EmergencyContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public string? AadharNumber { get; set; } |         public string? AadharNumber { get; set; } | ||||||
| @ -42,7 +42,8 @@ namespace Marco.Pms.Model.Employees | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|  | 
 | ||||||
|         public Guid RoleId { get; set; } |         public Guid RoleId { get; set; } | ||||||
|         //[ForeignKey(nameof(RoleId))] |         //[ForeignKey(nameof(RoleId))] | ||||||
|         //public EmployeeRole EmployeeRole { get; set; } |         //public EmployeeRole EmployeeRole { get; set; } | ||||||
|  | |||||||
| @ -1,4 +1,10 @@ | |||||||
| namespace Marco.Pms.Model.Employees | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Employees | ||||||
| { | { | ||||||
|     public class EmployeeDetails : Employee |     public class EmployeeDetails : Employee | ||||||
|     { |     { | ||||||
|  | |||||||
| @ -1,21 +1,21 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Employees | namespace Marco.Pms.Model.Employees | ||||||
| { | { | ||||||
|     public class EmployeeDocument |     public class EmployeeDocument | ||||||
|     { |     { | ||||||
|         public Guid Id { get; set; } // Unique identifier for the document |         public Guid Id { get; set; } // Unique identifier for the document | ||||||
|         public string? FileName { get; set; } // Original file name |         public string FileName { get; set; } // Original file name | ||||||
|         public string? FilePath { get; set; } // Path to the stored file |         public string FilePath { get; set; } // Path to the stored file | ||||||
|         public string? FileType { get; set; } // Type of the document (e.g., PDF, JPG) |         public string FileType { get; set; } // Type of the document (e.g., PDF, JPG) | ||||||
|         public long FileSize { get; set; } // File size in bytes |         public long FileSize { get; set; } // File size in bytes | ||||||
|         public DateTime UploadedAt { get; set; } // Timestamp of upload |         public DateTime UploadedAt { get; set; } // Timestamp of upload | ||||||
| 
 | 
 | ||||||
|         public Guid EmployeeId { get; set; } // Foreign key to Employee |         public Guid EmployeeId { get; set; } // Foreign key to Employee | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(EmployeeId))] |         [ForeignKey(nameof(EmployeeId))] | ||||||
|         public Employee? Employee { get; set; } // Navigation property to Employee |         public Employee Employee { get; set; } // Navigation property to Employee | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ namespace Marco.Pms.Model.Employees | |||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [DisplayName("Shift Name")] |         [DisplayName("Shift Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public TimeOnly StartTime { get; set; } |         public TimeOnly StartTime { get; set; } | ||||||
|         public TimeOnly EndTime { get; set; } |         public TimeOnly EndTime { get; set; } | ||||||
| 
 | 
 | ||||||
| @ -18,7 +18,7 @@ namespace Marco.Pms.Model.Employees | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,12 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Entitlements |  | ||||||
| { |  | ||||||
|     public class ActivityCheckList |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public int ActivityId { get; set; } |  | ||||||
|         public string? Description { get; set; } = string.Empty; |  | ||||||
|         public bool IsChecked { get; set; } = false; |  | ||||||
|         public bool IsMandatory { get; set; } |  | ||||||
|         public int TenantId { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,22 +1,26 @@ | |||||||
| using System.ComponentModel; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Entitlements | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
|     public class ActivityMaster |     public class ActivityMaster | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? ActivityName { get; set; } |         public string ActivityName { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? UnitOfMeasurement { get; set; } |         public string UnitOfMeasurement { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|         public bool IsActive { get; set; } = true; |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,10 +1,14 @@ | |||||||
| namespace Marco.Pms.Model.Entitlements | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
|     public class ApplicationRole |     public class ApplicationRole | ||||||
|     { |     { | ||||||
|         public Guid Id { get; set; } |         public Guid Id { get; set; } | ||||||
|         public string? Role { get; set; } |         public string Role { get; set; } | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
| 
 | 
 | ||||||
|         public int TenantId { get; set; }     |         public int TenantId { get; set; }     | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,9 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Entitlements |  | ||||||
| { |  | ||||||
|     public class CheckListMappings |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public long TaskAllocationId { get; set; } |  | ||||||
|         public int CheckListId { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -7,18 +7,18 @@ namespace Marco.Pms.Model.Entitlements | |||||||
|     public class Tenant |     public class Tenant | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
|         public string? DomainName { get; set; } |         public string DomainName { get; set; } | ||||||
|         public string? ContactName { get; set; } |         public string ContactName { get; set; } | ||||||
|         public string? ContactNumber { get; set; } |         public string ContactNumber { get; set; } | ||||||
|         public DateTime OnBoardingDate { get; set; } |         public DateTime OnBoardingDate { get; set; } | ||||||
|         public string? OragnizationSize { get; set; } |         public string? OragnizationSize { get; set; } | ||||||
|         public int? IndustryId { get;set; } |         public int? IndustryId { get;set; } | ||||||
| 
 | 
 | ||||||
|         [ForeignKey("IndustryId")] |         [ForeignKey("IndustryId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Industry? Industry{ get; set; } |         public Industry Industry{ get; set; } | ||||||
| 
 | 
 | ||||||
|         public bool IsActive { get; set; } = true; |         public bool IsActive { get; set; } = true; | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -1,6 +1,7 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Marco.Pms.Model.Employees; | ||||||
| using Marco.Pms.Model.Employees; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Entitlements | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
| @ -10,19 +11,19 @@ namespace Marco.Pms.Model.Entitlements | |||||||
|         public int EmployeeId { get; set; } |         public int EmployeeId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(EmployeeId))] |         [ForeignKey(nameof(EmployeeId))] | ||||||
|         public Employee? Employee { get; set; } // Navigation property to Employee |         public Employee Employee { get; set; } // Navigation property to Employee | ||||||
| 
 | 
 | ||||||
|         public Guid RoleId { get; set; } |         public Guid RoleId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(RoleId))] |         [ForeignKey(nameof(RoleId))] | ||||||
|         public ApplicationRole? Role { get; set; } |         public ApplicationRole Role { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public bool IsEnabled { get; set; } |         public bool IsEnabled { get; set; } | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; }        | ||||||
| 
 | 
 | ||||||
|     }    |     }    | ||||||
| } | } | ||||||
|  | |||||||
| @ -9,12 +9,12 @@ namespace Marco.Pms.Model.Entitlements | |||||||
|         public int ModuleId { get; set; } |         public int ModuleId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(ModuleId))] |         [ForeignKey(nameof(ModuleId))] | ||||||
|         public Module? Module { get; set; } |         public Module Module { get; set; } | ||||||
|         public string? Name { get; set; } // Feature name |         public string Name { get; set; } // Feature name | ||||||
|         public string? Description { get; set; } // Feature description |         public string Description { get; set; } // Feature description | ||||||
|         public bool IsActive { get; set; } |         public bool IsActive { get; set; } | ||||||
| 
 | 
 | ||||||
|         public ICollection<FeaturePermission>? FeaturePermissions { get; set; }// Features assigned to this role |         public ICollection<FeaturePermission> FeaturePermissions { get; set; } // Features assigned to this role | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,12 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Marco.Pms.Model.Projects; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.Data; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Entitlements | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
| @ -10,10 +17,10 @@ namespace Marco.Pms.Model.Entitlements | |||||||
|         public Guid FeatureId { get; set; } // Foreign key to Feature |         public Guid FeatureId { get; set; } // Foreign key to Feature | ||||||
|         [ForeignKey("FeatureId")] |         [ForeignKey("FeatureId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Feature? Feature { get; set; } |         public Feature Feature { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? Name { get; set; } // Feature name |         public string Name { get; set; } // Feature name | ||||||
|         public string? Description { get; set; } // Feature description |         public string Description { get; set; } // Feature description | ||||||
| 
 | 
 | ||||||
|         public bool IsEnabled { get; set; } // Whether the feature is enabled for this role |         public bool IsEnabled { get; set; } // Whether the feature is enabled for this role | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,17 +1,17 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Entitlements | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
|     public class JobRole |     public class JobRole | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -13,9 +13,9 @@ namespace Marco.Pms.Model.Entitlements | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
| 
 | 
 | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
| 
 | 
 | ||||||
|        |        | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,19 +1,24 @@ | |||||||
| using System.ComponentModel; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Entitlements | namespace Marco.Pms.Model.Entitlements | ||||||
| { | { | ||||||
|     public class StatusMaster |     public class StatusMaster | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Status { get; set; } |         public string Status { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -3,6 +3,6 @@ | |||||||
|     public class Industry |     public class Industry | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,170 +0,0 @@ | |||||||
| using Marco.Pms.Model.Activities; |  | ||||||
| using Marco.Pms.Model.Dtos.Activities; |  | ||||||
| using Marco.Pms.Model.Entitlements; |  | ||||||
| using Marco.Pms.Model.ViewModels.Activities; |  | ||||||
| #nullable disable |  | ||||||
| namespace Marco.Pms.Model.Mapper |  | ||||||
| { |  | ||||||
|     public static class ActivitiesMapper |  | ||||||
|     { |  | ||||||
|         public static TaskAllocation ToTaskAllocationFromAssignTaskDto(this AssignTaskDto assignTask, int EmployeeId,int tenantId) |  | ||||||
|         { |  | ||||||
|             return new TaskAllocation |  | ||||||
|             { |  | ||||||
|                 AssignmentDate = assignTask.AssignmentDate, |  | ||||||
|                 PlannedTask = assignTask.PlannedTask, |  | ||||||
|                 CompletedTask = 0, |  | ||||||
|                 Description = assignTask.Description, |  | ||||||
|                 AssignedBy = EmployeeId, |  | ||||||
|                 WorkItemId = assignTask.WorkItemId, |  | ||||||
|                 TenantId = tenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static TaskComment ToCommentFromReportTaskDto(this ReportTaskDto reportTask, int tenantId, int EmployeeId) |  | ||||||
|         { |  | ||||||
|             return new TaskComment |  | ||||||
|             { |  | ||||||
|                 TaskAllocationId = reportTask.Id, |  | ||||||
|                 CommentDate = reportTask.ReportedDate, |  | ||||||
|                 Comment = reportTask.Comment, |  | ||||||
|                 CommentedBy = EmployeeId, |  | ||||||
|                 TenantId = tenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static TaskComment ToCommentFromCommentDto(this CreateCommentDto createComment, int tenantId, int EmployeeId) { |  | ||||||
|             return new TaskComment { |  | ||||||
|                 TaskAllocationId = createComment.TaskAllocationId, |  | ||||||
|                 CommentDate = createComment.CommentDate, |  | ||||||
|                 Comment = createComment.Comment, |  | ||||||
|                 CommentedBy = EmployeeId, |  | ||||||
|                 TenantId = tenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static TaskVM TaskAllocationToTaskVM(this TaskAllocation taskAllocation,string employeeName,string tenant ) |  | ||||||
|         { |  | ||||||
|             return new TaskVM |  | ||||||
|             { |  | ||||||
|                 Id = taskAllocation.Id, |  | ||||||
|                 AssignmentDate = taskAllocation.AssignmentDate, |  | ||||||
|                 PlannedTask = taskAllocation.PlannedTask, |  | ||||||
|                 CompletedTask = taskAllocation.CompletedTask, |  | ||||||
|                 ReportedDate = taskAllocation.ReportedDate, |  | ||||||
|                 Description = taskAllocation.Description, |  | ||||||
|                 AssignBy = employeeName, |  | ||||||
|                 Tenant = tenant, |  | ||||||
|                 WorkItem = taskAllocation.WorkItem |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static AssignedTaskVM ToAssignTaskVMFromTaskAllocation(this TaskAllocation taskAllocation) |  | ||||||
|         { |  | ||||||
|             return new AssignedTaskVM |  | ||||||
|             { |  | ||||||
|                 Id = taskAllocation.Id, |  | ||||||
|                 AssignmentDate = taskAllocation.AssignmentDate, |  | ||||||
|                 PlannedTask = taskAllocation.PlannedTask, |  | ||||||
|                 CompletedTask = taskAllocation.CompletedTask, |  | ||||||
|                 ReportedDate= taskAllocation.ReportedDate, |  | ||||||
|                 Description = taskAllocation.Description, |  | ||||||
|                 AssignedBy = taskAllocation.Employee.ToEmployeeVMFromEmployee(), |  | ||||||
|                 WorkItemId = taskAllocation.WorkItemId, |  | ||||||
|                 TenantId = taskAllocation.TenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static ReportTaskVM ToReportTaskVMFromTaskAllocation(this TaskAllocation taskAllocation) |  | ||||||
|         { |  | ||||||
|             return new ReportTaskVM |  | ||||||
|             { |  | ||||||
|                 Id = taskAllocation.Id, |  | ||||||
|                 AssignmentDate = taskAllocation.AssignmentDate, |  | ||||||
|                 PlannedTask = taskAllocation.PlannedTask, |  | ||||||
|                 CompletedTask = taskAllocation.CompletedTask, |  | ||||||
|                 ReportedDate = taskAllocation.ReportedDate, |  | ||||||
|                 Description = taskAllocation.Description, |  | ||||||
|                 AssignedBy = taskAllocation.AssignedBy, |  | ||||||
|                 WorkItemId = taskAllocation.WorkItemId, |  | ||||||
|                 TenantId = taskAllocation.TenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static ActivityMaster ToActivityMasterFromCreateActivityMasterDto(this CreateActivityMasterDto createActivity,int tenantId) |  | ||||||
|         { |  | ||||||
|             return new ActivityMaster |  | ||||||
|             { |  | ||||||
|                 ActivityName = createActivity.ActivityName, |  | ||||||
|                 UnitOfMeasurement = createActivity.UnitOfMeasurement, |  | ||||||
|                 TenantId = tenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         public static ListTaskVM ToListTaskVMFromTaskAllocation(this TaskAllocation taskAllocation) |  | ||||||
|         { |  | ||||||
|             return new ListTaskVM |  | ||||||
|             { |  | ||||||
|                 Id = taskAllocation.Id, |  | ||||||
|                 AssignmentDate = taskAllocation.AssignmentDate, |  | ||||||
|                 PlannedTask = taskAllocation.PlannedTask, |  | ||||||
|                 CompletedTask = taskAllocation.CompletedTask, |  | ||||||
|                 AssignedBy = taskAllocation.Employee.ToBasicEmployeeVMFromEmployee(), |  | ||||||
|                 WorkItemId = taskAllocation.WorkItemId, |  | ||||||
|                 WorkItem = taskAllocation.WorkItem, |  | ||||||
|                 TenantId = taskAllocation.TenantId, |  | ||||||
|                 //CheckList =  |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static CommentVM ToCommentVMFromTaskComment(this TaskComment comment) |  | ||||||
|         { |  | ||||||
|             return new CommentVM |  | ||||||
|             { |  | ||||||
|                 Id = comment.Id, |  | ||||||
|                 TaskAllocationId = comment.TaskAllocationId, |  | ||||||
|                 CommentDate = comment.CommentDate, |  | ||||||
|                 Comment = comment.Comment, |  | ||||||
|                 CommentedBy = comment.CommentedBy, |  | ||||||
|                 Employee = comment.Employee.ToBasicEmployeeVMFromEmployee() |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         public static ActivityVM ToActivityVMFromActivityMaster(this ActivityMaster activity,List<CheckListVM> checkList) |  | ||||||
|         { |  | ||||||
|             return new ActivityVM |  | ||||||
|             { |  | ||||||
|                 Id = activity.Id, |  | ||||||
|                 ActivityName = activity.ActivityName, |  | ||||||
|                 UnitOfMeasurement = activity.UnitOfMeasurement, |  | ||||||
|                 CheckLists = checkList, |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static CheckListVM ToCheckListVMFromActivityCheckList(this ActivityCheckList checkList,int activityId,bool IsChecked) |  | ||||||
|         { |  | ||||||
|             return new CheckListVM |  | ||||||
|             { |  | ||||||
|                 Id = checkList.Id, |  | ||||||
|                 Description = checkList.Description, |  | ||||||
|                 ActivityId = activityId, |  | ||||||
|                 IsChecked = IsChecked, |  | ||||||
|                 IsMandatory = checkList.IsMandatory, |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId,int activityId) |  | ||||||
|         { |  | ||||||
|             return new ActivityCheckList |  | ||||||
|             { |  | ||||||
|                 Id = checkListDto.Id, |  | ||||||
|                 Description = checkListDto.Description, |  | ||||||
|                 ActivityId = activityId, |  | ||||||
|                 IsMandatory = checkListDto.IsMandatory, |  | ||||||
|                 TenantId = tenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|         public static CheckListVM ToCheckListVMFromReportCheckListDto(this ReportCheckListDto checkListDto, int activityId) |  | ||||||
|         { |  | ||||||
|             return new CheckListVM |  | ||||||
|             { |  | ||||||
|                 Id = checkListDto.Id, |  | ||||||
|                 Description = checkListDto.Description, |  | ||||||
|                 ActivityId = activityId, |  | ||||||
|                 IsChecked = checkListDto.IsChecked, |  | ||||||
|                 IsMandatory = checkListDto.IsMandatory, |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,7 +1,7 @@ | |||||||
| using Marco.Pms.Model.Dtos.Roles; | using Marco.Pms.Model.Dtos.Roles; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Marco.Pms.Model.ViewModels; | using Marco.Pms.Model.ViewModels; | ||||||
| #nullable disable | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
| { | { | ||||||
|     public static class ApplicationRoleMapper |     public static class ApplicationRoleMapper | ||||||
|  | |||||||
| @ -1,5 +1,4 @@ | |||||||
| using Marco.Pms.Model.Employees; | using Marco.Pms.Model.Employees; | ||||||
| using Marco.Pms.Model.ViewModels.Activities; |  | ||||||
| using Marco.Pms.Model.ViewModels.Employee; | using Marco.Pms.Model.ViewModels.Employee; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
| @ -25,36 +24,12 @@ namespace Marco.Pms.Model.Mapper | |||||||
|                 JobRole = (model.JobRole != null ? model.JobRole.Name : null), |                 JobRole = (model.JobRole != null ? model.JobRole.Name : null), | ||||||
|                 JobRoleId = model.JobRoleId, |                 JobRoleId = model.JobRoleId, | ||||||
|                 PanNumber = model.PanNumber, |                 PanNumber = model.PanNumber, | ||||||
|                 PermanentAddress = model.PermanentAddress, |                 PeramnentAddress = model.PeramnentAddress, | ||||||
|                 PhoneNumber = model.PhoneNumber, |                 PhoneNumber = model.PhoneNumber, | ||||||
|                 Photo = model.Photo, |                 Photo = model.Photo, | ||||||
|                 IsActive = model.IsActive, |                 IsActive = model.IsActive, | ||||||
|                 JoiningDate = model.JoiningDate |                 JoiningDate = model.JoiningDate | ||||||
|             }; |             }; | ||||||
|         } |         } | ||||||
|         public static BasicEmployeeVM ToBasicEmployeeVMFromEmployee(this Employee employee) |  | ||||||
|         { |  | ||||||
|             if (employee.JobRole == null) |  | ||||||
|             { |  | ||||||
|                 return new BasicEmployeeVM |  | ||||||
|                 { |  | ||||||
|                     Id = employee.Id, |  | ||||||
|                     FirstName = employee.FirstName, |  | ||||||
|                     LastName = employee.LastName, |  | ||||||
|                     Photo = employee.Photo, |  | ||||||
|                     JobRoleId = employee.JobRoleId, |  | ||||||
|                     JobRoleName = "" |  | ||||||
|                 }; |  | ||||||
|             } |  | ||||||
|             return new BasicEmployeeVM |  | ||||||
|             { |  | ||||||
|                 Id = employee.Id, |  | ||||||
|                 FirstName = employee.FirstName, |  | ||||||
|                 LastName = employee.LastName, |  | ||||||
|                 Photo = employee.Photo, |  | ||||||
|                 JobRoleId = employee.JobRoleId, |  | ||||||
|                 JobRoleName = employee.JobRole.Name |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,7 @@ | |||||||
| using Marco.Pms.Model.Dtos.Employees; | using Marco.Pms.Model.Dtos.Employees; | ||||||
|  | using Marco.Pms.Model.Dtos.Roles; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Marco.Pms.Model.ViewModels; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Dtos.Roles; | ||||||
|  | using Marco.Pms.Model.Entitlements; | ||||||
| using Marco.Pms.Model.ViewModels; | using Marco.Pms.Model.ViewModels; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
|  | |||||||
| @ -1,5 +1,11 @@ | |||||||
| using Marco.Pms.Model.Dtos.Project; | using Marco.Pms.Model.Activities; | ||||||
|  | using Marco.Pms.Model.Dtos.Project; | ||||||
| using Marco.Pms.Model.Projects; | using Marco.Pms.Model.Projects; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
| { | { | ||||||
| @ -62,12 +68,5 @@ namespace Marco.Pms.Model.Mapper | |||||||
| 
 | 
 | ||||||
|             }; |             }; | ||||||
|         } |         } | ||||||
|         //public static WorkItemVm ToWorkItemVMFromWorkItem(this WorkItem workItem) |  | ||||||
|         //{ |  | ||||||
|         //    return new WorkItemVm |  | ||||||
|         //    { |  | ||||||
|         //        Id |  | ||||||
|         //    } |  | ||||||
|         //} |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,36 +0,0 @@ | |||||||
| using Marco.Pms.Model.Dtos.Util; |  | ||||||
| using Marco.Pms.Model.Utilities; |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.Mapper |  | ||||||
| { |  | ||||||
|     public static class InquiryMapper |  | ||||||
|     { |  | ||||||
|         public static Inquiries ToInquiriesFromInquiriesDto(this InquiryDto inquiryDto) { |  | ||||||
|             return new Inquiries |  | ||||||
|             { |  | ||||||
|                 Id = 0, |  | ||||||
|                 OrganizatioinName = inquiryDto.OrganizatioinName, |  | ||||||
|                 OragnizationSize = inquiryDto.OragnizationSize, |  | ||||||
|                 IndustryId = inquiryDto.IndustryId, |  | ||||||
|                 Email = inquiryDto.Email, |  | ||||||
|                 ContactPerson = inquiryDto.ContactPerson, |  | ||||||
|                 ContactNumber = inquiryDto.ContactNumber, |  | ||||||
|                 About = inquiryDto.About |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         public static InquiryEmailObject ToInquiryEmailObjectFromInquiriesDto(this InquiryDto inquiryDto,string industryName) |  | ||||||
|         { |  | ||||||
|             return new InquiryEmailObject |  | ||||||
|             { |  | ||||||
|                 OrganizatioinName = inquiryDto.OrganizatioinName, |  | ||||||
|                 OragnizationSize = inquiryDto.OragnizationSize, |  | ||||||
|                 IndustryName = industryName, |  | ||||||
|                 Email = inquiryDto.Email, |  | ||||||
|                 ContactPerson = inquiryDto.ContactPerson, |  | ||||||
|                 ContactNumber = inquiryDto.ContactNumber, |  | ||||||
|                 About = inquiryDto.About |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,6 +1,5 @@ | |||||||
| using Marco.Pms.Model.Dtos.Project; | using Marco.Pms.Model.Dtos.Project; | ||||||
| using Marco.Pms.Model.Projects; | using Marco.Pms.Model.Projects; | ||||||
| using Marco.Pms.Model.ViewModels; |  | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Mapper | namespace Marco.Pms.Model.Mapper | ||||||
| { | { | ||||||
| @ -25,9 +24,9 @@ namespace Marco.Pms.Model.Mapper | |||||||
|         { |         { | ||||||
|             return new Project |             return new Project | ||||||
|             { |             { | ||||||
|                 ContactPerson = projectModel.ContactPerson ?? "", |                 ContactPerson = projectModel.ContactPerson, | ||||||
|                 ProjectAddress = projectModel.ProjectAddress ?? "", |                 ProjectAddress = projectModel.ProjectAddress, | ||||||
|                 Name = projectModel.Name ?? "", |                 Name = projectModel.Name, | ||||||
|                 EndDate = projectModel.EndDate, |                 EndDate = projectModel.EndDate, | ||||||
|                 StartDate = projectModel.StartDate, |                 StartDate = projectModel.StartDate, | ||||||
|                 TenantId = TenantId, |                 TenantId = TenantId, | ||||||
| @ -40,9 +39,9 @@ namespace Marco.Pms.Model.Mapper | |||||||
|             return new Project |             return new Project | ||||||
|             { |             { | ||||||
|                 Id = id, |                 Id = id, | ||||||
|                 ContactPerson = projectModel.ContactPerson ?? "", |                 ContactPerson = projectModel.ContactPerson, | ||||||
|                 ProjectAddress = projectModel.ProjectAddress ?? "", |                 ProjectAddress = projectModel.ProjectAddress, | ||||||
|                 Name = projectModel.Name ?? "", |                 Name = projectModel.Name, | ||||||
|                 EndDate = projectModel.EndDate, |                 EndDate = projectModel.EndDate, | ||||||
|                 StartDate = projectModel.StartDate, |                 StartDate = projectModel.StartDate, | ||||||
|                 TenantId = TenantId, |                 TenantId = TenantId, | ||||||
| @ -62,19 +61,6 @@ namespace Marco.Pms.Model.Mapper | |||||||
|             }; |             }; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public static ProjectListVM ToProjectListVMFromProject(this Project project) | 
 | ||||||
|         { |  | ||||||
|             return new ProjectListVM |  | ||||||
|             { |  | ||||||
|                 Id = project.Id, |  | ||||||
|                 Name = project.Name, |  | ||||||
|                 ProjectAddress = project.ProjectAddress, |  | ||||||
|                 ProjectStatusId = project.ProjectStatusId, |  | ||||||
|                 ContactPerson = project.ContactPerson, |  | ||||||
|                 StartDate = project.StartDate, |  | ||||||
|                 EndDate = project.EndDate, |  | ||||||
|                 TenantId = project.TenantId |  | ||||||
|             }; |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -12,7 +12,7 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Building Name")] |         [DisplayName("Building Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
|         public string? Description { get; set; } |         public string? Description { get; set; } | ||||||
| 
 | 
 | ||||||
|         public int ProjectId { get; set; } |         public int ProjectId { get; set; } | ||||||
| @ -23,6 +23,6 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,13 @@ | |||||||
| using System.ComponentModel; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
| using System.ComponentModel.DataAnnotations; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |  | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Projects | ||||||
| { | { | ||||||
| @ -12,14 +17,14 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Floor Name")] |         [DisplayName("Floor Name")] | ||||||
|         public string? FloorName { get; set; } |         public string FloorName { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public int BuildingId { get; set; } |         public int BuildingId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ForeignKey("BuildingId")] |         [ForeignKey("BuildingId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Building? Building { get; set; } |         public Building Building { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
| @ -27,6 +32,6 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -7,12 +7,12 @@ namespace Marco.Pms.Model.Projects | |||||||
|     public class PhotoGallary |     public class PhotoGallary | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public string? Description { get; set; } |         public string Description { get; set; } | ||||||
|         public int ProjectId { get; set; } |         public int ProjectId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(ProjectId))] |         [ForeignKey(nameof(ProjectId))] | ||||||
|         public Project? Project { get; set; } |         public Project? Project { get; set; } | ||||||
|         public string? AddedBy { get; set; } |         public string AddedBy { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(AddedBy))] |         [ForeignKey(nameof(AddedBy))] | ||||||
|         public ApplicationUser?  ApplicationUser { get; set; } |         public ApplicationUser?  ApplicationUser { get; set; } | ||||||
|  | |||||||
| @ -1,8 +1,14 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Entitlements; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding; | ||||||
|  | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.ComponentModel; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| using Marco.Pms.Model.Entitlements; | using System.Linq; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Projects | ||||||
| { | { | ||||||
| @ -12,14 +18,14 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Project Name")] |         [DisplayName("Project Name")] | ||||||
|         public string? Name { get; set; } |         public string Name { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Project Address")] |         [DisplayName("Project Address")] | ||||||
|         public string? ProjectAddress { get; set; } |         public string ProjectAddress { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("Contact Person")] |         [DisplayName("Contact Person")] | ||||||
| 
 | 
 | ||||||
|         public string? ContactPerson { get; set; } |         public string ContactPerson { get; set; } | ||||||
| 
 | 
 | ||||||
|         public DateTime? StartDate { get; set; } |         public DateTime? StartDate { get; set; } | ||||||
|         public DateTime? EndDate { get; set; } |         public DateTime? EndDate { get; set; } | ||||||
| @ -29,13 +35,13 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(ProjectStatusId))] |         [ForeignKey(nameof(ProjectStatusId))] | ||||||
|         public StatusMaster? ProjectStatus { get; set; } |         public StatusMaster ProjectStatus { get; set; } | ||||||
| 
 | 
 | ||||||
|         [DisplayName("TenantId")] |         [DisplayName("TenantId")] | ||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,8 @@ | |||||||
| using System.ComponentModel; | using Marco.Pms.Model.Employees; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Employees; |  | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Projects | ||||||
| { | { | ||||||
| @ -12,7 +12,7 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int EmployeeId { get; set; } |         public int EmployeeId { get; set; } | ||||||
|         [ForeignKey("EmployeeId")] |         [ForeignKey("EmployeeId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Employee? Employee { get; set; } |         public Employee Employee { get; set; } | ||||||
| 
 | 
 | ||||||
|        public int? JobRoleId { get; set; } |        public int? JobRoleId { get; set; } | ||||||
|         //[ForeignKey("EmployeeRoleId")] |         //[ForeignKey("EmployeeRoleId")] | ||||||
| @ -24,7 +24,7 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int ProjectId { get; set; } |         public int ProjectId { get; set; } | ||||||
|         [ForeignKey("ProjectId")] |         [ForeignKey("ProjectId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Project? Project { get; set; } |         public Project Project { get; set; } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|         public DateTime AllocationDate { get; set; } |         public DateTime AllocationDate { get; set; } | ||||||
| @ -35,6 +35,6 @@ namespace Marco.Pms.Model.Projects | |||||||
|         public int TenantId { get; set; } |         public int TenantId { get; set; } | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,8 +1,14 @@ | |||||||
| using System.ComponentModel; | using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | ||||||
| using System.ComponentModel.DataAnnotations; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
| using Marco.Pms.Model.Entitlements; | using Marco.Pms.Model.Entitlements; | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; | using Marco.Pms.Model.Activities; | ||||||
| 
 | 
 | ||||||
| namespace Marco.Pms.Model.Projects | namespace Marco.Pms.Model.Projects | ||||||
| { | { | ||||||
| @ -13,13 +19,13 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [Required] |         [Required] | ||||||
|         [DisplayName("Area Name")] |         [DisplayName("Area Name")] | ||||||
|         public string? AreaName { get; set; } |         public string AreaName { get; set; } | ||||||
| 
 | 
 | ||||||
|         public int FloorId { get; set; } |         public int FloorId { get; set; } | ||||||
| 
 | 
 | ||||||
|         [ForeignKey("FloorId")] |         [ForeignKey("FloorId")] | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         public Floor? Floor { get; set; } |         public Floor Floor { get; set; } | ||||||
| 
 | 
 | ||||||
|         //[ValidateNever] |         //[ValidateNever] | ||||||
|         //public List<WorkItem> WorkItems { get; set; } |         //public List<WorkItem> WorkItems { get; set; } | ||||||
| @ -29,7 +35,6 @@ namespace Marco.Pms.Model.Projects | |||||||
| 
 | 
 | ||||||
|         [ValidateNever] |         [ValidateNever] | ||||||
|         [ForeignKey(nameof(TenantId))] |         [ForeignKey(nameof(TenantId))] | ||||||
|         public Tenant? Tenant { get; set; } |         public Tenant Tenant { get; set; } | ||||||
| 
 |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,5 +1,10 @@ | |||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| #nullable disable | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
| namespace Marco.Pms.Model.Providers | namespace Marco.Pms.Model.Providers | ||||||
| { | { | ||||||
|     public sealed class TenantProvider |     public sealed class TenantProvider | ||||||
|  | |||||||
| @ -1,4 +1,9 @@ | |||||||
| #nullable disable | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
| namespace Marco.Pms.Model.Utilities | namespace Marco.Pms.Model.Utilities | ||||||
| { | { | ||||||
|   |   | ||||||
|  | |||||||
| @ -1,10 +1,16 @@ | |||||||
| namespace Marco.Pms.Model.Utilities | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Utilities | ||||||
| { | { | ||||||
|     public class AuthResponse |     public class AuthResponse | ||||||
|     { |     { | ||||||
|         public string? AccessToken { get; set; } |         public string AccessToken { get; set; } | ||||||
|         public string? RefreshToken { get; set; } |         public string RefreshToken { get; set; } | ||||||
|         public int ExpiresIn { get; set; } |         public int ExpiresIn { get; set; } | ||||||
|         public object? User { get; set; } |         public object User { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -9,13 +9,13 @@ namespace Marco.Pms.Model.Utilities | |||||||
|     public class FileDetails |     public class FileDetails | ||||||
|     { |     { | ||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public byte[]? FileData { get; set; } // Byte array for the file |         public byte[] FileData { get; set; } // Byte array for the file | ||||||
|         public string? FileName { get; set; } |         public string FileName { get; set; } | ||||||
|         public string? ContentType { get; set; } |         public string ContentType { get; set; } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Name of the file as stored on disk |         /// Name of the file as stored on disk | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         public string? StoredName { get; set; } |         public string StoredName { get; set; } | ||||||
| 
 | 
 | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,11 +1,17 @@ | |||||||
| namespace Marco.Pms.Model.Utilities | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | 
 | ||||||
|  | namespace Marco.Pms.Model.Utilities | ||||||
| { | { | ||||||
|     public class FileUploadModel |     public class FileUploadModel | ||||||
|     { |     { | ||||||
|         public string? FileName { get; set; }          // Name of the file (e.g., "image1.png") |         public string FileName { get; set; }          // Name of the file (e.g., "image1.png") | ||||||
|         public string? Base64Data { get; set; }       // Base64-encoded string of the file |         public string Base64Data { get; set; }       // Base64-encoded string of the file | ||||||
|         public string? ContentType { get; set; }      // MIME type (e.g., "image/png", "application/pdf") |         public string ContentType { get; set; }      // MIME type (e.g., "image/png", "application/pdf") | ||||||
|         public long FileSize { get; set; }           // File size in bytes |         public long FileSize { get; set; }           // File size in bytes | ||||||
|         public string? Description { get; set; }      // Optional: Description or purpose of the file |         public string Description { get; set; }      // Optional: Description or purpose of the file | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,14 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Utilities |  | ||||||
| { |  | ||||||
|     public class Inquiries |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public string? OrganizatioinName { get; set; } |  | ||||||
|         public string? Email { get; set; } |  | ||||||
|         public string? About { get; set; } |  | ||||||
|         public string? OragnizationSize { get; set; } |  | ||||||
|         public int IndustryId { get; set; } |  | ||||||
|         public string? ContactPerson { get; set; } |  | ||||||
|         public string? ContactNumber { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,13 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.Utilities |  | ||||||
| { |  | ||||||
|     public class InquiryEmailObject |  | ||||||
|     { |  | ||||||
|         public string? OrganizatioinName { get; set; } |  | ||||||
|         public string? Email { get; set; } |  | ||||||
|         public string? About { get; set; } |  | ||||||
|         public string? OragnizationSize { get; set; } |  | ||||||
|         public string? IndustryName { get; set; } |  | ||||||
|         public string? ContactPerson { get; set; } |  | ||||||
|         public string? ContactNumber { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -2,11 +2,11 @@ | |||||||
| { | { | ||||||
|     public class SmtpSettings |     public class SmtpSettings | ||||||
|     { |     { | ||||||
|         public string? SmtpServer { get; set; } |         public string SmtpServer { get; set; } | ||||||
|         public int Port { get; set; } |         public int Port { get; set; } | ||||||
|         public string? SenderName { get; set; } |         public string SenderName { get; set; } | ||||||
|         public string? SenderEmail { get; set; } |         public string SenderEmail { get; set; } | ||||||
|         public string? Password { get; set; } |         public string Password { get; set; } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,15 +0,0 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; |  | ||||||
| using Marco.Pms.Model.Entitlements; |  | ||||||
| using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.Utilities |  | ||||||
| { |  | ||||||
|     public class TenantTest |  | ||||||
|     { |  | ||||||
|         public int TenantId { get; set; } |  | ||||||
| 
 |  | ||||||
|         [ValidateNever] |  | ||||||
|         [ForeignKey(nameof(TenantId))] |  | ||||||
|         public Tenant? Tenant { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,11 +0,0 @@ | |||||||
| namespace Marco.Pms.Model.ViewModels.Activities |  | ||||||
| { |  | ||||||
|     public class ActivityVM |  | ||||||
|     { |  | ||||||
|         public int Id { get; set; } |  | ||||||
|         public string? ActivityName { get; set; } |  | ||||||
| 
 |  | ||||||
|         public string? UnitOfMeasurement { get; set; } |  | ||||||
|         public List<CheckListVM>? CheckLists { get; set; } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @ -1,26 +0,0 @@ | |||||||
| using Marco.Pms.Model.Activities; |  | ||||||
| using Marco.Pms.Model.ViewModels.Employee; |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| namespace Marco.Pms.Model.ViewModels.Activities |  | ||||||
| { |  | ||||||
|     public class AssignedTaskVM |  | ||||||
|     { |  | ||||||
|         public long Id { get; set; } |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
|         public DateTime AssignmentDate { get; set; } |  | ||||||
|         public double PlannedTask { get; set; } |  | ||||||
|         public double CompletedTask { get; set; } |  | ||||||
|         public DateTime? ReportedDate { get; set; } |  | ||||||
| 
 |  | ||||||
|         public string? Description { get; set; } |  | ||||||
| 
 |  | ||||||
|         public EmployeeVM? AssignedBy { get; set; } |  | ||||||
| 
 |  | ||||||
|         public int WorkItemId { get; set; } |  | ||||||
|         public int TenantId { get; set; } |  | ||||||
|         public List<EmployeeVM>? teamMembers { get; set; } |  | ||||||
| 
 |  | ||||||
|     } |  | ||||||
| } |  | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user