From 99d61af1a1c69090bf2725a7f2ac9794325b3d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0taleker?= Date: Wed, 4 Mar 2026 20:19:23 +0100 Subject: [PATCH] tiskanje opombe, poti nacrtov stolpec naslednja operacija, popravljeno brisanje popravljeno da nafila samo privzete operacije in ne vec doda v kooepracije posiljanje dodano skp --- EveryThing/Pages/Invoices/Print.cshtml.cs | 3 +++ .../Pages/Projects/CreateEditPartItem.cshtml | 6 +++--- EveryThing/Pages/Projects/DetailsPartItem.cshtml | 14 ++++++++++++++ EveryThing/Pages/Projects/Edit.cshtml | 3 +++ EveryThing/Pages/Projects/Edit.cshtml.cs | 6 ++++++ EveryThing/Pages/Projects/EditPartItem.cshtml | 1 + EveryThing/Pages/Projects/PrintPartItem.cshtml | 16 ++++++++++++++++ EveryThing/appsettings.json | 3 ++- 8 files changed, 48 insertions(+), 4 deletions(-) diff --git a/EveryThing/Pages/Invoices/Print.cshtml.cs b/EveryThing/Pages/Invoices/Print.cshtml.cs index 5d1d1af..de65249 100644 --- a/EveryThing/Pages/Invoices/Print.cshtml.cs +++ b/EveryThing/Pages/Invoices/Print.cshtml.cs @@ -170,10 +170,13 @@ namespace EveryThing.Pages.Invoices var password = emailSettings["Password"]; var fromEmail = emailSettings["FromEmail"]; var fromName = emailSettings["FromName"]; + var bcc = emailSettings["Bcc"]; var mimeMessage = new MimeMessage(); mimeMessage.From.Add(new MailboxAddress(fromName, fromEmail)); mimeMessage.To.Add(new MailboxAddress(invoice.Partner.Title, invoice.Partner.Email)); + if (!string.IsNullOrWhiteSpace(bcc)) + mimeMessage.Bcc.Add(MailboxAddress.Parse(bcc)); mimeMessage.Subject = invoice.InvoiceNumberFull; var bodyBuilder = new BodyBuilder diff --git a/EveryThing/Pages/Projects/CreateEditPartItem.cshtml b/EveryThing/Pages/Projects/CreateEditPartItem.cshtml index fb31762..83b1140 100644 --- a/EveryThing/Pages/Projects/CreateEditPartItem.cshtml +++ b/EveryThing/Pages/Projects/CreateEditPartItem.cshtml @@ -204,7 +204,7 @@ } - +
@@ -477,7 +477,7 @@ `; - $('table.table tbody').append(row); + $('#tblOperations tbody').append(row); $('#selProjectPartItemOperation option[value="' + op.idCodeTableOperation + '"]').remove(); }); $('#selProjectPartItemOperation').trigger('change'); @@ -529,7 +529,7 @@ `; - $('table.table tbody').append(row); + $('#tblOperations tbody').append(row); $('#selProjectPartItemOperation option[value="' + idCodeTableOperation + '"]').remove(); $('#selProjectPartItemOperation').trigger('change'); } else { diff --git a/EveryThing/Pages/Projects/DetailsPartItem.cshtml b/EveryThing/Pages/Projects/DetailsPartItem.cshtml index 46f777a..48e11ad 100644 --- a/EveryThing/Pages/Projects/DetailsPartItem.cshtml +++ b/EveryThing/Pages/Projects/DetailsPartItem.cshtml @@ -35,6 +35,20 @@
@Html.DisplayFor(modelItem => Model.MaterialDimensions) +
Naziv
+ @{ + var ops = Model.ProjectPartItemOperation; + var nextOp = ops?.Where(x => !x.Finished).OrderBy(x => x.Order).FirstOrDefault(); + } + @if (ops != null && ops.Any() && nextOp == null) + { +  Vse zaključeno + } + else + { + @(nextOp?.Operation?.Title ?? "") + } + @(Model.NumberOfItems.ToString("0.00", new CultureInfo("sl-SI")))
diff --git a/EveryThing/Pages/Projects/Edit.cshtml b/EveryThing/Pages/Projects/Edit.cshtml index 74a5261..7379ed6 100644 --- a/EveryThing/Pages/Projects/Edit.cshtml +++ b/EveryThing/Pages/Projects/Edit.cshtml @@ -644,6 +644,9 @@
Dimenzije surovca + 		+ Naslednja operacija +
Kos diff --git a/EveryThing/Pages/Projects/Edit.cshtml.cs b/EveryThing/Pages/Projects/Edit.cshtml.cs index 122b20a..d366ba5 100644 --- a/EveryThing/Pages/Projects/Edit.cshtml.cs +++ b/EveryThing/Pages/Projects/Edit.cshtml.cs @@ -91,6 +91,9 @@ namespace EveryThing.Pages.Projects .ThenInclude(x => x.Material) .Include(c => c.ProjectPartProjectPartItem) .ThenInclude(x => x.Item) + .Include(c => c.ProjectPartProjectPartItem) + .ThenInclude(x => x.ProjectPartItemOperation) + .ThenInclude(x => x.Operation) .Where(x => x.IdProjectFk == id) .OrderBy(x => x.ProjectPartNumber).ThenBy(x => x.IdProjectPart) .ToListAsync(); @@ -192,6 +195,8 @@ namespace EveryThing.Pages.Projects .Include(x => x.Material) .Include(x => x.ProjectPart) .ThenInclude(x => x.Project) + .Include(x => x.ProjectPartItemOperation) + .ThenInclude(x => x.Operation) .First(x => x.IdProjectPartItem == id); return Partial("DetailsPartItem", item); @@ -647,6 +652,7 @@ namespace EveryThing.Pages.Projects _context.SaveChanges(); projectPart.Project = null; + projectPart.ProjectPartProjectPartItem = null; } else { diff --git a/EveryThing/Pages/Projects/EditPartItem.cshtml b/EveryThing/Pages/Projects/EditPartItem.cshtml index 7840a5e..ece1afb 100644 --- a/EveryThing/Pages/Projects/EditPartItem.cshtml +++ b/EveryThing/Pages/Projects/EditPartItem.cshtml @@ -21,6 +21,7 @@
+ 		diff --git a/EveryThing/Pages/Projects/PrintPartItem.cshtml b/EveryThing/Pages/Projects/PrintPartItem.cshtml index c933b4a..05f6d0b 100644 --- a/EveryThing/Pages/Projects/PrintPartItem.cshtml +++ b/EveryThing/Pages/Projects/PrintPartItem.cshtml @@ -82,6 +82,22 @@ @Html.DisplayFor(modelItem => Model.PartItem.NumberOfItems) + @if (!string.IsNullOrEmpty(Model.PartItem.ProjectPart.PathOfPlans)) + { +
+ :  + @Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.PathOfPlans) +
+ } + + @if (!string.IsNullOrEmpty(Model.PartItem.Note)) + { +
+
+ @Html.DisplayFor(modelItem => Model.PartItem.Note) +
+ } +
Operacije
diff --git a/EveryThing/appsettings.json b/EveryThing/appsettings.json index 8bf7f1f..420c5bb 100644 --- a/EveryThing/appsettings.json +++ b/EveryThing/appsettings.json @@ -9,7 +9,8 @@ "Username": "cnc-paradiz@no-reply.si", "Password": "52svchwokzce#ss", "FromEmail": "cnc-paradiz@no-reply.si", - "FromName": "CNC - Paradiž" + "FromName": "CNC - Paradiž", + "Bcc": "david.staleker@gmail.com" }, "Logging": { "LogLevel": {