david/everything2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modal partnerji in dodajanje pri transport plan

Browse Source
This commit is contained in:
David Štaleker
2023-07-23 21:20:29 +02:00
parent 41639b3354
commit facfb3a726
11 changed files with 2710 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2235
EveryThing/Migrations/20230723085946_4.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

37
EveryThing/Migrations/20230723085946_4.cs Normal file
View File

@@ -0,0 +1,37 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EveryThing.Migrations
{
public partial class _4 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "LoadingOrderLoadUnload",
table: "CodeTablePartners",
type: "tinyint(1)",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "Transporter",
table: "CodeTablePartners",
type: "tinyint(1)",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "LoadingOrderLoadUnload",
table: "CodeTablePartners");
migrationBuilder.DropColumn(
name: "Transporter",
table: "CodeTablePartners");
}
}
}

6
EveryThing/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@@ -347,6 +347,9 @@ namespace EveryThing.Migrations
b.Property<int>("IdCountryFk") b.Property<int>("IdCountryFk")
.HasColumnType("int"); .HasColumnType("int");
b.Property<bool>("LoadingOrderLoadUnload")
.HasColumnType("tinyint(1)");
b.Property<string>("Post") b.Property<string>("Post")
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
@@ -371,6 +374,9 @@ namespace EveryThing.Migrations
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
b.Property<bool>("Transporter")
.HasColumnType("tinyint(1)");
b.HasKey("IdPartner"); b.HasKey("IdPartner");
b.HasIndex("IdCompanyFk"); b.HasIndex("IdCompanyFk");

9
EveryThing/Models/CodeTable/CodeTablePartner.cs
View File

@@ -68,6 +68,15 @@ namespace EveryThing.Models.CodeTable
[Display(Name = "Dobavitelj")] [Display(Name = "Dobavitelj")]
public bool Supplier { get; set; } = false; public bool Supplier { get; set; } = false;
[Required]
[Display(Name = "Prevoznik")]
public bool Transporter { get; set; } = false;
[Required]
[Display(Name = "Naklad/Razklad")]
public bool LoadingOrderLoadUnload { get; set; } = false;
// ForeingKey // ForeingKey
public CodeTableCountry Country { get; set; } public CodeTableCountry Country { get; set; }
public CodeTableCompany Company { get; set; } public CodeTableCompany Company { get; set; }

10
EveryThing/Pages/CodeTablePartners/AddEditPartnerModal.cshtml
View File

@@ -89,6 +89,16 @@
<input id="inpModalAddEditCodeTablePartnerSupplier" class="form-check-input" asp-for="Partner.Supplier" /> @Html.DisplayNameFor(model => model.Partner.Supplier) <input id="inpModalAddEditCodeTablePartnerSupplier" class="form-check-input" asp-for="Partner.Supplier" /> @Html.DisplayNameFor(model => model.Partner.Supplier)
</label> </label>
</div> </div>
<div class="form-group form-check">
<label class="form-check-label">
<input id="inpModalAddEditCodeTablePartnerTransporter" class="form-check-input" asp-for="Partner.Transporter" /> @Html.DisplayNameFor(model => model.Partner.Transporter)
</label>
</div>
<div class="form-group form-check">
<label class="form-check-label">
<input id="inpModalAddEditCodeTablePartnerLoadingOrderLoadUnload" class="form-check-input" asp-for="Partner.LoadingOrderLoadUnload" /> @Html.DisplayNameFor(model => model.Partner.LoadingOrderLoadUnload)
</label>
</div>
<div class="form-group form-check"> <div class="form-group form-check">
<label class="form-check-label"> <label class="form-check-label">
<input id="inpModalAddEditCodeTablePartnerActive" class="form-check-input" asp-for="Partner.Active" /> @Html.DisplayNameFor(model => model.Partner.Active) <input id="inpModalAddEditCodeTablePartnerActive" class="form-check-input" asp-for="Partner.Active" /> @Html.DisplayNameFor(model => model.Partner.Active)

42
EveryThing/Pages/CodeTablePartners/Index.cshtml.cs
View File

