From f0e07ebfca0ef744655daf09aab728fa75c88298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C5=A0taleker?= Date: Fri, 18 Jul 2025 10:07:11 +0200 Subject: [PATCH] status, pa material na artikel --- EveryThing/Models/Project/ProjectPartItem.cs | 17 +++++++++++++++++ EveryThing/Pages/Projects/Edit.cshtml.cs | 8 +++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/EveryThing/Models/Project/ProjectPartItem.cs b/EveryThing/Models/Project/ProjectPartItem.cs index 8994b12..045dda6 100644 --- a/EveryThing/Models/Project/ProjectPartItem.cs +++ b/EveryThing/Models/Project/ProjectPartItem.cs @@ -9,17 +9,34 @@ using EveryThing.Models.Invoice; namespace EveryThing.Models.Project { + public class ProjectPartItemStatusAttribute : Attribute + { + public int Order { get; set; } + + public ProjectPartItemStatusAttribute(int order) + { + Order = order; + } + } public enum ProjectPartItemStatus { + [ProjectPartItemStatus(1)] [Display(Name = "Odprto")] Opened = 0, + [ProjectPartItemStatus(2)] [Display(Name = "V izdelavi")] InProduction = 1, + [ProjectPartItemStatus(3)] + [Display(Name = "V koop.")] + InCooperation = 10, + + [ProjectPartItemStatus(4)] [Display(Name = "Zaključeno")] Finished = 2, + [ProjectPartItemStatus(5)] [Display(Name = "Odpremljeno")] Shipped = 3 } diff --git a/EveryThing/Pages/Projects/Edit.cshtml.cs b/EveryThing/Pages/Projects/Edit.cshtml.cs index 59fdc84..28d7d34 100644 --- a/EveryThing/Pages/Projects/Edit.cshtml.cs +++ b/EveryThing/Pages/Projects/Edit.cshtml.cs @@ -242,13 +242,15 @@ namespace EveryThing.Pages.Projects Discount = 0, IdInvoiceFk = idInvoice, IdProjectPartItem = projectPartItem.IdProjectPartItem, - IdItemFk = projectPartItem.IdMaterialFk, - ItemDescription = projectPartItem.MaterialDimensions, + IdItemFk = projectPartItem.IdItemFk, + ItemDescription = "", Note = "", Price = projectPartItem.MaterialPrice, - Quantity = projectPartItem.NumberOfItems + Quantity = projectPartItem.NumberOfItems * projectPartItem.NumberOfSets }; _context.InvoiceItems.Add(newInvoiceItem); + + projectPartItem.Status = ProjectPartItemStatus.InCooperation; } _context.SaveChanges(); }