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

Fixed Confilts

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-14 13:37:27 +05:30
parent f57e40219e
commit 829a421ab0
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marco.Pms.Model/Mapper/ActivitiesMapper.cs
View File

@ -144,13 +144,14 @@ namespace Marco.Pms.Model.Mapper
IsMandatory = checkList.IsMandatory, IsMandatory = checkList.IsMandatory,
}; };
} }
public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto) public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId)
{ {
return new ActivityCheckList return new ActivityCheckList
{ {
Id = checkListDto.Id, Id = checkListDto.Id,
Check = checkListDto.Check, Check = checkListDto.Check,
IsMandatory = checkListDto.IsMandatory IsMandatory = checkListDto.IsMandatory,
TenantId = tenantId
}; };
} }
} }

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

@ -66,7 +66,7 @@ namespace Marco.Pms.Services.Controllers
List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>(); List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
foreach (var check in createActivity.CheckList) foreach (var check in createActivity.CheckList)
{ {
ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(); ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
activityCheckList.Add(checkList); activityCheckList.Add(checkList);
} }
_context.ActivityCheckLists.AddRange(activityCheckList); _context.ActivityCheckLists.AddRange(activityCheckList);
@ -89,7 +89,7 @@ namespace Marco.Pms.Services.Controllers
{ {
var tenantId = _userHelper.GetTenantId(); var tenantId = _userHelper.GetTenantId();
var employee = await _userHelper.GetCurrentEmployeeAsync(); var employee = await _userHelper.GetCurrentEmployeeAsync();
ActivityMaster? activity = await _context.ActivityMasters.FirstOrDefaultAsync(x => x.Id == id && x.IsActive == true); ActivityMaster? activity = await _context.ActivityMasters.FirstOrDefaultAsync(x => x.Id == id && x.IsActive == true && x.TenantId == tenantId);
if (activity != null && createActivity.UnitOfMeasurement != null && createActivity.ActivityName != null) { if (activity != null && createActivity.UnitOfMeasurement != null && createActivity.ActivityName != null) {
activity.ActivityName = createActivity.ActivityName; activity.ActivityName = createActivity.ActivityName;
@ -100,7 +100,7 @@ namespace Marco.Pms.Services.Controllers
List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>(); List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
foreach (var check in createActivity.CheckList) foreach (var check in createActivity.CheckList)
{ {
ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(); ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
activityCheckList.Add(checkList); activityCheckList.Add(checkList);
} }
_context.ActivityCheckLists.UpdateRange(activityCheckList); _context.ActivityCheckLists.UpdateRange(activityCheckList);

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

@ -23,9 +23,6 @@ builder.Host.UseSerilog((context, config) =>
}) })
; ;
#region CORS Settings
// Add services // Add services
//builder.Services.AddCors(options => //builder.Services.AddCors(options =>
//{ //{