@@ -13,6 +13,8 @@ using EveryThing.Models.CodeTable;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using System.Globalization; using System.Globalization;
using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Rendering;
using DocumentFormat.OpenXml.Spreadsheet;
using JetBrains.Annotations;
namespace EveryThing.Pages.CodeTablePartners namespace EveryThing.Pages.CodeTablePartners
{ {
@@ -62,7 +64,7 @@ namespace EveryThing.Pages.CodeTablePartners
} }
} }
public IActionResult OnGetCodeTablePartnerModal(bool edit, int idCodeTablePartner) public IActionResult OnGetCodeTablePartnerModal([CanBeNull]string title, bool edit, int idCodeTablePartner, bool? buyer, bool? supplier, bool? transporter, bool? loadingUnloading)
{ {
//TODO input izbrane //TODO input izbrane
var user = _userManager.GetUserAsync(User).Result; var user = _userManager.GetUserAsync(User).Result;
@@ -89,9 +91,23 @@ namespace EveryThing.Pages.CodeTablePartners
partner = new CodeTablePartner(); partner = new CodeTablePartner();
if (sloCountry != null) if (sloCountry != null)
partner.IdCountryFk = sloCountry.IdCountry; partner.IdCountryFk = sloCountry.IdCountry;
if (title != null)
partner.Title = title;
if (buyer != null)
partner.Buyer = (bool)buyer;
if (supplier != null)
partner.Supplier = (bool)supplier;
if (transporter != null)
partner.Transporter = (bool)transporter;
if (loadingUnloading != null)
partner.LoadingOrderLoadUnload = (bool)loadingUnloading;
partner.Active = true; partner.Active = true;
//TODO kljukice
//partner.CodeTableItemType = (CodeTableItemType)codeTableItemType;
} }
return Partial("AddEditPartnerModal", new AddEditCodeTablePartner return Partial("AddEditPartnerModal", new AddEditCodeTablePartner
@@ -127,6 +143,8 @@ namespace EveryThing.Pages.CodeTablePartners
partner.RegistrationNumber = partnerData.RegistrationNumber; partner.RegistrationNumber = partnerData.RegistrationNumber;
partner.Buyer = partnerData.Buyer; partner.Buyer = partnerData.Buyer;
partner.Supplier = partnerData.Supplier; partner.Supplier = partnerData.Supplier;
partner.Transporter = partnerData.Transporter;
partner.LoadingOrderLoadUnload = partnerData.LoadingOrderLoadUnload;
partner.Active = partnerData.Active; partner.Active = partnerData.Active;
partner.Email = partnerData.Email; partner.Email = partnerData.Email;
partner.HouseNumber = partnerData.HouseNumber; partner.HouseNumber = partnerData.HouseNumber;
@@ -150,6 +168,8 @@ namespace EveryThing.Pages.CodeTablePartners
Street = partnerData.Street, Street = partnerData.Street,
Buyer = partnerData.Buyer, Buyer = partnerData.Buyer,
Supplier = partnerData.Supplier, Supplier = partnerData.Supplier,
Transporter = partnerData.Transporter,
LoadingOrderLoadUnload = partnerData.LoadingOrderLoadUnload,
Active = partnerData.Active, Active = partnerData.Active,
TaxNumber = partnerData.TaxNumber, TaxNumber = partnerData.TaxNumber,
RegistrationNumber = partnerData.RegistrationNumber, RegistrationNumber = partnerData.RegistrationNumber,
@@ -224,5 +244,21 @@ namespace EveryThing.Pages.CodeTablePartners
return new JsonResult(new { partner, error, successful, partnerInUse }); return new JsonResult(new { partner, error, successful, partnerInUse });
} }
public IActionResult OnGetCodeTablePartnersSelect(bool? buyers, bool? suppliers, bool? transporters, bool? loadingUnloadings)
{
var user = _userManager.GetUserAsync(User).Result;
var partners = _context.CodeTablePartners
.Where(x => x.IdCompanyFk == user.IdCompanyFk
&& x.Active
&& (buyers == null || x.Buyer == buyers)
&& (suppliers == null || x.Supplier == suppliers)
&& (transporters == null || x.Transporter == transporters)
&& (loadingUnloadings == null || x.LoadingOrderLoadUnload == loadingUnloadings))
.OrderBy(x => x.Title);
return new JsonResult(new { partners = new SelectList(partners, "IdPartner", "Title") });
}
} }
} }

90
EveryThing/Pages/CodeTableVehicles/AddEditVehicleModal.cshtml Normal file
View File

