| Naziv |
@@ -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)
+
+ @{
+ 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
+ |
|
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": {
|