diff --git a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs index 7598fb4..b068e63 100644 --- a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs +++ b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs @@ -4,8 +4,8 @@ { public DateTime AssignmentDate { get; set; } public double PlannedTask { get; set; } - public string Description { get; set; } - public List TaskTeam { get; set; } //Employee Ids + public string? Description { get; set; } + public List? TaskTeam { get; set; } //Employee Ids public int WorkItemId { get; set; } } } diff --git a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs index 7592fbd..023905e 100644 --- a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs +++ b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs @@ -1,30 +1,23 @@ -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 +namespace Marco.Pms.Model.Dtos.Employees { public class CreateUserDto { public int Id { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } public string? MiddleName { get; set; } public string? Email { get; set; } - public string Gender { get; set; } + public string? Gender { get; set; } public string? BirthDate { get; set; } - public string JoiningDate { get; set; } + public string? JoiningDate { get; set; } public string? PeramnentAddress { get; set; } public string? CurrentAddress { get; set; } - public string PhoneNumber { get; set; } + public string? PhoneNumber { get; set; } - public string EmergencyPhoneNumber { get; set; } - public string EmergencyContactPerson { get; set; } + public string? EmergencyPhoneNumber { get; set; } + public string? EmergencyContactPerson { get; set; } public string? AadharNumber { get; set; } @@ -33,25 +26,25 @@ namespace Marco.Pms.Model.Dtos.Employees //public IFormFile? Photo { get; set; } // To store the captured photo //public List? Documents { get; set; } - public string JobRoleId { get; set; } + public string? JobRoleId { get; set; } // public int TenantId { get; set; } } public class CreateQuickUserDto { public int Id { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } - public string Gender { get; set; } + public string? Gender { get; set; } public string? CurrentAddress { get; set; } - public string PhoneNumber { get; set; } + public string? PhoneNumber { get; set; } - public string EmergencyPhoneNumber { get; set; } - public string EmergencyContactPerson { get; set; } + public string? EmergencyPhoneNumber { get; set; } + public string? EmergencyContactPerson { get; set; } - public string JobRoleId { get; set; } + public string? JobRoleId { get; set; } } } diff --git a/Marco.Pms.Model/ViewModels/Activities/AssignedTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/AssignedTaskVM.cs index b4510c3..03cf13f 100644 --- a/Marco.Pms.Model/ViewModels/Activities/AssignedTaskVM.cs +++ b/Marco.Pms.Model/ViewModels/Activities/AssignedTaskVM.cs @@ -20,7 +20,7 @@ namespace Marco.Pms.Model.ViewModels.Activities public int WorkItemId { get; set; } public int TenantId { get; set; } - public List teamMembers { get; set; } + public List? teamMembers { get; set; } } } diff --git a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs index d328330..91a324d 100644 --- a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs +++ b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs @@ -14,6 +14,6 @@ namespace Marco.Pms.Model.ViewModels.Activities public int WorkItemId { get; set; } public int TenantId { get; set; } - public List Comments { get; set; } + public List? Comments { get; set; } } } diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs index e2d2169..59108ed 100644 --- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs +++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs @@ -12,11 +12,11 @@ namespace Marco.Pms.Model.ViewModels.Activities public double CompletedTask { get; set; } public DateTime? ReportedDate { get; set; } public string? Description { get; set; } - public string AssignBy { get; set; } - public WorkItem WorkItem { get; set; } - public string Tenant { get; set; } + public string? AssignBy { get; set; } + public WorkItem? WorkItem { get; set; } + public string? Tenant { get; set; } - public List Comments { get; set; } - public List TeamMembers { get; set; } + public List? Comments { get; set; } + public List? TeamMembers { get; set; } } } diff --git a/Marco.Pms.Model/ViewModels/Activities/WorkItemVM.cs b/Marco.Pms.Model/ViewModels/Activities/WorkItemVM.cs index db904ed..c0909cd 100644 --- a/Marco.Pms.Model/ViewModels/Activities/WorkItemVM.cs +++ b/Marco.Pms.Model/ViewModels/Activities/WorkItemVM.cs @@ -3,7 +3,7 @@ public class WorkItemVm { public int Id { get; set; } - public string ActivityName { get; set; } + public string? ActivityName { get; set; } public double PlannedWork { get; set; } public double CompletedWork { get; set; } public DateTime TaskDate { get; set; } diff --git a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs index 93ca437..b17a3c7 100644 --- a/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs +++ b/Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs @@ -3,20 +3,20 @@ public class EmployeeVM { public int Id { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } public string? MiddleName { get; set; } public string? Email { get; set; } - public string Gender { get; set; } + public string? Gender { get; set; } public DateTime? BirthDate { get; set; } public DateTime? JoiningDate { get; set; } - public string PeramnentAddress { get; set; } - public string CurrentAddress { get; set; } - public string PhoneNumber { get; set; } + public string? PeramnentAddress { get; set; } + public string? CurrentAddress { get; set; } + public string? PhoneNumber { get; set; } - public string EmergencyPhoneNumber { get; set; } - public string EmergencyContactPerson { get; set; } + public string? EmergencyPhoneNumber { get; set; } + public string? EmergencyContactPerson { get; set; } public string? AadharNumber { get; set; } @@ -28,7 +28,7 @@ public string? ApplicationUserId { get; set; } public int? JobRoleId { get; set; } - public string JobRole { get; set; } + public string? JobRole { get; set; } } } diff --git a/Marco.Pms.Services/Service/ILoggingService.cs b/Marco.Pms.Services/Service/ILoggingService.cs index 744ab19..39dbb00 100644 --- a/Marco.Pms.Services/Service/ILoggingService.cs +++ b/Marco.Pms.Services/Service/ILoggingService.cs @@ -6,7 +6,7 @@ namespace MarcoBMS.Services.Service { void LogInfo(string? message, params object[]? args); void LogWarning(string? message, params object[]? args); - void LogError(Exception? ex, string? message, params object[]? args); + void LogError(string? message, params object[]? args); } } diff --git a/Marco.Pms.Services/Service/LoggingServices.cs b/Marco.Pms.Services/Service/LoggingServices.cs index aec6257..10fc5ab 100644 --- a/Marco.Pms.Services/Service/LoggingServices.cs +++ b/Marco.Pms.Services/Service/LoggingServices.cs @@ -11,9 +11,8 @@ namespace MarcoBMS.Services.Service _logger = logger; } - public void LogError(Exception? ex, string? message, params object[]? args) + public void LogError(string? message, params object[]? args) { - using (LogContext.PushProperty("Error", ex)) using (LogContext.PushProperty("LogLevel", "Error")) _logger.LogError(message, args); }