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

Removed all warning

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-09 16:29:38 +05:30
parent 52a67ba15b
commit c44deb439e
11 changed files with 101 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marco.Pms.Model/Dtos/Employees/ApplicationUserDto.cs
View File

@ -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? PermanentAddress { 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; }

12
Marco.Pms.Model/Mapper/ProjectMapper.cs
View File

@ -24,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,
@ -39,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,

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

@ -276,7 +276,7 @@ namespace MarcoBMS.Services.Controllers
if (recordAttendanceDot.MarkTime == null) return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Mark Time", "Invalid Mark Time",400)); if (recordAttendanceDot.MarkTime == null) return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Mark Time", "Invalid Mark Time",400));
DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot, recordAttendanceDot.MarkTime); DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot, recordAttendanceDot.MarkTime);
if (recordAttendanceDot.Comment == null) return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Comment", "Invalid Comment", 400));
if (attendance != null) if (attendance != null)
{ {

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

@ -20,6 +20,7 @@ namespace MarcoBMS.Services.Controllers
[HttpPost("fileupload")] [HttpPost("fileupload")]
public async Task<IActionResult> FileUploadDemo([FromForm] DemoEmployeeModel model) public async Task<IActionResult> FileUploadDemo([FromForm] DemoEmployeeModel model)
{ {
if(model.ImageFile == null) {return BadRequest(ApiResponse<object>.ErrorResponse("Error.", "Error.", 400));}
string imageName = await Saveimage(model.ImageFile); string imageName = await Saveimage(model.ImageFile);
return Ok(ApiResponse<object>.SuccessResponse("Success.", "Success.", 200)); return Ok(ApiResponse<object>.SuccessResponse("Success.", "Success.", 200));
} }
@ -71,7 +72,7 @@ namespace MarcoBMS.Services.Controllers
public string? EmployeeName { get; set; } public string? EmployeeName { get; set; }
public string? Occupation { get; set; } public string? Occupation { get; set; }
public string? ImageName { get; set; } public string? ImageName { get; set; }
public string ImageSrc { get; set; } public string? ImageSrc { get; set; }
public IFormFile? ImageFile { get; set; } // List to handle multiple files public IFormFile? ImageFile { get; set; } // List to handle multiple files
} }

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

