Fixed rebase issues
This commit is contained in:
parent
c3f5fe8e34
commit
a6a842bf10
@ -625,14 +625,14 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
{
|
{
|
||||||
// Update existing
|
// Update existing
|
||||||
workItemsToUpdate.Add(workItem);
|
workItemsToUpdate.Add(workItem);
|
||||||
message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
|
message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Create new
|
// Create new
|
||||||
workItem.Id = Guid.NewGuid();
|
workItem.Id = Guid.NewGuid();
|
||||||
workItemsToCreate.Add(workItem);
|
workItemsToCreate.Add(workItem);
|
||||||
message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
|
message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
|
||||||
}
|
}
|
||||||
|
|
||||||
responseList.Add(new WorkItemVM
|
responseList.Add(new WorkItemVM
|
||||||
|
Loading…
x
Reference in New Issue
Block a user