tiskanje bulk + vrsni red opreacij na tiskanju

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

@@ -173,6 +173,9 @@
                         <th class="py-1 text-right">
                             @Model.Translation.Price
                         </th>
+                            <th class="py-1 text-right">
+                                @Model.Translation.Discount
+                            </th>
                         <th class="py-1 text-right">
                             @Model.Translation.Amount
                         </th>
@@ -222,6 +225,7 @@
                                  || Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.BuyersOrder)
                             {
                                 <td class="text-right">@Html.DisplayFor(x => item.Price)</td>
+                                <td class="text-right">@Html.DisplayFor(x => item.Discount)%</td>
                                 <td class="text-right">@Html.DisplayFor(x => item.TotalValue)</td>
                             }
                             else if (Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.Order)

EveryThing/Pages/Invoices/Print.cshtml.cs

@@ -42,6 +42,7 @@ namespace EveryThing.Pages.Invoices
             public string Article { get; set; } = "Artikel";
             public string Quantity { get; set; } = "Količina";
             public string Price { get; set; } = "Cena";
+            public string Discount { get; set; } = "Rabat";
             public string Amount { get; set; } = "Znesek";
             public string Dimensions { get; set; } = "Dimenzije";
             public string Total { get; set; } = "Skupaj";
@@ -170,10 +171,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
@@ -298,6 +302,7 @@ namespace EveryThing.Pages.Invoices
                         OrderNumber = invoiceState == Invoice.InvoiceState.Offer ? "Anfrage No." : "Bestellnummer",
                         Price = "Preis(€)",
                         Quantity = "Menge(Stk)",
+                        Discount = "Rabatt",
                         SwiftBic = "SWIFT/BIC",
                         Total = "Gesamtsumme",
                         Project = "Projekt",

EveryThing/Pages/Projects/CreateEditPartItem.cshtml

@@ -204,7 +204,7 @@
                         </div>
                     }
 
-                    <table class="table">
+                    <table id="tblOperations" class="table">
                         <thead>
                         <tr>
                             <th class="w-100">Naziv</th>
@@ -477,7 +477,7 @@
                                     <a class="btn btn-xs icon-btn btn-outline-danger borderless" data-state="danger" href="javascript:;" onclick="deleteProjectPartItemOperation(${op.idProjectPartItemOperation}, this);" title="Izbriši"><i class="fas fa-times"></i></a>
                                 </td>
                             </tr>`;
-                            $('table.table tbody').append(row);
+                            $('#tblOperations tbody').append(row);
                             $('#selProjectPartItemOperation option[value="' + op.idCodeTableOperation + '"]').remove();
                         });
                         $('#selProjectPartItemOperation').trigger('change');
@@ -529,7 +529,7 @@
                                 <a class="btn btn-xs icon-btn btn-outline-danger borderless" data-state="danger" href="javascript:;" onclick="deleteProjectPartItemOperation(${id}, this);" title="Izbriši"><i class="fas fa-times"></i></a>
                             </td>
                         </tr>`;
-                        $('table.table tbody').append(row);
+                        $('#tblOperations tbody').append(row);
                         $('#selProjectPartItemOperation option[value="' + idCodeTableOperation + '"]').remove();
                         $('#selProjectPartItemOperation').trigger('change');
                     } else {

EveryThing/Pages/Projects/DetailsPartItem.cshtml

@@ -1,7 +1,11 @@
 @using System.Globalization
 @model EveryThing.Models.Project.ProjectPartItem
 
-<tr data-idpartitem="@Model.IdProjectPartItem" style="cursor: pointer;" ondblclick="if(!$(event.target).closest('a,button,input').length) { $('[data-toggle=tooltip]').tooltip('hide'); $(this).find('.btn-tbl-inline-edit').click(); }">
+@{
+    var hasNote = !string.IsNullOrWhiteSpace(Model.Note);
+}
+
+<tr data-idpartitem="@Model.IdProjectPartItem" class="@(hasNote ? "project-part-item-has-note" : "")" style="cursor: pointer;" ondblclick="if(!$(event.target).closest('a,button,input').length) { $('[data-toggle=tooltip]').tooltip('hide'); $(this).find('.btn-tbl-inline-edit').click(); }">
     <td style="width: 20px;">
         @if(Model.Status != Models.Project.ProjectPartItemStatus.Shipped)
         {
@@ -18,6 +22,10 @@
             @Html.DisplayFor(modelItem => Model.IdItemFk)
         }
         <br/>
+        @if (hasNote)
+        {
+            <i class="fas fa-sticky-note text-warning mr-1" data-toggle="tooltip" data-placement="top" title="@Model.Note"></i>
+        }
         @(Model.ProjectPartNumberFormatted)
     </td>
     <td>
@@ -35,6 +43,20 @@
         <br/>
         @Html.DisplayFor(modelItem => Model.MaterialDimensions)
     </td>
+    <td>
+        @{
+            var ops = Model.ProjectPartItemOperation;
+            var nextOp = ops?.Where(x => !x.Finished).OrderBy(x => x.Order).FirstOrDefault();
+        }
+        @if (ops != null && ops.Any() && nextOp == null)
+        {
+            <span class="badge badge-success"><i class="fas fa-check"></i>&nbsp;Vse zaključeno</span>
+        }
+        else
+        {
+            @(nextOp?.Operation?.Title ?? "")
+        }
+    </td>
     <td class="table-number">
         @(Model.NumberOfItems.ToString("0.00", new CultureInfo("sl-SI")))
         <br/>

EveryThing/Pages/Projects/Edit.cshtml

@@ -13,6 +13,10 @@
         border-top: none;
     }
 
