david/everything
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: david:43efa11d9c946672fd0cf497d8b3441b8f8582d6
Branches Tags
david:main
..
compare: david:main
Branches Tags
david:main

1 Commits
43efa11d9c ... main

Author SHA1 Message Date
David Štaleker
da7b320032 tiskanje bulk + vrsni red opreacij na tiskanju 2026-03-19 19:31:24 +01:00
3 changed files with 163 additions and 103 deletions
Expand all files Collapse all files

11
EveryThing/Pages/Projects/Edit.cshtml
View File

@@ -752,6 +752,7 @@
<button class="btn btn-secondary" onclick="createOrderSelectPartner(true, 2); return false;">Kreiraj povpraševanje izdelka</button> <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-info" onclick="createCooperationSelectPartner(); return false;">Kreiraj kooperacijo</button>
<button class="btn btn-primary" onclick="createInvoice(); return false;">Kreiraj dobavnico</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>
<div class="col-3 text-right"> <div class="col-3 text-right">
@@ -881,6 +882,16 @@
function tooltips() { function tooltips() {
$('[data-toggle="tooltip"]').tooltip(); $('[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) { function createOrderSelectPartner(inquiry, positionsType) {
$.blockUI(); $.blockUI();
$.ajax({ $.ajax({

191
EveryThing/Pages/Projects/PrintPartItem.cshtml
View File

@@ -39,99 +39,114 @@
</span> </span>
</h4> </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 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"> <div id="print-content" class="card-body pb-4 pl-4 pt-0" style="padding-right: 2rem !important">
<div class="row"> @for (int i = 0; i < Model.Items.Count; i++)
<div class="col-12">
<address class="mb-0">
<strong>@Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.Project.Company.Title)</strong> <br/>
</address>
</div>
</div>
<hr/>
<h4 class="font-weight-bold mb-3">
Projekt št.: @Html.DisplayFor(modelItem => Model.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)
</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>
</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>
</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>
</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>
</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>
</div>
@if (!string.IsNullOrEmpty(Model.PartItem.ProjectPart.PathOfPlans))
{ {
<div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;"> var item = Model.Items[i];
<label style="margin-top: 0 !important; margin-bottom: 0 !important;">Pot načrtov</label>:&nbsp; <div style="@(i > 0 ? "page-break-before: always;" : "")">
<strong class="font-weight-semibold">@Html.DisplayFor(modelItem => Model.PartItem.ProjectPart.PathOfPlans)</strong>
</div> <div class="row">
} <div class="col-12">
<address class="mb-0">
@if (!string.IsNullOrEmpty(Model.PartItem.Note)) <strong>@Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.Company.Title)</strong> <br/>
{ </address>
<div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;"> </div>
<br /> </div>
<i class="">@Html.DisplayFor(modelItem => Model.PartItem.Note)</i>
</div> <hr/>
}
<h4 class="font-weight-bold mb-3">
<br/> Projekt št.: @Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.ProjectNumberFormatted)
</h4>
<h6>Operacije</h6>
<div class="table-responsive mb-4"> <div class="text-big mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
<table class="table m-0 table-bordered"> @Html.DisplayFor(modelItem => item.PartItem.ProjectPart.Project.Title)
<thead style="font-size: 0.75rem"> </div>
<tr>
<th style="width: 30px">#</th> <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
<th class="py-1"> <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Del projekta</label>:&nbsp;
Operacija <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.ProjectPartNumberFormatted)</strong>
</th> </div>
<th class="py-1" style="width: 150px">
Čas <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
</th> <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Artikel</label>:&nbsp;
</tr> <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.Item.Title)</strong>
</thead> </div>
<tbody style="font-size: 0.75rem"> <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
@foreach (var item in Model.Operations) <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Material</label>:&nbsp;
{ <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.Material.Title)</strong>
<tr> </div>
<td> <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
@(Model.Operations.IndexOf(item) + 1) <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Dimenzije surovca</label>:&nbsp;
</td> <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.MaterialDimensions)</strong>
<td>@Html.DisplayFor(x => item.Operation.Title)</td> </div>
<td></td> <div class="mb-3" style="margin-top: 0 !important; margin-bottom: 0 !important;">
</tr> <label style="margin-top: 0 !important; margin-bottom: 0 !important;">Število kosov</label>:&nbsp;
} <strong class="font-weight-semibold">@Html.DisplayFor(modelItem => item.PartItem.NumberOfItems)</strong>
</tbody> </div>
</table>
</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>
<div class="table-responsive mb-4">
<table class="table m-0 table-bordered">
<thead style="font-size: 0.75rem">
<tr>
<th style="width: 30px">#</th>
<th class="py-1">
Operacija
</th>
<th class="py-1" style="width: 150px">
Čas
</th>
</tr>
</thead>
<tbody style="font-size: 0.75rem">
@{ var opIndex = 0; }
@foreach (var op in item.Operations)
{
opIndex++;
<tr>
<td>@opIndex</td>
<td>@Html.DisplayFor(x => op.Operation.Title)</td>
<td></td>
</tr>
}
</tbody>
</table>
</div>
</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>
</div> </div>
@Html.AntiForgeryToken() @Html.AntiForgeryToken()

64
EveryThing/Pages/Projects/PrintPartItem.cshtml.cs
View File

@@ -19,14 +19,18 @@ namespace EveryThing.Pages.Projects
[Authorize(Roles = "Administrator,InvoicingUser,ProjecThingUser")] [Authorize(Roles = "Administrator,InvoicingUser,ProjecThingUser")]
public class PrintPartItem : PageModel public class PrintPartItem : PageModel
{ {
public class PrintPartItemData
{
public ProjectPartItem PartItem { get; set; }
public IList<ProjectPartItemOperation> Operations { get; set; }
}
private readonly ApplicationDbContext _context; private readonly ApplicationDbContext _context;
private readonly UserManager<IdentityApplicationUser> _userManager; private readonly UserManager<IdentityApplicationUser> _userManager;
public ProjectPartItem PartItem { get; set; } public ProjectPartItem PartItem { get; set; }
public IList<ProjectPartItemOperation> Operations { get; set; } public IList<ProjectPartItemOperation> Operations { get; set; }
public IList<PrintPartItemData> Items { get; set; } = new List<PrintPartItemData>();
public PrintPartItem(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager) public PrintPartItem(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager)
{ {
@@ -34,27 +38,57 @@ namespace EveryThing.Pages.Projects
_userManager = userManager; _userManager = userManager;
} }
public async Task<IActionResult> OnGetAsync(int id) public async Task<IActionResult> OnGetAsync(int? id, string ids)
{ {
var user = _userManager.GetUserAsync(User).Result; var user = _userManager.GetUserAsync(User).Result;
PartItem = await _context.ProjectPartItems var itemIds = new List<int>();
.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);
if (PartItem == null) 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(); return NotFound();
var partItems = await _context.ProjectPartItems
Operations = await _context.ProjectPartItemOperations .Include(x => x.ProjectPart)
.Include(x => x.Operation) .ThenInclude(x => x.Project)
.Where(x => x.IdProjectPartItemFk == PartItem.IdProjectPartItem) .ThenInclude(x => x.Company)
.Include(x => x.Material)
.Include(x => x.Item)
.Where(x => itemIds.Contains(x.IdProjectPartItem) && x.ProjectPart.Project.Company.IdCompany == user.IdCompanyFk)
.ToListAsync(); .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(); return Page();
} }