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

Merge pull request 'Added proper success messages upon creation and update of building, floor, and work area for improved user feedback.' (#41) from Ashtuosh_Bug#191_Incorrect_Success_Message into Issues_May_2W

Browse Source 
Reviewed-on: #41
This commit is contained in:
Vikas Nale 2025-05-09 06:35:43 +00:00
commit 76b4bc88d5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,6 +493,7 @@ namespace MarcoBMS.Services.Controllers
{ {
Guid tenantId = GetTenantId(); Guid tenantId = GetTenantId();
List<WorkItemVM> workItems = new List<WorkItemVM> { }; List<WorkItemVM> workItems = new List<WorkItemVM> { };
string responseMessage = "";
if (workItemDot != null) if (workItemDot != null)
{ {
foreach (var item in workItemDot) foreach (var item in workItemDot)
@ -504,12 +505,14 @@ namespace MarcoBMS.Services.Controllers
//update //update
_context.WorkItems.Update(workItem); _context.WorkItems.Update(workItem);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseMessage = "Task Added Successfully";
} }
else else
{ {
//create //create
_context.WorkItems.Add(workItem); _context.WorkItems.Add(workItem);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseMessage = "Task Updated Successfully";
} }
var result = new WorkItemVM var result = new WorkItemVM
{ {
@ -519,7 +522,7 @@ namespace MarcoBMS.Services.Controllers
workItems.Add(result); workItems.Add(result);
} }
var activity = await _context.ActivityMasters.ToListAsync(); var activity = await _context.ActivityMasters.ToListAsync();
return Ok(ApiResponse<object>.SuccessResponse(workItems, "Data saved successfully.", 200)); return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
} }
return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item Details are not valid.", 400)); return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item Details are not valid.", 400));
@ -569,6 +572,7 @@ namespace MarcoBMS.Services.Controllers
{ {
Guid tenantId = GetTenantId(); Guid tenantId = GetTenantId();
var responseData = new InfraVM { }; var responseData = new InfraVM { };
string responseMessage = "";
if (infraDots != null) if (infraDots != null)
{ {
foreach (var item in infraDots) foreach (var item in infraDots)
@ -585,6 +589,7 @@ namespace MarcoBMS.Services.Controllers
_context.Buildings.Add(building); _context.Buildings.Add(building);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.building = building; responseData.building = building;
responseMessage = "Buliding Added Successfully";
} }
else else
{ {
@ -592,6 +597,7 @@ namespace MarcoBMS.Services.Controllers
_context.Buildings.Update(building); _context.Buildings.Update(building);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.building = building; responseData.building = building;
responseMessage = "Buliding Updated Successfully";
} }
} }
@ -606,6 +612,7 @@ namespace MarcoBMS.Services.Controllers
_context.Floor.Add(floor); _context.Floor.Add(floor);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.floor = floor; responseData.floor = floor;
responseMessage = "Floor Added Successfully";
} }
else else
{ {
@ -613,6 +620,7 @@ namespace MarcoBMS.Services.Controllers
_context.Floor.Update(floor); _context.Floor.Update(floor);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.floor = floor; responseData.floor = floor;
responseMessage = "Floor Updated Successfully";
} }
} }
if (item.WorkArea != null) if (item.WorkArea != null)
@ -626,6 +634,7 @@ namespace MarcoBMS.Services.Controllers
_context.WorkAreas.Add(workArea); _context.WorkAreas.Add(workArea);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.workArea = workArea; responseData.workArea = workArea;
responseMessage = "Work Area Added Successfully";
} }
else else
{ {
@ -633,10 +642,11 @@ namespace MarcoBMS.Services.Controllers
_context.WorkAreas.Update(workArea); _context.WorkAreas.Update(workArea);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
responseData.workArea = workArea; responseData.workArea = workArea;
responseMessage = "Work Area Updated Successfully";
} }
} }
} }
return Ok(ApiResponse<object>.SuccessResponse(responseData, "Data saved successfully.", 200)); return Ok(ApiResponse<object>.SuccessResponse(responseData, responseMessage, 200));
} }
return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Infra Details are not valid.", 400)); return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Infra Details are not valid.", 400));