From c23c81e288d10cd3b28f2c7eafa46433b06da6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20=C5=A0taleker?= <david@infosys.si>
Date: Sun, 2 Jul 2023 20:53:16 +0200
Subject: [PATCH] a

---
 EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml    | 1 +
 EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml.cs | 7 +++++++
 EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml b/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml
index c5370d1..c7496c5 100644
--- a/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml
+++ b/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml
@@ -30,6 +30,7 @@
                 <div class="col-4">
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     <input type="hidden" asp-for="@ViewData["Edit"]" name="type"/>
+                    <input type="hidden" asp-for="Vehicle.IdCompanyFk"/>
                     <div class="form-group">
                         <label asp-for="Vehicle.Title" class="control-label"></label>
                         <input asp-for="Vehicle.Title" class="form-control"/>
diff --git a/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml.cs b/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml.cs
index b51340b..0f0187d 100644
--- a/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml.cs
+++ b/EveryThing/Pages/CodeTableVehicles/CreateEdit.cshtml.cs
@@ -50,6 +50,13 @@ namespace EveryThing.Pages.CodeTableVehicles
                     return NotFound();
                 }
             }
+            else
+            {
+                Vehicle = new Vehicle
+                {
+                    IdCompanyFk = user.IdCompanyFk
+                };
+            }
             
             ViewData["VehicleType"] = new SelectList(_context.VehicleTypes
                 .Where(x => x.IdCompanyFk == user.IdCompanyFk && x.Active), "IdVehicleType", "Title");
diff --git a/EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml b/EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml
index 70f8297..612e273 100644
--- a/EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml
+++ b/EveryThing/Pages/TransportLoadingOrder/AddEdit.cshtml
@@ -89,6 +89,10 @@
                         </div>
                     <div class="col-4">
                         <div class="form-group">
+                            <label asp-for="TransportLoadingOrder.IdVehicleFk" class="form-label"></label>
+                                <select asp-for="TransportLoadingOrder.IdVehicleFk" class="form-control select2" asp-items="ViewBag.IdVehicleFk"></select>
+                            <span asp-validation-for="TransportLoadingOrder.IdVehicleFk" class="text-danger"></span>
+
                             <label asp-for="TransportLoadingOrder.VehicleText" class="form-label"></label>
                             <input autocomplete="off" asp-for="TransportLoadingOrder.VehicleText" class="form-control"/>
                             <span asp-validation-for="TransportLoadingOrder.VehicleText" class="text-danger"></span>