diff --git a/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs b/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs index 91b4cc2..10affe7 100644 --- a/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs +++ b/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; +using Microsoft.VisualBasic; using SendGrid.Helpers.Mail; using System.IO; using System.Net.Http.Headers; @@ -33,7 +34,7 @@ namespace Api.SeaHavenIndustries.Controllers } [HttpPost] [Route("AddWorkorder")] - public async Task Addworkorder([FromForm] Workorder_DTO model) + public async Task Addworkorder([FromBody] Workorder_DTO model) { try { @@ -174,7 +175,7 @@ namespace Api.SeaHavenIndustries.Controllers [HttpPost] [Route("EditWorkorder")] - public async Task Editworkorder([FromForm] EditWorkorder_DTO model) + public async Task Editworkorder([FromBody] EditWorkorder_DTO model) { try { @@ -347,10 +348,15 @@ namespace Api.SeaHavenIndustries.Controllers //} - [HttpGet] + [HttpDelete] [Route("DeleteWorkorder")] - public IActionResult Deleteworkorder(int id) + public IActionResult Deleteworkorder([FromBody] EditWorkorder_DTO model) { + int id = model.Id.HasValue ? model.Id.Value : 0; + if (id == 0) + { + return BadRequest("Id is required"); + } try { var exist = _db.workOrders.Where(w => w.Id == id).FirstOrDefault(); @@ -802,6 +808,10 @@ namespace Api.SeaHavenIndustries.Controllers public string? Priority { get; set; } public string? Status { get; set; } public DateTime? DueDate { get; set; } + public string FormattedDueDate + { + get { return DueDate.HasValue? DueDate.Value.ToString("MM/dd/yyyy"): ""; } + } public string? Dispatcher { get; set; } public string? Scheduler { get; set; } public string? PO { get; set; }