+    .project-part-item-has-note {
+        background-color: #fff8e1;
+    }
+
     .tab-panel-invoices{
         height: 490px;
         overflow-y: auto;
@@ -195,7 +199,7 @@
                                     <tbody>
                                     @foreach (var invoice in Model.Invoices.Where(x => x.Type == Models.Invoice.Invoice.InvoiceType.Order))
                                     {
-                                        <tr class="invoice-row" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem.IdProjectPartFk) ?? Array.Empty<int>())">
+                                        <tr class="invoice-row" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem?.IdProjectPartFk ?? 0) ?? Array.Empty<int>())">
                                             <td>
                                                 @Html.DisplayFor(modelItem => invoice.InvoiceYear) - @Html.DisplayFor(modelItem => invoice.InvoiceNumber)
                                             </td>
@@ -261,7 +265,7 @@
                                         <tbody>
                                             @foreach (var invoice in Model.Invoices.Where(x => x.Type == Models.Invoice.Invoice.InvoiceType.DeliveryNote))
                                             {
-                                                <tr class="invoice-row" data-idinvoice="@invoice.IdInvoice" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem.IdProjectPartFk) ?? Array.Empty<int>())">
+                                                <tr class="invoice-row" data-idinvoice="@invoice.IdInvoice" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem?.IdProjectPartFk ?? 0) ?? Array.Empty<int>())">
                                                     <td style="width: 20px;">
                                                         @if (invoice.State == Invoice.InvoiceState.Confirmed)
                                                         {
@@ -331,7 +335,7 @@
                                         <tbody>
                                             @foreach (var invoice in Model.Invoices.Where(x => x.Type == Models.Invoice.Invoice.InvoiceType.Invoice))
                                             {
-                                                <tr class="invoice-row" data-idinvoice="@invoice.IdInvoice" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem.IdProjectPartFk) ?? Array.Empty<int>())">
+                                                <tr class="invoice-row" data-idinvoice="@invoice.IdInvoice" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem?.IdProjectPartFk ?? 0) ?? Array.Empty<int>())">
                                                     <td>
                                                         @Html.DisplayFor(modelItem => invoice.InvoiceYear) - @Html.DisplayFor(modelItem => invoice.InvoiceNumber)
                                                     </td>
@@ -533,7 +537,7 @@
                                             <tbody>
                                                 @foreach (var invoice in Model.Invoices.Where(x => x.Type == Invoice.InvoiceType.Cooperation))
                                                 {
-                                                <tr class="invoice-row" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem.IdProjectPartFk) ?? Array.Empty<int>())">
+                                                <tr class="invoice-row" data-idparts="@string.Join(",", invoice.InvoiceInvoiceItem?.Select(x => x.ProjectPartItem?.IdProjectPartFk ?? 0) ?? Array.Empty<int>())">
                                                         <td>
                                                             @Html.DisplayFor(modelItem => invoice.InvoiceYear) - @Html.DisplayFor(modelItem => invoice.InvoiceNumber)
                                                         </td>
@@ -644,6 +648,9 @@
                                                     <br/>
                                                     Dimenzije surovca
                                                 </th>
+                                                <th>
+                                                    Naslednja operacija
+                                                </th>
                                                 <th class="table-header-number">
                                                     <div data-toggle="tooltip" data-placement="top" title="Število kosov<br/>Število kompletov" data-html="true">
                                                         Kos
@@ -745,6 +752,7 @@
                             <button class="btn btn-secondary" onclick="createOrderSelectPartner(true, 2); return false;">Kreiraj povpraševanje izdelka</button>
                             <button class="btn btn-info" onclick="createCooperationSelectPartner(); return false;">Kreiraj kooperacijo</button>
                             <button class="btn btn-primary" onclick="createInvoice(); return false;">Kreiraj dobavnico</button>
+                            <button class="btn btn-secondary" onclick="bulkPrintPartItems(); return false;"><i class="ion ion-md-print"></i> Natisni naloge</button>
 
                         </div>
                         <div class="col-3 text-right">