@ -99,50 +99,63 @@ namespace MarcoBMS.Services.Controllers
{ {
//var project = projects.Where(c => c.Id == id).SingleOrDefault(); //var project = projects.Where(c => c.Id == id).SingleOrDefault();
ProjectDetailsVM vm = await GetProjectViewModel(id, project); ProjectDetailsVM vm = await GetProjectViewModel(id, project);
ProjectVM projectVM = new ProjectVM(); ProjectVM projectVM = new ProjectVM();
projectVM.Id = vm.project.Id; if (vm.project != null) {
projectVM.Name = vm.project.Name; projectVM.Id = vm.project.Id;
projectVM.ProjectAddress = vm.project.ProjectAddress; projectVM.Name = vm.project.Name;
projectVM.ContactPerson = vm.project.ContactPerson; projectVM.ProjectAddress = vm.project.ProjectAddress;
projectVM.StartDate = vm.project.StartDate; projectVM.ContactPerson = vm.project.ContactPerson;
projectVM.EndDate = vm.project.EndDate; projectVM.StartDate = vm.project.StartDate;
projectVM.ProjectStatusId = vm.project.ProjectStatusId; projectVM.EndDate = vm.project.EndDate;
projectVM.ProjectStatusId = vm.project.ProjectStatusId;
}
projectVM.Buildings = new List<BuildingVM>(); projectVM.Buildings = new List<BuildingVM>();
foreach (Building build in vm.buildings) if (vm.buildings != null) {
{ foreach (Building build in vm.buildings)
BuildingVM buildVM = new BuildingVM() { Id = build.Id, Description = build.Description, Name = build.Name };
buildVM.Floors = new List<FloorsVM>();
foreach (Floor floorDto in vm.floors.Where(c => c.BuildingId == build.Id).ToList())
{ {
FloorsVM floorVM = new FloorsVM() { FloorName = floorDto.FloorName, Id = floorDto.Id }; BuildingVM buildVM = new BuildingVM() { Id = build.Id, Description = build.Description, Name = build.Name };
floorVM.WorkAreas = new List<WorkAreaVM>(); buildVM.Floors = new List<FloorsVM>();
if (vm.floors != null)
foreach (WorkArea workAreaDto in vm.workAreas.Where(c => c.FloorId == floorVM.Id).ToList())
{ {
WorkAreaVM workAreaVM = new WorkAreaVM() { Id = workAreaDto.Id, AreaName = workAreaDto.AreaName, WorkItems = new List<WorkItemVM>() }; foreach (Floor floorDto in vm.floors.Where(c => c.BuildingId == build.Id).ToList())
foreach (WorkItem workItemDto in vm.workItems.Where(c => c.WorkAreaId == workAreaDto.Id).ToList())
{ {
WorkItemVM workItemVM = new WorkItemVM() { WorkItemId = workItemDto.Id, WorkItem = workItemDto }; FloorsVM floorVM = new FloorsVM() { FloorName = floorDto.FloorName, Id = floorDto.Id };
//workItemVM.WorkItem.WorkArea = null floorVM.WorkAreas = new List<WorkAreaVM>();
workItemVM.WorkItem.WorkArea = new WorkArea ();
//workItemVM.WorkItem.ActivityMaster.Tenant = null; if (vm.workAreas != null)
workItemVM.WorkItem.ActivityMaster.Tenant = new Tenant(); {
//workItemVM.WorkItem.Tenant = null; foreach (WorkArea workAreaDto in vm.workAreas.Where(c => c.FloorId == floorVM.Id).ToList())
workItemVM.WorkItem.Tenant = new Tenant(); {
WorkAreaVM workAreaVM = new WorkAreaVM() { Id = workAreaDto.Id, AreaName = workAreaDto.AreaName, WorkItems = new List<WorkItemVM>() };
if(vm.workItems != null)
{
foreach (WorkItem workItemDto in vm.workItems.Where(c => c.WorkAreaId == workAreaDto.Id).ToList())
{
WorkItemVM workItemVM = new WorkItemVM() { WorkItemId = workItemDto.Id, WorkItem = workItemDto };
//workItemVM.WorkItem.WorkArea = null
workItemVM.WorkItem.WorkArea = new WorkArea();
//workItemVM.WorkItem.ActivityMaster.Tenant = null;
workItemVM.WorkItem.ActivityMaster.Tenant = new Tenant();
//workItemVM.WorkItem.Tenant = null;
workItemVM.WorkItem.Tenant = new Tenant();
workAreaVM.WorkItems.Add(workItemVM); workAreaVM.WorkItems.Add(workItemVM);
}
}
floorVM.WorkAreas.Add(workAreaVM);
}
}
buildVM.Floors.Add(floorVM);
} }
floorVM.WorkAreas.Add(workAreaVM);
} }
projectVM.Buildings.Add(buildVM);
buildVM.Floors.Add(floorVM);
} }
projectVM.Buildings.Add(buildVM);
} }
return Ok(ApiResponse<object>.SuccessResponse(projectVM, "Success.", 200)); return Ok(ApiResponse<object>.SuccessResponse(projectVM, "Success.", 200));
} }

6
Marco.Pms.Services/Controllers/RolesController.cs
View File

