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

Compare commits

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

2 Commits
8349ce5b41 ... 43efa11d9c

Author SHA1 Message Date
David Štaleker
43efa11d9c ce je project part item na invocu null vrze error 2026-03-12 15:52:05 +01:00
David Štaleker
5d492de137 Opomba 2026-03-12 15:46:27 +01:00
4 changed files with 23 additions and 5 deletions
Expand all files Collapse all files

4
EveryThing/Pages/Invoices/Print.cshtml
View File

@@ -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)

2
EveryThing/Pages/Invoices/Print.cshtml.cs
View File

@@ -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";
@@ -301,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",

10
EveryThing/Pages/Projects/DetailsPartItem.cshtml
View File

@@ -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>

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

@@ -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>