@@ -0,0 +1,90 @@
@model EveryThing.Pages.CodeTableVehicles.IndexModel.AddEditCodeTableVehicle
<div class="modal" tabindex="-1" role="dialog" id="divModalAddEditCodeTableVehicle">
<div class="modal-dialog" role="document">
<div class="modal-content modal-lg">
<div class="modal-header">
<h5 class="modal-title" id="modalAddEditCodeTableVehicleTitle">Dodajanje novega vozila</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<input id="inpModalAddEditCodeTableVehicleIdCodeTableVehicle" type="hidden" asp-for="@Model.IdCodeTableVehicle" />
<input id="inpModalAddEditCodeTableVehicleEdit" type="hidden" asp-for="@Model.Edit" />
<div class="row">
<div class="col-4">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-group">
<label asp-for="Vehicle.Title" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleTitle" asp-for="Vehicle.Title" class="form-control" />
<span asp-validation-for="Vehicle.Title" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Vehicle.IdMakeFk" class="control-label"></label>
<select id="selModalAddEditCodeTableVehicleMake" asp-for="Vehicle.IdMakeFk" class="form-control" asp-items="Model.VehicleMakes"></select>
</div>
<div class="form-group">
<label asp-for="Vehicle.Model" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleModel" asp-for="Vehicle.Model" class="form-control" />
</div>
<div class="form-group">
<label asp-for="Vehicle.RegistrationNumber" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleRegistrationNumber" asp-for="Vehicle.RegistrationNumber" class="form-control" />
<span asp-validation-for="Vehicle.RegistrationNumber" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Vehicle.IdVehicleTypeFk" class="control-label"></label>
<select id="selModalAddEditCodeTableVehicleVehicleType" asp-for="Vehicle.IdVehicleTypeFk" class="form-control" asp-items="ViewBag.VehicleType"></select>
<span asp-validation-for="Vehicle.IdVehicleTypeFk" class="text-danger"></span>
</div>
<div class="form-group form-check">
<label class="form-check-label">
<input id="inpModalAddEditCodeTableVehicleActive" class="form-check-input" asp-for="Vehicle.Active" /> @Html.DisplayNameFor(model => model.Vehicle.Active)
</label>
</div>
</div>
<div class="col-4">
<div class="form-group">
<label asp-for="Vehicle.Year" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleYear" asp-for="Vehicle.Year" class="form-control" />
<span asp-validation-for="Vehicle.Year" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Vehicle.VinNumber" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleVinNumber" asp-for="Vehicle.VinNumber" class="form-control" />
<span asp-validation-for="Vehicle.VinNumber" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Vehicle.EngineNumber" class="control-label"></label>
<input id="inpModalAddEditCodeTableVehicleEngineNumber" asp-for="Vehicle.EngineNumber" class="form-control" />
</div>
<div class="form-group">
<label asp-for="Vehicle.IdFuelTypeFk" class="control-label"></label>
<select id="selModalAddEditCodeTableVehicleFuelType" asp-for="Vehicle.IdFuelTypeFk" class="form-control" asp-items="Model.FuelTypes"></select>
</div>
<div class="form-group">
<label asp-for="Vehicle.VehicleMeterType" class="control-label"></label>
<select id="selModalAddEditCodeTableVehicleVehicleMeterType" asp-for="Vehicle.VehicleMeterType" class="form-control" asp-items="Html.GetEnumSelectList<Models.Vehicle.VehicleMeterType>()"></select>
<span asp-validation-for="Vehicle.VehicleMeterType" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Vehicle.IdDepartementFk" class="control-label"></label>
<select id="selModalAddEditCodeTableVehicleDepartment" asp-for="Vehicle.IdDepartementFk" class="form-control" asp-items="Model.Departments"></select>
</div>
</div>
<div class="col-4">
<label asp-for="Vehicle.Note" class="control-label"></label>
<textarea id="taModalAddEditCodeTableVehicleNote" asp-for="Vehicle.Note" class="form-control" style="resize:none; height: 455px;"></textarea>
</div>
</div>
</div>
<div class="modal-footer">
@*<a id="btnModalAddEditCodeTableVehicleAddFile" asp-page="/Files/Upload" asp-route-idReferenceFk="@Model.IdCodeTableVehicle" asp-route-fileType="@Models.FileType.CodeTableVehicle" class="btn btn-primary pull-right">Priloži datoteko</a>*@
<button id="btnModalAddEditCodeTableVehicleConfirm" type="button" class="btn btn-primary">Shrani</button>
<button id="btnModalAddEditCodeTableVehicleCancel" type="button" class="btn btn-secondary">Prekliči</button>
</div>
</div>
</div>
</div>

14
EveryThing/Pages/CodeTableVehicles/Index.cshtml.cs
View File