@@ -874,6 +882,16 @@
         function tooltips() {
             $('[data-toggle="tooltip"]').tooltip();
         }
+
+        function bulkPrintPartItems() {
+            let ids = getSelectedPartItems();
+            if (ids.length <= 0) {
+                alert("Izberi pozicije!");
+                return;
+            }
+            window.open('/Projects/PrintPartItem?ids=' + ids.join(','), '_blank');
+        }
+
         function createOrderSelectPartner(inquiry, positionsType) {
             $.blockUI();
             $.ajax({

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);
@@ -641,12 +646,17 @@ namespace EveryThing.Pages.Projects
             {
                     foreach (var projectPartItem in _context.ProjectPartItems.Where(x => x.IdProjectPartFk == projectPart.IdProjectPart).ToList())
                     {
+                        var operations = _context.ProjectPartItemOperations
+                            .Where(x => x.IdProjectPartItemFk == projectPartItem.IdProjectPartItem)
+                            .ToList();
+                        _context.ProjectPartItemOperations.RemoveRange(operations);
                         _context.ProjectPartItems.Remove(projectPartItem);
                     }
                     _context.ProjectParts.Remove(projectPart);
                 _context.SaveChanges();
 
                 projectPart.Project = null;
+                projectPart.ProjectPartProjectPartItem = null;
             }
             else
             {

EveryThing/Pages/Projects/EditPartItem.cshtml

@@ -21,6 +21,7 @@
             </div>
             <input id="inpTblMaterialDimensions_@(Model.Item.IdProjectPartItem.ToString())" asp-for="Item.MaterialDimensions" class="form-control" style="width: 100%"/>
         </td>
+        <td class="table-eddit"></td>
         <td class="table-eddit table-number-edit">
             <input id="inpTblNumberOfItems_@(Model.Item.IdProjectPartItem.ToString())" asp-for="Item.NumberOfItems" class="form-control" style="width: 100%" />
             <input id="inpTblNumberOfSets_@(Model.Item.IdProjectPartItem.ToString())" asp-for="Item.NumberOfSets" class="form-control" style="width: 100%" />

EveryThing/Pages/Projects/PrintPartItem.cshtml

@@ -39,13 +39,28 @@
     </span>
 </h4>
 
+<div class="card pt-2" style="width: 595pt; margin-bottom:10px;">
+    <div class="card-body">
+        <div class="row">
+            <div class="col-12 text-right">
+                <button id="btnPrint" type="button" class="btn btn-sm btn-primary btn-print ladda-button pull-right" data-style="zoom-out"><i class="ion ion-md-print"></i>&nbsp; Natisni</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="card pt-2" style="width: 595pt">
     <div id="print-content" class="card-body pb-4 pl-4 pt-0" style="padding-right: 2rem !important">
 
+        @for (int i = 0; i < Model.Items.Count; i++)
+        {
+            var item = Model.Items[i];
+            <div style="@(i > 0 ? "page-break-before: always;" : "")">
+
                 <div class="row">
                     <div class="col-12">
                         <address class="mb-0">
-                    <strong>@Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.Project.Company.Title)</strong> <br/>
+                            <strong>@Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.Company.Title)</strong> <br/>
                         </address>
                     </div>
                 </div>
@@ -53,35 +68,51 @@
                 <hr/>
 
                 <h4 class="font-weight-bold mb-3">
-            Projekt št.: @Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.Project.ProjectNumberFormatted)
+                    Projekt št.: @Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.ProjectNumberFormatted)
                 </h4>
 
                 <div class="text-big mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
-            @Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.Project.Title)
+                    @Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.Title)
                 </div>
 
                 <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
                     <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Del projekta</label>:&nbsp;
-            <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.ProjectPartNumberFormatted)</strong>
+                    <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.ProjectPartNumberFormatted)</strong>
                 </div>
 
                 <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
                     <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Artikel</label>:&nbsp;
-            <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.Item.Title)</strong>
+                    <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.Item.Title)</strong>
                 </div>
                 <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
                     <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Material</label>:&nbsp;
-            <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.Material.Title)</strong>
+                    <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.Material.Title)</strong>
                 </div>
                 <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
                     <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Dimenzije surovca</label>:&nbsp;
-            <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.MaterialDimensions)</strong>
+                    <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.MaterialDimensions)</strong>
                 </div>
                 <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
                     <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Število kosov</label>:&nbsp;
-            <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.NumberOfItems)</strong>
+                    <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.NumberOfItems)</strong>
                 </div>
 
+                @if (!string.IsNullOrEmpty(item.PartItem.ProjectPart.PathOfPlans))
+                {
+                    <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
+                        <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Pot načrtov</label>:&nbsp;
+                        <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.ProjectPart.PathOfPlans)</strong>
+                    </div>
+                }
+
+                @if (!string.IsNullOrEmpty(item.PartItem.Note))
+                {
+                    <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
+                        <br />
+                        <i class="">@Html.DisplayFor(modelItem => item.PartItem.Note)</i>
+                    </div>
+                }
+
                 <br/>
 
                 <h6>Operacije</h6>