@ -1,4 +1,4 @@
using Azure; using System.Data;
using Marco.Pms.DataAccess.Data; using Marco.Pms.DataAccess.Data;
using Marco.Pms.Model.Dtos.Roles; using Marco.Pms.Model.Dtos.Roles;
using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.Entitlements;
@ -10,9 +10,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Data; #nullable disable
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace MarcoBMS.Services.Controllers namespace MarcoBMS.Services.Controllers
{ {
[Route("api/[controller]")] [Route("api/[controller]")]

14
Marco.Pms.Services/Controllers/TaskController.cs
View File

@ -113,13 +113,17 @@ namespace MarcoBMS.Services.Controllers
if (taskAllocation == null) { if (taskAllocation == null) {
return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400)); return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
} }
if(taskAllocation.CompletedTask != 0) if(taskAllocation.WorkItem != null)
{ {
taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask; if (taskAllocation.CompletedTask != 0)
{
taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
}
taskAllocation.ReportedDate = reportTask.ReportedDate;
taskAllocation.CompletedTask = reportTask.CompletedTask;
taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
} }
taskAllocation.ReportedDate = reportTask.ReportedDate;
taskAllocation.CompletedTask = reportTask.CompletedTask;
taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
var comment = reportTask.ToCommentFromReportTaskDto(tenantId,Employee.Id); var comment = reportTask.ToCommentFromReportTaskDto(tenantId,Employee.Id);

2
Marco.Pms.Services/Middleware/TenantMiddleware.cs
View File

@ -11,7 +11,7 @@
public async Task Invoke(HttpContext context) public async Task Invoke(HttpContext context)
{ {
if (context.User.Identity.IsAuthenticated) if (context.User.Identity != null && context.User.Identity.IsAuthenticated)
{ {
var tenantId = context.User.FindFirst("tenantId")?.Value; var tenantId = context.User.FindFirst("tenantId")?.Value;
if (tenantId == null) if (tenantId == null)

2
Marco.Pms.Services/Program.cs
View File

@ -122,7 +122,7 @@ builder.Services.AddSingleton<ILoggingService, LoggingService>();
builder.Services.AddHttpContextAccessor(); builder.Services.AddHttpContextAccessor();
var jwtSettings = builder.Configuration.GetSection("Jwt").Get<JwtSettings>(); var jwtSettings = builder.Configuration.GetSection("Jwt").Get<JwtSettings>();
if(jwtSettings != null) if(jwtSettings != null && jwtSettings.Key != null)
{ {
builder.Services.AddAuthentication(options => builder.Services.AddAuthentication(options =>
{ {

28
Marco.Pms.Services/Service/LoggingServices.cs
View File

@ -14,19 +14,39 @@ namespace MarcoBMS.Services.Service
public void LogError(string? message, params object[]? args) public void LogError(string? message, params object[]? args)
{ {
using (LogContext.PushProperty("LogLevel", "Error")) using (LogContext.PushProperty("LogLevel", "Error"))
_logger.LogError(message, args); if (args != null)
} {
_logger.LogError(message, args);
}
else {
_logger.LogError(message);
}
}
public void LogInfo(string? message, params object[]? args) public void LogInfo(string? message, params object[]? args)
{ {
using (LogContext.PushProperty("LogLevel", "Information")) using (LogContext.PushProperty("LogLevel", "Information"))
_logger.LogInformation(message, args); if (args != null)
{
_logger.LogInformation(message, args);
}
else
{
_logger.LogInformation(message);
}
} }
public void LogWarning(string? message, params object[]? args) public void LogWarning(string? message, params object[]? args)
{ {
using (LogContext.PushProperty("LogLevel", "Warning")) using (LogContext.PushProperty("LogLevel", "Warning"))
_logger.LogWarning(message,args); if (args != null)
{
_logger.LogWarning(message, args);
}
else
{
_logger.LogWarning(message);
}
} }
} }

2
Marco.Pms.Services/Service/RefreshTokenService.cs
View File

@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
#nullable disable
namespace MarcoBMS.Services.Service namespace MarcoBMS.Services.Service
{ {
public class RefreshTokenService public class RefreshTokenService