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

Organization_Management #142

Merged
ashutosh.nehete merged 92 commits from Organization_Management into main 2025-09-30 09:05:14 +00:00
Conversation 0 Commits 92 Files Changed 126 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc3e927777 - Show all commits

6
Marco.Pms.Services/Service/MasterService.cs
View File

@ -781,7 +781,7 @@ namespace Marco.Pms.Services.Service
var activityGroup = await _context.ActivityGroupMasters var activityGroup = await _context.ActivityGroupMasters
.Include(ag => ag.Service) .Include(ag => ag.Service)
.FirstOrDefaultAsync(ag => ag.Id == createActivity.ActitvityGroupId && ag.TenantId == tenantId); .FirstOrDefaultAsync(ag => ag.Id == createActivity.ActivityGroupId && ag.TenantId == tenantId);
if (activityGroup == null) if (activityGroup == null)
{ {
_logger.LogWarning("User tried to create new activity, but not found activity group"); _logger.LogWarning("User tried to create new activity, but not found activity group");
@ -866,7 +866,7 @@ namespace Marco.Pms.Services.Service
} }
// Step 3: Validate service, activity group, and activity existence // Step 3: Validate service, activity group, and activity existence
var activityGroup = await _context.ActivityGroupMasters.Include(ag => ag.Service).FirstOrDefaultAsync(ag => ag.Id == createActivity.ActitvityGroupId && ag.IsActive); var activityGroup = await _context.ActivityGroupMasters.Include(ag => ag.Service).FirstOrDefaultAsync(ag => ag.Id == createActivity.ActivityGroupId && ag.IsActive);
if (activityGroup == null) if (activityGroup == null)
{ {
@ -888,7 +888,7 @@ namespace Marco.Pms.Services.Service
// Step 4: Update activity core data // Step 4: Update activity core data
activity.ActivityName = createActivity.ActivityName.Trim(); activity.ActivityName = createActivity.ActivityName.Trim();
activity.UnitOfMeasurement = createActivity.UnitOfMeasurement.Trim(); activity.UnitOfMeasurement = createActivity.UnitOfMeasurement.Trim();
activity.ActivityGroupId = createActivity.ActitvityGroupId; activity.ActivityGroupId = createActivity.ActivityGroupId;
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();