@@ -99,13 +130,13 @@
                         </tr>
                         </thead>
                         <tbody style="font-size: 0.75rem">
-                    @foreach (var item in Model.Operations)
+                            @{ var opIndex = 0; }
+                            @foreach (var op in item.Operations)
                             {
+                                opIndex++;
                                 <tr>
-                            <td>
+                                    <td>@opIndex</td>
-                                @(Model.Operations.IndexOf(item) + 1)
+                                    <td>@Html.DisplayFor(x => op.Operation.Title)</td>
-                            </td>
-                            <td>@Html.DisplayFor(x => item.Operation.Title)</td>
                                     <td></td>
                                 </tr>
                             }
@@ -114,8 +145,8 @@
                 </div>
 
             </div>
-    <div class="card-footer">
+        }
-        <button id="btnPrint" type="button" class="btn btn-primary btn-print ladda-button pull-right" data-style="zoom-out"><i class="ion ion-md-print"></i>&nbsp; Natisni</button>
+
     </div>
 </div>
 @Html.AntiForgeryToken()

EveryThing/Pages/Projects/PrintPartItem.cshtml.cs

@@ -19,14 +19,18 @@ namespace EveryThing.Pages.Projects
     [Authorize(Roles = "Administrator,InvoicingUser,ProjecThingUser")]
     public class PrintPartItem : PageModel
     {
-
+        public class PrintPartItemData
+        {
+            public ProjectPartItem PartItem { get; set; }
+            public IList<ProjectPartItemOperation> Operations { get; set; }
+        }
 
         private readonly ApplicationDbContext _context;
         private readonly UserManager<IdentityApplicationUser> _userManager;
 
         public ProjectPartItem PartItem { get; set; }
-
         public IList<ProjectPartItemOperation> Operations { get; set; }
+        public IList<PrintPartItemData> Items { get; set; } = new List<PrintPartItemData>();
 
         public PrintPartItem(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager)
         {
@@ -34,27 +38,57 @@ namespace EveryThing.Pages.Projects
             _userManager = userManager;
         }
 
-        public async Task<IActionResult> OnGetAsync(int id)
+        public async Task<IActionResult> OnGetAsync(int? id, string ids)
         {
             var user = _userManager.GetUserAsync(User).Result;
 
-            PartItem = await _context.ProjectPartItems
+            var itemIds = new List<int>();
+
+            if (!string.IsNullOrEmpty(ids))
+            {
+                itemIds = ids.Split(',', StringSplitOptions.RemoveEmptyEntries)
+                    .Select(x => int.TryParse(x.Trim(), out var v) ? v : 0)
+                    .Where(x => x > 0)
+                    .ToList();
+            }
+            else if (id.HasValue)
+            {
+                itemIds.Add(id.Value);
+            }
+
+            if (!itemIds.Any())
+                return NotFound();
+
+            var partItems = await _context.ProjectPartItems
                 .Include(x => x.ProjectPart)
                     .ThenInclude(x => x.Project)
                     .ThenInclude(x => x.Company)
                 .Include(x => x.Material)
                 .Include(x => x.Item)
-                .FirstOrDefaultAsync(x => x.IdProjectPartItem == id && x.ProjectPart.Project.Company.IdCompany == user.IdCompanyFk);
+                .Where(x => itemIds.Contains(x.IdProjectPartItem) && x.ProjectPart.Project.Company.IdCompany == user.IdCompanyFk)
-
-            if (PartItem == null)
-                return NotFound();
-
-
-            Operations = await _context.ProjectPartItemOperations
-                .Include(x => x.Operation)
-                .Where(x => x.IdProjectPartItemFk == PartItem.IdProjectPartItem)
                 .ToListAsync();
 
+            if (!partItems.Any())
+                return NotFound();
+
+            var allOperations = await _context.ProjectPartItemOperations
+                .Include(x => x.Operation)
+                .Where(x => itemIds.Contains(x.IdProjectPartItemFk))
+                .OrderBy(x => x.Order)
+                .ToListAsync();
+
+            foreach (var partItem in partItems.OrderBy(x => itemIds.IndexOf(x.IdProjectPartItem)))
+            {
+                Items.Add(new PrintPartItemData
+                {
+                    PartItem = partItem,
+                    Operations = allOperations.Where(x => x.IdProjectPartItemFk == partItem.IdProjectPartItem).ToList()
+                });
+            }
+
+            // Keep backward compatibility for single-item references
+            PartItem = Items.First().PartItem;
+            Operations = Items.First().Operations;
 
             return Page();
         }

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": {