@@ -11,6 +11,7 @@ using EveryThing.Models.Vehicle;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using EveryThing.Models.Invoice; using EveryThing.Models.Invoice;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace EveryThing.Pages.CodeTableVehicles namespace EveryThing.Pages.CodeTableVehicles
{ {
@@ -20,6 +21,19 @@ namespace EveryThing.Pages.CodeTableVehicles
private readonly ApplicationDbContext _context; private readonly ApplicationDbContext _context;
private readonly UserManager<IdentityApplicationUser> _userManager; private readonly UserManager<IdentityApplicationUser> _userManager;
public class AddEditCodeTableVehicle
{
public Vehicle Vehicle { get; set; }
public bool Edit { get; set; }
public int IdCodeTableVehicle { get; set; }
public SelectList FuelTypes { get; set; }
public SelectList Departments { get; set; }
public SelectList VehicleGroups { get; set; }
public SelectList VehicleMakes{ get; set; }
public SelectList VehicleTypes { get; set; }
//public IList<File> Files { get; set; }
}
public IndexModel(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager) public IndexModel(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager)
{ {
_context = context; _context = context;

338
EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml
View File

@@ -40,106 +40,108 @@
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active" id="item-basic"> <div class="tab-pane fade show active" id="item-basic">
<form method="post" data-ajax="true" data-ajax-method="post" asp-page-handler="order" data-ajax-complete="orderPostCompleted" onsubmit="beforeOrderPost()"> <form method="post" data-ajax="true" data-ajax-method="post" asp-page-handler="order" data-ajax-complete="orderPostCompleted" onsubmit="beforeOrderPost()">
<div class="card-body"> <div class="card-body">
<input type="hidden" asp-for="TransportLoadingOrder.IdTransportLoadingOrder"/> <input type="hidden" asp-for="TransportLoadingOrder.IdTransportLoadingOrder"/>
<input type="hidden" asp-for="TransportLoadingOrder.IdCompanyFk"/> <input type="hidden" asp-for="TransportLoadingOrder.IdCompanyFk"/>
<input type="hidden" asp-for="TransportLoadingOrder.OrderNumber"/> <input type="hidden" asp-for="TransportLoadingOrder.OrderNumber"/>
<input type="hidden" asp-for="TransportLoadingOrder.OrderYear"/> <input type="hidden" asp-for="TransportLoadingOrder.OrderYear"/>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<div class="form-group">
<label asp-for="TransportLoadingOrder.IdPartnerFk" class="form-label"></label>
<select asp-for="TransportLoadingOrder.IdPartnerFk" class="form-control select2" asp-items="ViewBag.IdPartnerFk"></select>
</div>
</div>
<div class="col-4">
<label asp-for="TransportLoadingOrder.IdVehicleFk" class="form-label"></label>
<select asp-for="TransportLoadingOrder.IdVehicleFk" class="form-control select2-vehicle" asp-items="Model.Vehicles">
</select>
</div>
<div class="col-2 text-right">
<label class="form-label">Nakladalni nalog</label>
<br/>
<h4>
@if (Model.TransportLoadingOrder.IdTransportLoadingOrder > 0)
{
@Html.DisplayFor(modelItem => Model.TransportLoadingOrder.OrderNumberDisplay)
}
</h4>
</div>
</div>
<div class="row">
<div class="col-3">
<div class="form-group">
<label asp-for="TransportLoadingOrder.OrderCity" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.OrderCity" class="form-control"/>
<span asp-validation-for="TransportLoadingOrder.OrderCity" class="text-danger"></span>
</div>
</div>
<div class="col-2">
<div class="form-group">
<label asp-for="TransportLoadingOrder.OrderDate" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.OrderDate" class="form-control" />
<span asp-validation-for="TransportLoadingOrder.OrderDate" class="text-danger"></span>
</div>
</div>
<div class="col-1">
<div class="form-group"> <div class="form-group">
<label asp-for="TransportLoadingOrder.State" class="form-label"></label> <label asp-for="TransportLoadingOrder.IdPartnerFk" class="form-label"></label>
<select asp-for="TransportLoadingOrder.State" class="form-control" asp-items="ViewBag.States"></select> <div class="input-group">
<span asp-validation-for="TransportLoadingOrder.State" class="text-danger"></span> <select id="selTransporter" asp-for="TransportLoadingOrder.IdPartnerFk" class="form-control select2-transporter" asp-items="ViewBag.IdPartnerFk"></select>
</div>
</div>
<div class="col-4">
<div class="form-group">
<label asp-for="TransportLoadingOrder.VehicleText" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.VehicleText" class="form-control vehicle-text" />
<span asp-validation-for="TransportLoadingOrder.VehicleText" class="text-danger"></span>
</div>
</div>
<div class="col-2">
<div class="form-group">
<label asp-for="TransportLoadingOrder.Total" class="form-label"></label>
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">€</div>
</div> </div>
<input autocomplete="off" asp-for="TransportLoadingOrder.Total" class="form-control"> </div>
</div>
<div class="col-4">
<label asp-for="TransportLoadingOrder.IdVehicleFk" class="form-label"></label>
<select asp-for="TransportLoadingOrder.IdVehicleFk" class="form-control select2-vehicle" asp-items="Model.Vehicles">
</select>
</div>
<div class="col-2 text-right">
<label class="form-label">Nakladalni nalog</label>
<br/>
<h4>
@if (Model.TransportLoadingOrder.IdTransportLoadingOrder > 0)
{
@Html.DisplayFor(modelItem => Model.TransportLoadingOrder.OrderNumberDisplay)
}
</h4>
</div>
</div>
<div class="row">
<div class="col-3">
<div class="form-group">
<label asp-for="TransportLoadingOrder.OrderCity" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.OrderCity" class="form-control"/>
<span asp-validation-for="TransportLoadingOrder.OrderCity" class="text-danger"></span>
</div>
</div>
<div class="col-2">
<div class="form-group">
<label asp-for="TransportLoadingOrder.OrderDate" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.OrderDate" class="form-control" />
<span asp-validation-for="TransportLoadingOrder.OrderDate" class="text-danger"></span>
</div>
</div>
<div class="col-1">
<div class="form-group">
<label asp-for="TransportLoadingOrder.State" class="form-label"></label>
<select asp-for="TransportLoadingOrder.State" class="form-control" asp-items="ViewBag.States"></select>
<span asp-validation-for="TransportLoadingOrder.State" class="text-danger"></span>
</div>
</div>
<div class="col-4">
<div class="form-group">
<label asp-for="TransportLoadingOrder.VehicleText" class="form-label"></label>
<input autocomplete="off" asp-for="TransportLoadingOrder.VehicleText" class="form-control vehicle-text" />
<span asp-validation-for="TransportLoadingOrder.VehicleText" class="text-danger"></span>
</div>
</div>
<div class="col-2">
<div class="form-group">
<label asp-for="TransportLoadingOrder.Total" class="form-label"></label>
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">€</div>
</div>
<input autocomplete="off" asp-for="TransportLoadingOrder.Total" class="form-control">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group mb-0">
<label asp-for="TransportLoadingOrder.PreText" class="form-label"></label>
<input type="hidden" id="value-pretext" asp-for="@Model.TransportLoadingOrder.PreText"/>
<div id="editor-pretext" style="height: 250px">
@Html.Raw(Model.TransportLoadingOrder.PreText)
</div>
<span asp-validation-for="TransportLoadingOrder.PreText" class="text-danger"></span>
</div>
</div>
<div class="col-6">
<div class="form-group mb-0">
<label asp-for="TransportLoadingOrder.PostText" class="form-label"></label>
<input type="hidden" id="value-posttext" asp-for="@Model.TransportLoadingOrder.PostText"/>
<div id="editor-posttext" style="height: 250px">
@Html.Raw(Model.TransportLoadingOrder.PostText)
</div>
<span asp-validation-for="TransportLoadingOrder.PostText" class="text-danger"></span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="card-footer py-3 text-right">
<div class="col-6"> <button id="saveOrder" type="submit" class="btn btn-primary">Shrani nalog</button>
<div class="form-group mb-0"> <a asp-page="Index" class="btn btn-default">Nazaj</a>
<label asp-for="TransportLoadingOrder.PreText" class="form-label"></label>
<input type="hidden" id="value-pretext" asp-for="@Model.TransportLoadingOrder.PreText"/>
<div id="editor-pretext" style="height: 250px">
@Html.Raw(Model.TransportLoadingOrder.PreText)
</div>
<span asp-validation-for="TransportLoadingOrder.PreText" class="text-danger"></span>
</div>
</div>
<div class="col-6">
<div class="form-group mb-0">
<label asp-for="TransportLoadingOrder.PostText" class="form-label"></label>
<input type="hidden" id="value-posttext" asp-for="@Model.TransportLoadingOrder.PostText"/>
<div id="editor-posttext" style="height: 250px">
@Html.Raw(Model.TransportLoadingOrder.PostText)
</div>
<span asp-validation-for="TransportLoadingOrder.PostText" class="text-danger"></span>
</div>
</div>
</div> </div>
</div> </form>
<div class="card-footer py-3 text-right"> </div>
<button id="saveOrder" type="submit" class="btn btn-primary">Shrani nalog</button>
<a asp-page="Index" class="btn btn-default">Nazaj</a>
</div>
</form>
</div>
<div class="tab-pane fade" id="item-positions"> <div class="tab-pane fade" id="item-positions">
<div class="card-body"> <div class="card-body">
@@ -151,8 +153,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label class="form-label">Naklad</label> <label class="form-label">Naklad</label>
<select asp-for="TransportLoadingOrderLoadUnload.IdLoadingFk" class="form-control select2" asp-items="ViewBag.IdLoadingFk"> <select id="selLoading" asp-for="TransportLoadingOrderLoadUnload.IdLoadingFk" class="form-control select2-loading" asp-items="ViewBag.IdLoadingFk">
<option value="">Izberite naklad ali vnesite naslov naklada</option>
</select> </select>
</div> </div>
</div> </div>
@@ -161,7 +162,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label asp-for="TransportLoadingOrderLoadUnload.LoadingText" class="form-label"></label> <label asp-for="TransportLoadingOrderLoadUnload.LoadingText" class="form-label"></label>
<textarea rows="3" asp-for="TransportLoadingOrderLoadUnload.LoadingText" class="form-control"></textarea> <textarea id="taLoadingText" rows="3" asp-for="TransportLoadingOrderLoadUnload.LoadingText" class="form-control"></textarea>
<span asp-validation-for="TransportLoadingOrderLoadUnload.LoadingText" class="text-danger"></span> <span asp-validation-for="TransportLoadingOrderLoadUnload.LoadingText" class="text-danger"></span>
</div> </div>
</div> </div>
@@ -204,8 +205,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label class="form-label">Razklad</label> <label class="form-label">Razklad</label>
<select asp-for="TransportLoadingOrderLoadUnload.IdUnloadingFk" class="form-control select2" asp-items="ViewBag.IdUnloadingFk"> <select id="selUnloading" asp-for="TransportLoadingOrderLoadUnload.IdUnloadingFk" class="form-control select2-unloading" asp-items="ViewBag.IdUnloadingFk">
<option value="">Izberite razklad ali vnesite naslov razklada</option>
</select> </select>
</div> </div>
</div> </div>
@@ -214,7 +214,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label asp-for="TransportLoadingOrderLoadUnload.UnloadingText" class="form-label"></label> <label asp-for="TransportLoadingOrderLoadUnload.UnloadingText" class="form-label"></label>
<textarea rows="3" asp-for="TransportLoadingOrderLoadUnload.UnloadingText" class="form-control"></textarea> <textarea id="taUnloadingText" rows="3" asp-for="TransportLoadingOrderLoadUnload.UnloadingText" class="form-control"></textarea>
<span asp-validation-for="TransportLoadingOrderLoadUnload.UnloadingText" class="text-danger"></span> <span asp-validation-for="TransportLoadingOrderLoadUnload.UnloadingText" class="text-danger"></span>
</div> </div>
</div> </div>
@@ -279,15 +279,18 @@
</div> </div>
</div> </div>
</div> </div>
<div id="divModalCodetablePartnerAddEditPlaceholder"></div>
<div asp-validation-summary="ModelOnly" class="text-danger"></div> <div asp-validation-summary="ModelOnly" class="text-danger"></div>
@Html.AntiForgeryToken()
@section Scripts { @section Scripts {
@{await Html.RenderPartialAsync("_ValidationScriptsPartial");} @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
<!-- Editor --> <!-- Editor -->
<script src="~/vendor/libs/quill/quill.js" asp-append-version="true"></script> <script src="~/vendor/libs/quill/quill.js" asp-append-version="true"></script>
<script src="~/vendor/libs/select2/select2.js" asp-append-version="true"></script> <script src="~/vendor/libs/select2/select2.js" asp-append-version="true"></script>
<script src="~/js/codeTablePartnerHelper.js?v=1" asp-append-version="true"></script>
<script> <script>
var Block = Quill.import('blots/block'); var Block = Quill.import('blots/block');
@@ -321,7 +324,65 @@
} }
$(document).ready(function () { $(document).ready(function () {
$('.select2').select2(); $('.select2-transporter').select2({
placeholder: 'Izberite prevoznika',
language: {
noResults: function () {
return `<button style="width: 100%" type="button"
class="btn btn-primary"
onClick='addNewCodeTablePartnerTransporter()'>Dodaj novega</button>
</li>`;
}
},
escapeMarkup: function (markup) {
return markup;
}
});
$('.select2-loading').select2({
allowClear: true,
placeholder: 'Izberite naklad ali vnesite naslov naklada',
language: {
noResults: function () {
return `<button style="width: 100%" type="button"
class="btn btn-primary"
onClick='addNewCodeTablePartnerLoading()'>Dodaj novega</button>
</li>`;
}
},
escapeMarkup: function (markup) {
return markup;
}
}).on('change', function () {
if ($(".select2-loading").val() !== '') {
loadLoadingUnloadingText('#taLoadingText', parseInt($(".select2-loading").val()));
} else {
$('#taLoadingText').text('');
}
});;
$('.select2-unloading').select2({
allowClear: true,
placeholder: 'Izberite razklad ali vnesite naslov razklada',
language: {
noResults: function () {
return `<button style="width: 100%" type="button"
class="btn btn-primary"
onClick='addNewCodeTablePartnerUnloading()'>Dodaj novega</button>
</li>`;
}
},
escapeMarkup: function (markup) {
return markup;
}
}).on('change', function() {
if ($(".select2-unloading").val() !== '') {
loadLoadingUnloadingText('#taUnloadingText', parseInt($(".select2-unloading").val()));
} else {
$('#taUnloadingText').text('');
}
});
$('.select2-vehicle').select2({ $('.select2-vehicle').select2({
allowClear: true, allowClear: true,
placeholder: "Izberi vozilo" placeholder: "Izberi vozilo"
@@ -334,6 +395,11 @@
if ($('.select2-vehicle').val() === '') { if ($('.select2-vehicle').val() === '') {
$('.select2-vehicle').val(null); $('.select2-vehicle').val(null);
} }
//Ker tako gre za dodajanje in je lahko prazno
$('.select2-loading').val(null).trigger('change');
$('.select2-unloading').val(null).trigger('change');
editorPreText = new Quill('#editor-pretext', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' }); editorPreText = new Quill('#editor-pretext', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' });
editorPostText = new Quill('#editor-posttext', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' }); editorPostText = new Quill('#editor-posttext', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' });
editorCargoDescription = new Quill('#editor-cargodescription', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' }); editorCargoDescription = new Quill('#editor-cargodescription', { modules: { toolbar: [['bold', 'italic', 'underline'], ['color'], [{ 'list': 'ordered' }, { 'list': 'bullet' }], ['align'], ['clean']] }, theme: 'snow' });
@@ -356,5 +422,77 @@
} }
}; };
function addNewCodeTablePartnerTransporter(){
let title = $(".select2-transporter").data("select2").dropdown.$search.val();
codeTablePartnerAddEdit('#divModalCodetablePartnerAddEditPlaceholder', false, null, (idCodeTablePartner) => {
refreshCodeTablePartners('#selTransporter', idCodeTablePartner, true);
}, null, title, null, null, true);
}
function addNewCodeTablePartnerLoading() {
let title = $(".select2-loading").data("select2").dropdown.$search.val();
codeTablePartnerAddEdit('#divModalCodetablePartnerAddEditPlaceholder', false, null, (idCodeTablePartner) => {
refreshCodeTablePartners('#selLoading', idCodeTablePartner, null, true);
}, null, title, null, null, null, true);
}
function addNewCodeTablePartnerUnloading() {
let title = $(".select2-unloading").data("select2").dropdown.$search.val();
codeTablePartnerAddEdit('#divModalCodetablePartnerAddEditPlaceholder', false, null, (idCodeTablePartner) => {
refreshCodeTablePartners('#selUnloading', idCodeTablePartner, null, true);
}, null, title, null, null, null, true);
}
function refreshCodeTablePartners(selector, idToSelect, transporters, loadingUnloadings) {
$.ajax({
type: "GET",
url: "/CodeTablePartners/Index/?handler=CodeTablePartnersSelect",
data: {
transporters,
loadingUnloadings
},
success: function (data) {
$(selector).empty();
$(data.partners).each(function () {
$(selector).append($("<option></option>").val(this.value).html(this.text));
});
$(selector).val(idToSelect).trigger('change');
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr);
alert(xhr.responseText);
$.unblockUI();
}
});
}
function loadLoadingUnloadingText(selector, idPartner) {
if (isNaN(idPartner) || idPartner <= 0) {
return;
}
$.ajax({
type: "GET",
url: "AddEdit/?handler=LoadingUnloadingText",
data: {
idPartner
},
success: function (data) {
console.log(data);
if (data.successful) {
$(selector).text(data.text);
} else {
Swal.fire('Napaka pri pridobivanju podatkov',
data.error,
'error');
}
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr);
alert(xhr.responseText);
$.unblockUI();
}
});
}
</script> </script>
} }

24
EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml.cs
View File

@@ -44,10 +44,14 @@ namespace EveryThing.Pages.TransportLoadingOrder
{ {
var user = _userManager.GetUserAsync(User).Result; var user = _userManager.GetUserAsync(User).Result;
ViewData["IdPartnerFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title"); ViewData["IdPartnerFk"] = new SelectList(_context.CodeTablePartners
.Where(x => x.IdCompanyFk == user.IdCompanyFk && x.Active && x.Transporter), "IdPartner", "Title");
SetVehiclesBag(user.IdCompanyFk); SetVehiclesBag(user.IdCompanyFk);
ViewData["IdLoadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title"); ViewData["IdLoadingFk"] = new SelectList(_context.CodeTablePartners
ViewData["IdUnloadingFk"] = new SelectList(_context.CodeTablePartners.Where(x => x.IdCompanyFk == user.IdCompanyFk), "IdPartner", "Title"); .Where(x => x.IdCompanyFk == user.IdCompanyFk && x.Active && x.LoadingOrderLoadUnload), "IdPartner", "Title");
ViewData["IdUnloadingFk"] = new SelectList(_context.CodeTablePartners
.Where(x => x.IdCompanyFk == user.IdCompanyFk && x.Active && x.LoadingOrderLoadUnload), "IdPartner", "Title");
ViewData["States"] = new SelectList(Enum.GetValues(typeof(Models.Transport.TransportLoadingOrder.TransportLoadingOrderState)) ViewData["States"] = new SelectList(Enum.GetValues(typeof(Models.Transport.TransportLoadingOrder.TransportLoadingOrderState))
.Cast<Models.Transport.TransportLoadingOrder.TransportLoadingOrderState>() .Cast<Models.Transport.TransportLoadingOrder.TransportLoadingOrderState>()
.Select(x => new { Name = Classes.Global.GetAttribute<DisplayAttribute>(x).Name, Value = x.ToString() }) .Select(x => new { Name = Classes.Global.GetAttribute<DisplayAttribute>(x).Name, Value = x.ToString() })
@@ -218,5 +222,19 @@ namespace EveryThing.Pages.TransportLoadingOrder
Vehicles.AddRange(_context.Vehicles.Where(x => x.IdCompanyFk == idCompany).Select(x => new SelectListItem(x.DisplayName, x.IdVehicle.ToString()))); Vehicles.AddRange(_context.Vehicles.Where(x => x.IdCompanyFk == idCompany).Select(x => new SelectListItem(x.DisplayName, x.IdVehicle.ToString())));
//Vehicles = new SelectList(tmpList, "Text", "Value"); //Vehicles = new SelectList(tmpList, "Text", "Value");
} }
public IActionResult OnGetLoadingUnloadingText(int idPartner)
{
var user = _userManager.GetUserAsync(User).Result;
var partner = _context.CodeTablePartners
.Include(x => x.Country)
.FirstOrDefault(x => x.IdCompanyFk == user.IdCompanyFk
&& x.IdPartner == idPartner);
return partner == null
? new JsonResult(new { successful = false, error = $"Partner with ID: {idPartner} not exists!" })
: new JsonResult(new { successful = true, text = $"{partner.Street} {partner.HouseNumber}\n{partner.PostNumber} {partner.Post}\n{partner.Country.Title}" });
}
} }
} }

17
EveryThing/wwwroot/js/codeTablePartnerHelper.js
View File

@@ -1,9 +1,5 @@
//ce jamra da ne najde post je treba dati @Html.AntiForgeryToken() v page //ce jamra da ne najde post je treba dati @Html.AntiForgeryToken() v page
function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner, onAddEdit, onCancel, codeTablePartnerType){ function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner, onAddEdit, onCancel, title, buyer, supplier, transporter, loadingUnloading){
if (isNaN(codeTablePartnerType)) {
codeTablePartnerType = 0;
}
$.blockUI(); $.blockUI();
$.ajax({ $.ajax({
type: "GET", type: "GET",
@@ -12,7 +8,7 @@ function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner,
// $('input:hidden[name="__RequestVerificationToken"]').val()); // $('input:hidden[name="__RequestVerificationToken"]').val());
// }, // },
url: "/CodeTablePartners/Index/?handler=CodeTablePartnerModal", url: "/CodeTablePartners/Index/?handler=CodeTablePartnerModal",
data: { edit: edit, idCodeTablePartner: edit ? idCodeTablePartner : -1, codeTablePartnerType }, data: { edit: edit, idCodeTablePartner: edit ? idCodeTablePartner : -1, title, buyer, supplier, transporter, loadingUnloading },
success: function(data) { success: function(data) {
$.unblockUI(); $.unblockUI();
$(placeholderSelector).html(data); $(placeholderSelector).html(data);
@@ -43,6 +39,8 @@ function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner,
let buyer = $('#inpModalAddEditCodeTablePartnerBuyer').is(':checked'); let buyer = $('#inpModalAddEditCodeTablePartnerBuyer').is(':checked');
let supplier = $('#inpModalAddEditCodeTablePartnerSupplier').is(':checked'); let supplier = $('#inpModalAddEditCodeTablePartnerSupplier').is(':checked');
let transporter = $('#inpModalAddEditCodeTablePartnerTransporter').is(':checked');
let loadingOrderLoadUnload = $('#inpModalAddEditCodeTablePartnerLoadingOrderLoadUnload').is(':checked');
let active = $('#inpModalAddEditCodeTablePartnerActive').is(':checked'); let active = $('#inpModalAddEditCodeTablePartnerActive').is(':checked');
let edit = $('#inpModalAddEditCodeTablePartnerEdit').val() === 'true'; let edit = $('#inpModalAddEditCodeTablePartnerEdit').val() === 'true';
let idCodeTablePartner = parseInt($('#inpModalAddEditCodeTablePartnerIdCodeTablePartner').val()); let idCodeTablePartner = parseInt($('#inpModalAddEditCodeTablePartnerIdCodeTablePartner').val());
@@ -52,6 +50,11 @@ function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner,
return; return;
} }
if (city === '' || city === null) {
Swal.fire('Zahtevano polje mesto!');
return;
}
// if (description === '' || description === null){ // if (description === '' || description === null){
// Swal.fire('Zahtevano polje naziv!'); // Swal.fire('Zahtevano polje naziv!');
// return; // return;
@@ -79,6 +82,8 @@ function codeTablePartnerAddEdit(placeholderSelector, edit, idCodeTablePartner,
email, email,
buyer, buyer,
supplier, supplier,
transporter,
loadingOrderLoadUnload,
active, active,
idPartner: idCodeTablePartner idPartner: idCodeTablePartner
} }