From 7d64e423c3172d484d16da83931081f972c3bfcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0taleker?= Date: Tue, 3 Feb 2026 19:07:52 +0100 Subject: [PATCH] Uvoz, ce je vec projektov da je scroll bar --- EveryThing/Pages/Invoices/Index.cshtml | 174 +++++++++--------- .../Projects/CreatePartItemImportExcel.cshtml | 10 +- .../CreatePartItemImportExcel.cshtml.cs | 42 ++++- .../CreatePartItemUploadExcel.cshtml.cs | 19 +- EveryThing/Pages/Projects/Index.cshtml | 141 +++++++------- .../2e04baca_8781_4d37_bae8_e830ff14be4b.xlsx | Bin 9025 -> 0 bytes .../38e5b032_8b41_472b_ba9d_a10118de6b88.xlsx | Bin 9704 -> 0 bytes .../699d225b_1b85_4de6_9bde_ad6b938be039.xlsx | Bin 8441 -> 0 bytes .../80ed5375_29db_458e_8390_ab7d6410f81e.xlsx | Bin 8441 -> 0 bytes .../ad87a62d_4a6c_4056_9a4d_fb7d49c4e508.xlsx | Bin 12117 -> 0 bytes .../b74e3bd7_096d_4c77_b345_21c3858501ce.xlsx | Bin 9025 -> 0 bytes .../bd061f30_62a4_4dbd_86b0_0fe39d4f199b.xlsx | Bin 9748 -> 0 bytes .../c3ba1a27_8aae_4888_975f_de80ddadaa83.xlsx | Bin 9748 -> 0 bytes .../ff70c602_1568_4468_b13a_e1e7971dea4c.xlsx | Bin 9025 -> 0 bytes 14 files changed, 213 insertions(+), 173 deletions(-) delete mode 100644 EveryThing/wwwroot/Uploads/2e04baca_8781_4d37_bae8_e830ff14be4b.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/38e5b032_8b41_472b_ba9d_a10118de6b88.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/699d225b_1b85_4de6_9bde_ad6b938be039.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/80ed5375_29db_458e_8390_ab7d6410f81e.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/ad87a62d_4a6c_4056_9a4d_fb7d49c4e508.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/b74e3bd7_096d_4c77_b345_21c3858501ce.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/bd061f30_62a4_4dbd_86b0_0fe39d4f199b.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/c3ba1a27_8aae_4888_975f_de80ddadaa83.xlsx delete mode 100644 EveryThing/wwwroot/Uploads/ff70c602_1568_4468_b13a_e1e7971dea4c.xlsx diff --git a/EveryThing/Pages/Invoices/Index.cshtml b/EveryThing/Pages/Invoices/Index.cshtml index 855dc2e..dfebf14 100644 --- a/EveryThing/Pages/Invoices/Index.cshtml +++ b/EveryThing/Pages/Invoices/Index.cshtml @@ -7,6 +7,13 @@ Layout = "~/Pages/Layouts/_Layout.cshtml"; } +@section Styles +{ + +} +

@switch (@ViewData["Type"]) @@ -21,7 +28,7 @@ Dobavnice break; case 3: - Naročila kupcev + Naročila ponudbe/kupcev break; case 4: Kooperacije @@ -34,100 +41,101 @@

-
-
-
- -
- - -
- - -
-
-
-
-
-
- - - +
+
+
+
+ +
+ + +
+ + +
+
+ +
+
+
+
+
- - - - + + + + + + @if (Model.ShowProjects) + { - @if (Model.ShowProjects) - { - - } - - + } + + - @foreach (var item in Model.Invoice) - { - - + @foreach (var item in Model.Invoice) + { + + + + + + @if (Model.ShowProjects) + { - - - @if (Model.ShowProjects) - { - - } - - - } + } + + + }
# - @Html.DisplayNameFor(invoice => invoice.Invoice[0].IdPartnerFk) - - @Html.DisplayNameFor(invoice => invoice.Invoice[0].Date) -
# + @Html.DisplayNameFor(invoice => invoice.Invoice[0].IdPartnerFk) + + @Html.DisplayNameFor(invoice => invoice.Invoice[0].Date) + + @Html.DisplayNameFor(invoice => invoice.Invoice[0].State) + - @Html.DisplayNameFor(invoice => invoice.Invoice[0].State) + Projekti - Projekti -
@Html.DisplayFor(modelItem => item.InvoiceNumberFormatted)
@Html.DisplayFor(modelItem => item.InvoiceNumberFormatted) + @Html.DisplayFor(modelItem => item.Partner.Title) + + @Html.DisplayFor(modelItem => item.Date) + + @switch (item.State) + { + case Invoice.InvoiceState.Closed: + @Html.DisplayFor(modelItem => item.State) + break; + case Invoice.InvoiceState.Confirmed: + @Html.DisplayFor(modelItem => item.State) + break; + default: + @Html.DisplayFor(modelItem => item.State) + break; + } + - @Html.DisplayFor(modelItem => item.Partner.Title) - - @Html.DisplayFor(modelItem => item.Date) - - @switch (item.State) + @if (item.InvoiceInvoiceItem.FirstOrDefault() != null) { - case Invoice.InvoiceState.Closed: - @Html.DisplayFor(modelItem => item.State) - break; - case Invoice.InvoiceState.Confirmed: - @Html.DisplayFor(modelItem => item.State) - break; - default: - @Html.DisplayFor(modelItem => item.State) - break; + @string.Join(" ", item.InvoiceInvoiceItem.Select(x => x.ProjectPartItem?.ProjectPart?.Project?.ProjectNumberFormatted).Distinct()) } - @if (item.InvoiceInvoiceItem.FirstOrDefault() != null) - { - @string.Join(" ", item.InvoiceInvoiceItem.Select(x => x.ProjectPartItem?.ProjectPart?.Project?.ProjectNumberFormatted).Distinct()) - } - - - - - -
+ + + + +
+