partnerji na modal
This commit is contained in:
@@ -15,6 +15,7 @@ using EveryThing.Models;
|
||||
using EveryThing.Models.Transport;
|
||||
using DocumentFormat.OpenXml.Spreadsheet;
|
||||
using EveryThing.Models.CodeTable;
|
||||
using NuGet.Packaging;
|
||||
|
||||
namespace EveryThing.Pages.TransportLoadingOrder
|
||||
{
|
||||
@@ -36,12 +37,15 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
[BindProperty]
|
||||
public TransportLoadingOrderLoadUnload TransportLoadingOrderLoadUnload { get; set; }
|
||||
|
||||
[BindProperty]
|
||||
public List<SelectListItem> Vehicles { get; set; }
|
||||
|
||||
public async Task<IActionResult> OnGetAsync(int? id)
|
||||
{
|
||||
var user = _userManager.GetUserAsync(User).Result;
|
||||
|
||||
ViewData["IdPartnerFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["IdVehicleFk"] = new SelectList(_context.Vehicles.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdVehicle", "RegistrationNumber");
|
||||
SetVehiclesBag(user.IdCompanyFk);
|
||||
ViewData["IdLoadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["IdUnloadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["States"] = new SelectList(Enum.GetValues(typeof(Models.Transport.TransportLoadingOrder.TransportLoadingOrderState))
|
||||
@@ -85,15 +89,19 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
|
||||
public async Task<IActionResult> OnPostOrderAsync()
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine("OnPostOrderAsync");
|
||||
|
||||
var user = _userManager.GetUserAsync(User).Result;
|
||||
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
ViewData["IdPartnerFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
ViewData["IdVehicleFk"] = new SelectList(_context.Vehicles.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdVehicle", "RegistrationNumber");
|
||||
return Page();
|
||||
System.Diagnostics.Debug.WriteLine("OnPostOrderAsync:Invalid");
|
||||
//ViewData["IdPartnerFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title");
|
||||
//SetVehiclesBag(user.IdCompanyFk);
|
||||
return new JsonResult(new { successful = false, error = string.Join(", ", ModelState.Values.Where(x => x.Errors.Any()).Select(x=> string.Join(", ", x.Errors.Select(y => y.ErrorMessage)))) });
|
||||
}
|
||||
|
||||
if (TransportLoadingOrder.IdVehicleFk != null)
|
||||
{
|
||||
TransportLoadingOrder.VehicleText = "";
|
||||
}
|
||||
|
||||
TransportLoadingOrder.PostText = TransportLoadingOrder.PostText.Replace("<div><br></div>", "");
|
||||
@@ -121,7 +129,7 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
|
||||
TransportLoadingOrderLoadUnload = new TransportLoadingOrderLoadUnload();
|
||||
|
||||
return Page();
|
||||
return new JsonResult(new { successful = true, id = TransportLoadingOrder.IdTransportLoadingOrder });
|
||||
}
|
||||
|
||||
// OrderNumber and OrderYear
|
||||
@@ -136,7 +144,7 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
|
||||
return new JsonResult(new { id = TransportLoadingOrder .IdTransportLoadingOrder});
|
||||
return new JsonResult(new { successful = true, id = TransportLoadingOrder .IdTransportLoadingOrder});
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostPositionAddAsync()
|
||||
@@ -200,5 +208,15 @@ namespace EveryThing.Pages.TransportLoadingOrder
|
||||
{
|
||||
return _context.TransportLoadingOrders.Any(e => e.IdTransportLoadingOrder == id);
|
||||
}
|
||||
|
||||
private void SetVehiclesBag(int idCompany)
|
||||
{
|
||||
Vehicles = new List<SelectListItem>
|
||||
{
|
||||
new ("Izberi vozilo", "")
|
||||
};
|
||||
Vehicles.AddRange(_context.Vehicles.Where(x => x.IdCompanyFk == idCompany).Select(x => new SelectListItem(x.DisplayName, x.IdVehicle.ToString())));
|
||||
//Vehicles = new SelectList(tmpList, "Text", "Value");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user