import excel na novo z izpiso napak

- Dodatna tabela z operacijami in stanjem (končano/nekončano)
  - šifrant operacij - možnost določevanje privzetih operacij

- Opombe na pozicij dela projekta

- Pogled kooperacij na poziciji dela projekta
  - Izpisano številka kooperacije in kooperant

EveryThing/Data/ApplicationDbContext.cs

@@ -1,4 +1,4 @@
-using System;
+    using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -52,6 +52,8 @@ namespace EveryThing.Data
         public DbSet<CodeTableItem> CodeTableItems { get; set; }
         public DbSet<Invoice> Invoices { get; set; }
         public DbSet<InvoiceItem> InvoiceItems { get; set; }
+        public DbSet<CodeTableOperation> CodeTableOperations { get; set; }
+        public DbSet<ProjectPartItemOperation> ProjectPartItemOperations { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -125,6 +127,20 @@ namespace EveryThing.Data
             modelBuilder.Entity<CodeTableItem>().HasMany(t => t.ItemProjectPartItemMaterial).WithOne(t => t.Material).OnDelete(DeleteBehavior.Restrict);
             modelBuilder.Entity<Invoice>().HasMany(t => t.InvoiceInvoiceItem).WithOne(t => t.Invoice).OnDelete(DeleteBehavior.Restrict);
             modelBuilder.Entity<Project>().HasMany(t => t.Invoices).WithOne(t => t.Project).OnDelete(DeleteBehavior.Restrict);
+
+            modelBuilder.Entity<ProjectPartItemOperation>()
+                .HasOne(t => t.Operation)
+                .WithMany(t => t.ProjectPartItemOperation)
+                .HasForeignKey(t => t.IdCodeTableOperationFk)
+                .OnDelete(DeleteBehavior.Restrict);
+
+            modelBuilder.Entity<ProjectPartItemOperation>()
+                .HasOne(t => t.ProjectPartItem)
+                .WithMany(t => t.ProjectPartItemOperation)
+                .HasForeignKey(t => t.IdProjectPartItemFk)
+                .OnDelete(DeleteBehavior.Restrict);
+
+            //modelBuilder.Entity<CodeTableOperation>().HasMany(t => t.ProjectPartItemOperations).WithMany(t => t.Operation).OnDelete(DeleteBehavior.Restrict);
         }
     }
 }

EveryThing/Migrations/20260228075857_17.cs

@@ -0,0 +1,140 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace EveryThing.Migrations
+{
+    public partial class _17 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Invoices_Projects_ProjectIdProject",
+                table: "Invoices");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Invoices_ProjectIdProject",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "ProjectIdProject",
+                table: "Invoices");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Note",
+                table: "ProjectPartItems",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "CodeTableOperations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    Title = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Default = table.Column<bool>(type: "tinyint(1)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CodeTableOperations", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ProjectPartItemOperations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    IdProjectPartItemFk = table.Column<int>(type: "int", nullable: false),
+                    IdCodeTableOperationFk = table.Column<int>(type: "int", nullable: false),
+                    Finished = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    Order = table.Column<short>(type: "smallint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ProjectPartItemOperations", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ProjectPartItemOperations_CodeTableOperations_IdCodeTableOpe~",
+                        column: x => x.IdCodeTableOperationFk,
+                        principalTable: "CodeTableOperations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_ProjectPartItemOperations_ProjectPartItems_IdProjectPartItem~",
+                        column: x => x.IdProjectPartItemFk,
+                        principalTable: "ProjectPartItems",
+                        principalColumn: "IdProjectPartItem",
+                        onDelete: ReferentialAction.Restrict);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_IdProjectFk",
+                table: "Invoices",
+                column: "IdProjectFk");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectPartItemOperations_IdCodeTableOperationFk",
+                table: "ProjectPartItemOperations",
+                column: "IdCodeTableOperationFk");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectPartItemOperations_IdProjectPartItemFk",
+                table: "ProjectPartItemOperations",
+                column: "IdProjectPartItemFk");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Invoices_Projects_IdProjectFk",
+                table: "Invoices",
+                column: "IdProjectFk",
+                principalTable: "Projects",
+                principalColumn: "IdProject",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Invoices_Projects_IdProjectFk",
+                table: "Invoices");
+
+            migrationBuilder.DropTable(
+                name: "ProjectPartItemOperations");
+
+            migrationBuilder.DropTable(
+                name: "CodeTableOperations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Invoices_IdProjectFk",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "Note",
+                table: "ProjectPartItems");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ProjectIdProject",
+                table: "Invoices",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_ProjectIdProject",
+                table: "Invoices",
+                column: "ProjectIdProject");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Invoices_Projects_ProjectIdProject",
+                table: "Invoices",
+                column: "ProjectIdProject",
+                principalTable: "Projects",
+                principalColumn: "IdProject",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

EveryThing/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -318,6 +318,24 @@ namespace EveryThing.Migrations
                     b.ToTable("CodeTableJobs");
                 });
 
+            modelBuilder.Entity("EveryThing.Models.CodeTable.CodeTableOperation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Default")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CodeTableOperations");
+                });
+
             modelBuilder.Entity("EveryThing.Models.CodeTable.CodeTablePartner", b =>
                 {
                     b.Property<int>("IdPartner")
@@ -713,9 +731,6 @@ namespace EveryThing.Migrations
                     b.Property<string>("PreText")
                         .HasColumnType("longtext");
 
-                    b.Property<int?>("ProjectIdProject")
-                        .HasColumnType("int");
-
                     b.Property<int>("State")
                         .HasColumnType("int");
 
@@ -728,7 +743,7 @@ namespace EveryThing.Migrations
 
                     b.HasIndex("IdPartnerFk");
 
-                    b.HasIndex("ProjectIdProject");
+                    b.HasIndex("IdProjectFk");
 
                     b.ToTable("Invoices");
                 });
@@ -900,6 +915,9 @@ namespace EveryThing.Migrations
                     b.Property<float>("MaterialPrice")
                         .HasColumnType("float");
 
+                    b.Property<string>("Note")
+                        .HasColumnType("longtext");
+
                     b.Property<float>("NumberOfItems")
                         .HasColumnType("float");
 
@@ -937,6 +955,33 @@ namespace EveryThing.Migrations
                     b.ToTable("ProjectPartItems");
                 });
 
+            modelBuilder.Entity("EveryThing.Models.Project.ProjectPartItemOperation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Finished")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("IdCodeTableOperationFk")
+                        .HasColumnType("int");
+
+                    b.Property<int>("IdProjectPartItemFk")
+                        .HasColumnType("int");
+
+                    b.Property<short>("Order")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IdCodeTableOperationFk");
+
+                    b.HasIndex("IdProjectPartItemFk");
+
+                    b.ToTable("ProjectPartItemOperations");
+                });
+
             modelBuilder.Entity("EveryThing.Models.Transport.TransportLoadingOrder", b =>
                 {
                     b.Property<int>("IdTransportLoadingOrder")
@@ -1823,7 +1868,7 @@ namespace EveryThing.Migrations
 
                     b.HasOne("EveryThing.Models.Project.Project", "Project")
                         .WithMany("Invoices")
-                        .HasForeignKey("ProjectIdProject")
+                        .HasForeignKey("IdProjectFk")
                         .OnDelete(DeleteBehavior.Restrict);
 
                     b.Navigation("Company");
@@ -1925,6 +1970,25 @@ namespace EveryThing.Migrations
                     b.Navigation("ProjectPart");
                 });
 
+            modelBuilder.Entity("EveryThing.Models.Project.ProjectPartItemOperation", b =>
+                {
+                    b.HasOne("EveryThing.Models.CodeTable.CodeTableOperation", "Operation")
+                        .WithMany("ProjectPartItemOperation")
+                        .HasForeignKey("IdCodeTableOperationFk")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("EveryThing.Models.Project.ProjectPartItem", "ProjectPartItem")
+                        .WithMany("ProjectPartItemOperation")
+                        .HasForeignKey("IdProjectPartItemFk")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operation");
+
+                    b.Navigation("ProjectPartItem");
+                });
+
             modelBuilder.Entity("EveryThing.Models.Transport.TransportLoadingOrder", b =>
                 {
                     b.HasOne("EveryThing.Models.CodeTable.CodeTableCompany", "Company")
@@ -2354,6 +2418,11 @@ namespace EveryThing.Migrations
                     b.Navigation("JobEmployee");
                 });
 
+            modelBuilder.Entity("EveryThing.Models.CodeTable.CodeTableOperation", b =>
+                {
+                    b.Navigation("ProjectPartItemOperation");
+                });
+
             modelBuilder.Entity("EveryThing.Models.CodeTable.CodeTablePartner", b =>
                 {
                     b.Navigation("Invoice");
@@ -2394,6 +2463,8 @@ namespace EveryThing.Migrations
             modelBuilder.Entity("EveryThing.Models.Project.ProjectPartItem", b =>
                 {
                     b.Navigation("InvoiceItem");
+
+                    b.Navigation("ProjectPartItemOperation");
                 });
 
             modelBuilder.Entity("EveryThing.Models.Transport.TransportLoadingOrder", b =>

EveryThing/Models/CodeTable/CodeTableOperation.cs

@@ -0,0 +1,23 @@
+using EveryThing.Models.Project;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace EveryThing.Models.CodeTable
+{
+    public class CodeTableOperation
+    {
+        [Key]
+        public int Id { get; set; }
+
+        [Required]
+        [Display(Name = "Naziv")]
+        public string Title { get; set; }
+
+        [Display(Name = "Privzeta operacija")]
+        public bool Default { get; set; }
+
+        [InverseProperty("Operation")]
+        public virtual ICollection<ProjectPartItemOperation> ProjectPartItemOperation { get; set; }
+    }
+}

EveryThing/Models/Invoice/Invoice.cs

@@ -77,7 +77,7 @@ namespace EveryThing.Models.Invoice
         [Display(Name = "Partner")]
         public int? IdPartnerFk { get; set; }
 
-        [ForeignKey("Projekt")]
+        [ForeignKey("Project")]
         [Display(Name = "Projekt")]
         public int? IdProjectFk { get; set; }
 
@@ -146,7 +146,7 @@ namespace EveryThing.Models.Invoice
         public CodeTableCompany Company { get; set; }
 
         public CodeTablePartner Partner { get; set; }
-        public Project.Project Project{ get; set; }
+        public Project.Project Project { get; set; }
 
         // InvoicePart
         [InverseProperty("Invoice")]

EveryThing/Models/Project/ProjectPartItem.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using EveryThing.Models.CodeTable;
 using EveryThing.Models.Invoice;
+using JetBrains.Annotations;
 
 namespace EveryThing.Models.Project
 {
@@ -161,6 +162,9 @@ namespace EveryThing.Models.Project
         [Display(Name = "Spremenjeno")]
         public DateTime DateModified { get; set; } = DateTime.Now;
 
+        [Display(Name = "Opomba")]
+        public string Note { get; set; } = "";
+
 
         [Required]
         public int ProjectPartItemNumber { get; set; } = 0;
@@ -177,5 +181,8 @@ namespace EveryThing.Models.Project
         //Invoice item
         [InverseProperty("ProjectPartItem")]
         public virtual ICollection<InvoiceItem> InvoiceItem { get; set; }
+
+        [InverseProperty("ProjectPartItem")]
+        public virtual ICollection<ProjectPartItemOperation> ProjectPartItemOperation { get; set; }
     }
 }

EveryThing/Models/Project/ProjectPartItemOperation.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using EveryThing.Models.CodeTable;
+
+namespace EveryThing.Models.Project
+{
+    public class ProjectPartItemOperation
+    {
+        [Key]
+        public int Id { get; set; }
+
+        [Required]
+        [ForeignKey("ProjectPartItem")]
+        public int IdProjectPartItemFk { get; set; }
+
+        [Required]
+        [ForeignKey("Operation")]
+        public int IdCodeTableOperationFk { get; set; }
+
+        [Required]
+        public bool Finished { get; set; }
+
+        [Required]
+        public short Order { get; set; }
+
+
+        public CodeTableOperation Operation { get; set; }
+        public ProjectPartItem ProjectPartItem { get; set; }
+    }
+}

EveryThing/Pages/CodeTableOperations/AddEditOperationModal.cshtml

@@ -0,0 +1,32 @@
+@model EveryThing.Pages.CodeTableOperations.IndexModel.AddEditCodeTableOperation
+
+<div class="modal" tabindex="-1" role="dialog" id="divModalAddEditCodeTableOperation">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="modalAddEditCodeTableOperationTitle">Dodajanje nove operacije</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <input id="inpModalAddEditCodeTableOperationIdCodeTableOperation" type="hidden" asp-for="@Model.IdCodeTableOperation" />
+                <input id="inpModalAddEditCodeTableOperationEdit" type="hidden" asp-for="@Model.Edit" />
+                <div class="form-group">
+                    <label asp-for="Operation.Title" class="control-label"></label>
+                    <input id="inpModalAddEditCodeTableOperationTitle" asp-for="Operation.Title" class="form-control" />
+                    <span asp-validation-for="Operation.Title" class="text-danger"></span>
+                </div>
+                <div class="form-group form-check">
+                    <label class="form-check-label">
+                        <input id="inpModalAddEditCodeTableOperationDefault" class="form-check-input" asp-for="Operation.Default" /> @Html.DisplayNameFor(model => model.Operation.Default)
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button id="btnModalAddEditCodeTableOperationConfirm" type="button" class="btn btn-primary">Shrani</button>
+                <button id="btnModalAddEditCodeTableOperationCancel" type="button" class="btn btn-secondary">Prekliči</button>
+            </div>
+        </div>
+    </div>
+</div>

EveryThing/Pages/CodeTableOperations/Index.cshtml

@@ -0,0 +1,112 @@
+@page
+@model EveryThing.Pages.CodeTableOperations.IndexModel
+
+@{
+    ViewData["Title"] = "Index";
+    Layout = "~/Pages/Layouts/_Layout.cshtml";
+}
+
+<h4 class="d-flex justify-content-between align-items-center w-100 font-weight-bold py-1 mb-4">
+    <span>
+        <span class="text-muted font-weight-light">Operacije /</span> Pregled
+    </span>
+</h4>
+
+<div class="row">
+    <div class="col-12 mb-2 text-right">
+        <form method="get">
+            <div class="btn-group">
+                <input class="form-control" type="text" name="searchString" value="@ViewData["SearchString"]" placeholder="Iskanje..." autocomplete="off">
+                <button id="btnSubmit" type="submit" class="btn btn-secondary" aria-label="Osveži" title="Osveži">
+                    <i class="opacity-75 ion ion-md-refresh"></i>
+                </button>
+                <div class="btn-group" title="Columns">
+                    <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-label="Nastavitve" title="Nastavitve">
+                        <i class="opacity-75 ion ion-md-apps"></i>
+                        <span class="caret"></span>
+                    </button>
+@*                    <div class="dropdown-menu dropdown-menu-right">
+                        <label class="dropdown-item">
+                            <input type="checkbox" name="finishedProjects" @ViewData["FinishedProjects"]> <span>Aktivni artikli</span>
+                        </label>
+                    </div>*@
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+<div class="card">
+
+    <h6 class="card-header">
+        Seznam operacij
+    </h6>
+
+    <table class="table">
+        <thead>
+            <tr>
+                <th class="w-100">
+                    @Html.DisplayNameFor(model => model.Operation[0].Title)
+                </th>
+                <th class="text-right" style="white-space: nowrap; width: 1%;">
+                    @Html.DisplayNameFor(model => model.Operation[0].Default)
+                </th>
+                <th class="text-right" style="white-space: nowrap; width: 1%;"></th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model.Operation)
+            {
+                <tr data-idCodeTableOperation="@item.Id">
+                    <td>
+                        @Html.DisplayFor(modelItem => item.Title)
+                    </td>
+                    <td class="text-right" style="white-space: nowrap; width: 1%;">
+                        @Html.DisplayFor(modelItem => item.Default)
+                    </td>
+                    <td class="text-right" style="white-space: nowrap; width: 1%;">
+                        <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="editCodeTableOperation(this);" data-toggle="tooltip" data-placement="top" title="Urejanje" data-state="secondary"><i class="fas fa-pencil-alt"></i></a>
+                        <a class="btn btn-xs icon-btn btn-outline-danger borderless" data-state="danger" href='javascript:;' onclick="deleteCodeTableOperation(this)"><i class="fas fa-times"></i></a>
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+
+    <div class="card-footer py-3 text-right">
+        <button type="button" class="btn btn-primary" onclick="addNewCodeTableOperation();" >Vnos operacije</button>
+    </div>
+    <div id="divModalCodeTableOperationAddEditPlaceholder"></div>
+</div>
+@Html.AntiForgeryToken()
+
+@section Scripts {
+    <script src="~/js/codeTableOperationHelper.js" asp-append-version="true"></script>
+
+    <script>
+        $('[data-toggle="tooltip"]').tooltip({container: 'table'});
+
+        function addNewCodeTableOperation() {
+            codeTableOperationAddEdit('#divModalCodeTableOperationAddEditPlaceholder', false, null, (idCodeTableOperation) => {
+                document.getElementById('btnSubmit').click();
+            });
+        }
+
+        function editCodeTableOperation(element) {
+            let idCodeTableOperation = parseInt($(element).parent().parent().attr('data-idCodeTableOperation'));
+
+            codeTableOperationAddEdit('#divModalCodeTableOperationAddEditPlaceholder', true, idCodeTableOperation, (idCodeTableOperation) => {
+                document.getElementById('btnSubmit').click();
+            });
+        }
+
+        function deleteCodeTableOperation(element) {
+            let row = $(element).parent().parent();
+            let idCodeTableOperation = parseInt(row.attr('data-idCodeTableOperation'));
+
+            codeTableOperationDelete(idCodeTableOperation, (idCodeTableOperation) => {
+                row.remove();
+            });
+        }
+    </script>
+}

EveryThing/Pages/CodeTableOperations/Index.cshtml.cs

@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.EntityFrameworkCore;
+using EveryThing.Data;
+using EveryThing.Models;
+using EveryThing.Models.CodeTable;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.VisualStudio.Debugger.Contracts;
+using System.Globalization;
+
+namespace EveryThing.Pages.CodeTableOperations
+{
+    [Authorize(Roles = "Administrator,InvoicingUser,ProjecThingUser")]
+    public class IndexModel : PageModel
+    {
+        public class AddEditCodeTableOperation
+        {
+            public CodeTableOperation Operation { get; set; }
+            public bool Edit { get; set; }
+            public int IdCodeTableOperation { get; set; }
+        }
+
+        private readonly ApplicationDbContext _context;
+        private readonly UserManager<IdentityApplicationUser> _userManager;
+        private readonly SignInManager<IdentityApplicationUser> _loginManager;
+        private readonly RoleManager<IdentityApplicationRole> _roleManager;
+
+        public IndexModel(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager, SignInManager<IdentityApplicationUser> loginManager, RoleManager<IdentityApplicationRole> roleManager)
+        {
+            _context = context;
+            _userManager = userManager;
+            _loginManager = loginManager;
+            _roleManager = roleManager;
+        }
+
+        public IList<CodeTableOperation> Operation { get; set; }
+
+        public async Task OnGetAsync(string searchString)
+        {
+            var user = _userManager.GetUserAsync(User).Result;
+
+            ViewData["SearchString"] = searchString ?? "";
+
+            var search = !string.IsNullOrEmpty(searchString);
+            var query = _context.CodeTableOperations.AsQueryable();
+
+            if (search)
+            {
+                query = query.Where(x => EF.Functions.Like(x.Title, $"%{searchString}%"));
+            }
+
+            Operation = await query
+                .OrderByDescending(x => x.Id)
+                .Take(100)
+                .ToListAsync();
+        }
+
+        public IActionResult OnGetCodeTableOperationModal(bool edit, int idCodeTableOperation)
+        {
+            CodeTableOperation operation = null;
+
+            if (edit)
+            {
+                operation = _context.CodeTableOperations
+                    .FirstOrDefault(x => x.Id == idCodeTableOperation);
+            }
+
+            operation ??= new CodeTableOperation();
+
+            return Partial("AddEditOperationModal", new AddEditCodeTableOperation
+            {
+                Operation = operation,
+                Edit = edit,
+                IdCodeTableOperation = idCodeTableOperation
+            });
+        }
+
+        public IActionResult OnPostCodeTableOperation(string title, bool defaultValue, bool edit, int idCodeTableOperation)
+        {
+            var successful = true;
+            var error = "";
+
+            if (edit)
+            {
+                var operation = _context.CodeTableOperations
+                    .FirstOrDefault(x => x.Id == idCodeTableOperation);
+
+                if (operation != null)
+                {
+                    operation.Title = title;
+                    operation.Default = defaultValue;
+
+                    _context.SaveChanges();
+                }
+                else
+                {
+                    successful = false;
+                    error = $"Code-table operation with ID: {idCodeTableOperation} not found";
+                }
+            }
+            else
+            {
+                var operation = new CodeTableOperation
+                {
+                    Title = title,
+                    Default = defaultValue
+                };
+                _context.CodeTableOperations.Add(operation);
+                _context.SaveChanges();
+
+                idCodeTableOperation = operation.Id;
+            }
+
+            return new JsonResult(new { idCodeTableOperation, error, successful });
+        }
+
+        public IActionResult OnGetCodeTableOperation(int idCodeTableOperation)
+        {
+            var successful = true;
+            var error = "";
+            var inUse = false;
+
+            var operation = _context.CodeTableOperations
+                .Include(x => x.ProjectPartItemOperation)
+                .FirstOrDefault(x => x.Id == idCodeTableOperation);
+
+            if (operation == null)
+            {
+                successful = false;
+                error = $"Code-table operation with ID: {idCodeTableOperation} not found";
+            }
+            else
+            {
+                inUse = operation.ProjectPartItemOperation != null && operation.ProjectPartItemOperation.Count > 0;
+                operation.ProjectPartItemOperation = null;
+            }
+
+            return new JsonResult(new { operation, error, successful, inUse });
+        }
+
+        public IActionResult OnDeleteCodeTableOperation(int idCodeTableOperation)
+        {
+            var successful = true;
+            var error = "";
+
+            var operation = _context.CodeTableOperations
+                .FirstOrDefault(x => x.Id == idCodeTableOperation);
+
+            if (operation != null)
+            {
+                _context.CodeTableOperations.Remove(operation);
+                _context.SaveChanges();
+            }
+            else
+            {
+                successful = false;
+                error = $"Code-table operation with ID: {idCodeTableOperation} not found";
+            }
+
+            return new JsonResult(new { idCodeTableOperation, error, successful });
+        }
+    }
+}

EveryThing/Pages/Layouts/Partials/_LayoutSidenav.cshtml

@@ -74,50 +74,12 @@
                 <a asp-page="/Invoices/Index" asp-route-type="4" class="sidenav-link"><i class="sidenav-icon fas fa-hands-helping"></i><div>Kooperacije </div></a>
             </li>
         }
-        @*<li class="sidenav-item">
-            <a asp-page="/Index" class="sidenav-link"><i class="sidenav-icon fas fa-ruler"></i><div>Planiranje</div></a>
-        </li>
-        
-        <li class="sidenav-item">
-            <a asp-page="/Index" class="sidenav-link"><i class="sidenav-icon fas fa-dolly"></i><div>Prevoznice</div></a>
-        </li>*@
-
-        @*<li class="sidenav-divider mb-1"></li>
-        <li class="sidenav-header small font-weight-semibold">VOZNI PARK</li>
-        
-        <li class="sidenav-item">
-            <a asp-page="/Index" class="sidenav-link"><i class="sidenav-icon fas fa-wrench"></i><div>Delovni nalogi</div></a>
-        </li>
-
-        <li class="sidenav-item">
-            <a asp-page="/Index" class="sidenav-link"><i class="sidenav-icon fas fa-cogs"></i><div>Servisi</div></a>
-        </li>
-
-        <li class="sidenav-item">
-            <a asp-page="/Index" class="sidenav-link"><i class="sidenav-icon fas fa-tasks"></i><div>Pregledi</div></a>
-        </li>
-        
-        <li class="sidenav-item@(currentPage.StartsWith("/Management/Issues/") ? " active" : "")">
-            <a asp-page="/Management/Issues/Index" class="sidenav-link"><i class="sidenav-icon fas fa-exclamation-triangle"></i><div>Napake</div></a>
-        </li>
-
-        <li class="sidenav-item@(currentPage.StartsWith("/Vehicle/VehicleFueling/") ? " active" : "")">
-            <a asp-page="/Vehicle/VehicleFueling/Index" class="sidenav-link"><i class="sidenav-icon fas fa-gas-pump"></i><div>Gorivo</div></a>
-        </li>*@
 
         @if (User.IsInRole("Administrator") || User.IsInRole("ProjecThingUser") || User.IsInRole("InvoicingUser") || User.IsInRole("TransportThingUser"))
         {
             <li class="sidenav-divider mb-1"></li>
             <li class="sidenav-header small font-weight-semibold">ŠIFRANTI</li>
 
-            @*<li class="sidenav-item@(currentPage.StartsWith("/CodeTableEmployees/") ? " active" : "")">
-                <a asp-page="/CodeTableEmployees/Index" class="sidenav-link"><i class="sidenav-icon fas fa-users"></i><div>Zaposleni</div></a>
-            </li>*@
-
-            @*<li class="sidenav-item@(currentPage.StartsWith("/CodeTables/Vehicles/") ? " active" : "")">
-                <a asp-page="/Employees/Index" class="sidenav-link"><i class="sidenav-icon fas fa-truck"></i><div>Vozni park</div></a>
-            </li>*@
-            
             <li class="sidenav-item@(currentPage.StartsWith("/CodeTablePartners/") ? " active" : "")">
                 <a asp-page="/CodeTablePartners/Index" class="sidenav-link"><i class="sidenav-icon fas fa-handshake"></i><div>Partnerji</div></a>
             </li>
@@ -126,6 +88,9 @@
                 <li class="sidenav-item@(currentPage.StartsWith("/CodeTableItems/") ? " active" : "")">
                     <a asp-page="/CodeTableItems/Index" class="sidenav-link"><i class="sidenav-icon fas fa-box"></i><div>Artikli</div></a>
                 </li>
+                <li class="sidenav-item@(currentPage.StartsWith("/CodeTableOperations/") ? " active" : "")">
+                    <a asp-page="/CodeTableOperations/Index" class="sidenav-link"><i class="sidenav-icon fas fa-wrench"></i><div>Operacije</div></a>
+                </li>
             }
             @if (User.IsInRole("Administrator") || User.IsInRole("TransportThingUser"))
             {

EveryThing/Pages/Projects/CreateEditPartItem.cshtml

@@ -46,9 +46,11 @@
                         <div class="col-12">
                             <div class="form-group">
                                 <label asp-for="ProjectPartItem.IdItemFk" class="form-label"></label>
-                                <div class="form-row">
+                                <div class="form-row align-items-end">
-                                    <div class="col-12">
+                                    <div class="col">
                                         <select id="selCodeTableItem" asp-for="ProjectPartItem.IdItemFk" class="form-control select2" asp-items="ViewBag.IdItemFk"></select>
+                                    </div>
+                                    <div class="col-auto">
                                         <button class="btn btn-success" type="button" onclick="copyDataFromLastPartItem();">Napolni prejšnje</button>
                                         <button class="btn btn-primary" type="button" onclick="addNewCodeTableItem();">Novi artikel</button>
                                     </div>
@@ -76,11 +78,11 @@
                         <div class="col-12">
                             <div class="form-group">
                                 <label asp-for="ProjectPartItem.IdMaterialFk" class="form-label"></label>
-                                <div class="form-row">
+                                <div class="form-row align-items-end">
-                                    <div class="col-9">
+                                    <div class="col">
                                         <select id="selCodeTableItemMaterial" asp-for="ProjectPartItem.IdMaterialFk" class="form-control select2" asp-items="ViewBag.IdMaterialFk"></select>
                                     </div>
-                                    <div class="col-3">
+                                    <div class="col-auto">
                                         <button class="btn btn-primary" type="button" onclick="addNewCodeTableItemMaterial();">Novi material</button>
                                     </div>
                                 </div>
@@ -153,18 +155,112 @@
                             </div>
                         </div>
                     </div>
+                    
+                    <div class="row">
+                        <div class="col-12">
+                            <div class="form-group">
+                                <label asp-for="ProjectPartItem.Note" class="form-label"></label>
+                                <textarea asp-for="ProjectPartItem.Note" class="form-control" rows="3"></textarea>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="card-footer py-3 text-right">
+                <div class="card-footer py-3 d-flex justify-content-between">
+                    <div>
+                        <a class="btn btn-outline-primary" asp-page="PrintPartItem" asp-route-id="@Model.ProjectPartItem.IdProjectPartItem" data-toggle="tooltip" data-placement="top" title="Tiskanje" data-state="primary"><i class="ion ion-md-print"></i>&nbsp;Natisni</a>
+                    </div>
+                    <div>
+                        @if (ViewData["Edit"] != null && (bool)ViewData["Edit"])
+                        {
+                            <button type="submit" class="btn btn-primary">Shrani</button>
+                        }
+                        else
+                        {
+                            <button type="submit" class="btn btn-primary">Dodaj pozicijo dela projekta</button>
+                        }
+
+                        <a asp-page="Edit" asp-route-id="@ViewBag.IdProject" class="btn btn-default">Prekliči</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-6">
+            <div class="card">
+                <h6 class="card-header">
+                    Operacije
+                </h6>
+                <div class="card-body">
                     @if (ViewData["Edit"] != null && (bool)ViewData["Edit"])
                     {
-                        <button type="submit" class="btn btn-primary">Shrani</button>
+                        <div class="form-row align-items-end mb-3">
-                    }
+                            <div class="col">
-                    else
+                                <label class="form-label" for="selProjectPartItemOperation">Naziv</label>
-                    {
+                                <select id="selProjectPartItemOperation" class="form-control select2" asp-items="ViewBag.IdCodeTableOperationFk"></select>
-                        <button type="submit" class="btn btn-primary">Dodaj del projekta</button>
+                            </div>
+                            <div class="col-auto">
+                                <button type="button" class="btn btn-primary" onclick="addProjectPartItemOperation();">Dodaj</button>
+                                <button type="button" class="btn btn-success" onclick="addDefaultOperations();">Dodaj privzete</button>
+                            </div>
+                        </div>
                     }
 
-                    <a asp-page="Edit" asp-route-id="@ViewBag.IdProject" class="btn btn-default">Prekliči</a>
+                    <table class="table">
+                        <thead>
+                        <tr>
+                            <th class="w-100">Naziv</th>
+                            <th class="text-right" style="white-space: nowrap; width: 1%;">Končano</th>
+                            <th class="text-right" style="white-space: nowrap; width: 1%;"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach (var operation in Model.ProjectPartItemOperations)
+                        {
+                            <tr data-id="@operation.Id" data-id-code-table-operation="@operation.IdCodeTableOperationFk">
+                                <td>
+                                    @Html.DisplayFor(modelItem => operation.Operation.Title)
+                                </td>
+                                <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                    <input type="checkbox" @(operation.Finished ? "checked" : "") onchange="toggleOperationFinished(@operation.Id, this);" />
+                                </td>
+                                <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                    <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(@operation.Id, 'up', this);" title="Gor"><i class="fas fa-arrow-up"></i></a>
+                                    <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(@operation.Id, 'down', this);" title="Dol"><i class="fas fa-arrow-down"></i></a>
+                                    <a class="btn btn-xs icon-btn btn-outline-danger borderless" data-state="danger" href="javascript:;" onclick="deleteProjectPartItemOperation(@operation.Id, this);" title="Izbriši"><i class="fas fa-times"></i></a>
+                                </td>
+                            </tr>
+                        }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            
+            <div class="card">
+                <h6 class="card-header">
+                    Kooperacije
+                </h6>
+                <div class="card-body">
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th style="white-space: nowrap; width: 1%;">Številka</th>
+                                <th>Partner</th>
+                                <th style="white-space: nowrap; width: 1%;"></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var item in Model.CooperationInvoiceItems)
+                            {
+                                <tr>
+                                    <td style="white-space: nowrap;">@item.Invoice.InvoiceNumberFormatted</td>
+                                    <td>@item.Invoice.Partner?.Title</td>
+                                    <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                        <a class="btn btn-xs icon-btn btn-outline-primary borderless" asp-page="/Invoices/Print" asp-route-id="@item.Invoice.IdInvoice" data-toggle="tooltip" data-placement="top" title="Tiskanje" data-state="primary"><i class="ion ion-md-print"></i></a>
+                                        <a class="btn btn-xs icon-btn btn-outline-secondary borderless" asp-page="/Invoices/Edit" asp-route-id="@item.Invoice.IdInvoice" data-toggle="tooltip" data-placement="top" title="Urejanje" data-state="secondary"><i class="fas fa-pencil-alt"></i></a>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
@@ -246,5 +342,209 @@
             location.replace(`CreateEditPartItem?idProjectPartItem=${idProjectPartItem}&idProject=${idProject}&idProjectPart=${idProjectPart}&edit=${edit}&idArticleCopyFrom=${idArticle}`);
         }
 
+        function moveOperation(idProjectPartItemOperation, direction, element) {
+            let row = $(element).closest('tr');
+            $.ajax({
+                type: "POST",
+                beforeSend: function(xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreateEditPartItem/?handler=MoveOperation",
+                data: {
+                    idProjectPartItemOperation,
+                    direction
+                },
+                success: function(data) {
+                    if (data.successful) {
+                        if (direction === 'up') {
+                            let prev = row.prev('tr');
+                            if (prev.length) {
+                                row.insertBefore(prev);
+                            }
+                        } else {
+                            let next = row.next('tr');
+                            if (next.length) {
+                                row.insertAfter(next);
+                            }
+                        }
+                    }
+                },
+                error: function(xhr, ajaxOptions, thrownError) {
+                    console.log(xhr);
+                    alert(xhr.responseText);
+                }
+            });
+        }
+
+        function toggleOperationFinished(idProjectPartItemOperation, checkbox) {
+            $.ajax({
+                type: "POST",
+                beforeSend: function(xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreateEditPartItem/?handler=ToggleProjectPartItemOperationFinished",
+                data: {
+                    idProjectPartItemOperation
+                },
+                success: function(data) {
+                    if (!data.successful) {
+                        Swal.fire('Napaka pri posodabljanju operacije', data.error, 'error');
+                        checkbox.checked = !checkbox.checked;
+                    }
+                },
+                error: function(xhr, ajaxOptions, thrownError) {
+                    console.log(xhr);
+                    alert(xhr.responseText);
+                    checkbox.checked = !checkbox.checked;
+                }
+            });
+        }
+
+        function deleteProjectPartItemOperation(idProjectPartItemOperation, element) {
+            let row = $(element).closest('tr');
+            Swal.fire({
+                title: 'Izbrišem operacijo?',
+                text: "Tega dejanja ni možno razveljaviti!",
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Da, izbriši!',
+                cancelButtonText: 'Prekliči!'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    $.ajax({
+                        type: "DELETE",
+                        beforeSend: function(xhr) {
+                            xhr.setRequestHeader("XSRF-TOKEN",
+                                $('input:hidden[name="__RequestVerificationToken"]').val());
+                        },
+                        url: "CreateEditPartItem/?handler=ProjectPartItemOperation",
+                        data: {
+                            idProjectPartItemOperation
+                        },
+                        success: function(data) {
+                            if (data.successful) {
+                                let operationName = row.find('td:first').text().trim();
+                                let operationId = row.data('idCodeTableOperation');
+                                $('#selProjectPartItemOperation').append($('<option></option>').val(operationId).html(operationName));
+                                row.remove();
+                                $('#selProjectPartItemOperation').trigger('change');
+                            } else {
+                                Swal.fire('Napaka pri brisanju operacije', data.error, 'error');
+                            }
+                        },
+                        error: function(xhr, ajaxOptions, thrownError) {
+                            console.log(xhr);
+                            alert(xhr.responseText);
+                        }
+                    });
+                }
+            });
+        }
+
+        function addDefaultOperations() {
+            let idProjectPartItem = parseInt($('#ProjectPartItem_IdProjectPartItem').val());
+            if (isNaN(idProjectPartItem)) {
+                return;
+            }
+
+            $.blockUI();
+            $.ajax({
+                type: "POST",
+                beforeSend: function(xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreateEditPartItem/?handler=AddDefaultOperations",
+                data: {
+                    idProjectPartItem
+                },
+                success: function(data) {
+                    $.unblockUI();
+                    if (data.successful) {
+                        $.each(data.operations, function(i, op) {
+                            let row = `<tr data-id="${op.idProjectPartItemOperation}" data-id-code-table-operation="${op.idCodeTableOperation}">
+                                <td>${op.title}</td>
+                                <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                    <input type="checkbox" onchange="toggleOperationFinished(${op.idProjectPartItemOperation}, this);" />
+                                </td>
+                                <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                    <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(${op.idProjectPartItemOperation}, 'up', this);" title="Gor"><i class="fas fa-arrow-up"></i></a>
+                                    <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(${op.idProjectPartItemOperation}, 'down', this);" title="Dol"><i class="fas fa-arrow-down"></i></a>
+                                    <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);
+                            $('#selProjectPartItemOperation option[value="' + op.idCodeTableOperation + '"]').remove();
+                        });
+                        $('#selProjectPartItemOperation').trigger('change');
+                    } else {
+                        Swal.fire('Napaka pri dodajanju privzetih operacij', data.error, 'error');
+                    }
+                },
+                error: function(xhr, ajaxOptions, thrownError) {
+                    console.log(xhr);
+                    alert(xhr.responseText);
+                    $.unblockUI();
+                }
+            });
+        }
+
+        function addProjectPartItemOperation() {
+            let idProjectPartItem = parseInt($('#ProjectPartItem_IdProjectPartItem').val());
+            let idCodeTableOperation = parseInt($('#selProjectPartItemOperation').val());
+
+            if (isNaN(idProjectPartItem) || isNaN(idCodeTableOperation)) {
+                Swal.fire('Izberite operacijo.');
+                return;
+            }
+
+            $.blockUI();
+            $.ajax({
+                type: "POST",
+                beforeSend: function(xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreateEditPartItem/?handler=ProjectPartItemOperation",
+                data: {
+                    idProjectPartItem,
+                    idCodeTableOperation
+                },
+                success: function(data) {
+                    $.unblockUI();
+                    if (data.successful){
+                        let id = data.idProjectPartItemOperation;
+                        let row = `<tr data-id="${id}" data-id-code-table-operation="${idCodeTableOperation}">
+                            <td>${data.title}</td>
+                            <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                <input type="checkbox" onchange="toggleOperationFinished(${id}, this);" />
+                            </td>
+                            <td class="text-right" style="white-space: nowrap; width: 1%;">
+                                <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(${id}, 'up', this);" title="Gor"><i class="fas fa-arrow-up"></i></a>
+                                <a class="btn btn-xs icon-btn btn-outline-secondary borderless" href="javascript:;" onclick="moveOperation(${id}, 'down', this);" title="Dol"><i class="fas fa-arrow-down"></i></a>
+                                <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);
+                        $('#selProjectPartItemOperation option[value="' + idCodeTableOperation + '"]').remove();
+                        $('#selProjectPartItemOperation').trigger('change');
+                    } else {
+                        Swal.fire('Napaka pri dodajanju operacije',
+                        data.error,
+                        'error');
+                    }
+                },
+                error: function(xhr, ajaxOptions, thrownError) {
+                    console.log(xhr);
+                    alert(xhr.responseText);
+                    $.unblockUI();
+                }
+            });
+        }
+
     </script>
 }

EveryThing/Pages/Projects/CreateEditPartItem.cshtml.cs

@@ -11,6 +11,7 @@ using EveryThing.Data;
 using EveryThing.Models;
 using EveryThing.Models.CodeTable;
 using EveryThing.Models.Project;
+using EveryThing.Models.Invoice;
 using Microsoft.EntityFrameworkCore;
 
 namespace EveryThing.Pages.Projects
@@ -46,6 +47,8 @@ namespace EveryThing.Pages.Projects
             ViewData["IdMaterialSupplierFk"] = new SelectList(_context.CodeTablePartners
                 .Where(x => x.IdCompanyFk == user.IdCompanyFk && x.Active && x.Supplier)
                 .OrderBy(x => x.Title), "IdPartner", "Title");
+            ViewData["IdCodeTableOperationFk"] = new SelectList(_context.CodeTableOperations
+                .OrderBy(x => x.Title), "Id", "Title");
 
             ViewData["Edit"] = edit;
 
@@ -60,6 +63,24 @@ namespace EveryThing.Pages.Projects
                 {
                     return NotFound();
                 }
+
+                ProjectPartItemOperations = _context.ProjectPartItemOperations
+                    .Include(x => x.Operation)
+                    .Where(x => x.IdProjectPartItemFk == ProjectPartItem.IdProjectPartItem)
+                    .OrderBy(x => x.Order)
+                    .ToList();
+
+                var usedOperationIds = ProjectPartItemOperations.Select(x => x.IdCodeTableOperationFk).ToList();
+                ViewData["IdCodeTableOperationFk"] = new SelectList(_context.CodeTableOperations
+                    .Where(x => !usedOperationIds.Contains(x.Id))
+                    .OrderBy(x => x.Title), "Id", "Title");
+
+                CooperationInvoiceItems = _context.InvoiceItems
+                    .Include(x => x.Invoice)
+                        .ThenInclude(x => x.Partner)
+                    .Where(x => x.IdProjectPartItem == ProjectPartItem.IdProjectPartItem
+                                && x.Invoice.Type == Invoice.InvoiceType.Cooperation)
+                    .ToList();
             }
             else
             {
@@ -68,6 +89,8 @@ namespace EveryThing.Pages.Projects
                     NumberOfSets = 1,
                     IdProjectPartFk = idProjectPart
                 };
+                ProjectPartItemOperations = new List<ProjectPartItemOperation>();
+                CooperationInvoiceItems = new List<InvoiceItem>();
             }
 
             if (idArticleCopyFrom != null)
@@ -101,6 +124,10 @@ namespace EveryThing.Pages.Projects
         [BindProperty]
         public int IdProject { get; set; }
 
+        public IList<ProjectPartItemOperation> ProjectPartItemOperations { get; set; }
+
+        public IList<InvoiceItem> CooperationInvoiceItems { get; set; }
+
         public async Task<IActionResult> OnPostAsync(bool edit)
         {
             if (!ModelState.IsValid)
@@ -158,5 +185,149 @@ namespace EveryThing.Pages.Projects
 
             return new JsonResult(new { items = items });
         }
+
+        public IActionResult OnPostProjectPartItemOperation(int idProjectPartItem, int idCodeTableOperation)
+        {
+            var maxOrder = _context.ProjectPartItemOperations
+                .Where(x => x.IdProjectPartItemFk == idProjectPartItem)
+                .Select(x => (short?)x.Order)
+                .Max() ?? 0;
+
+            var operation = new ProjectPartItemOperation
+            {
+                IdProjectPartItemFk = idProjectPartItem,
+                IdCodeTableOperationFk = idCodeTableOperation,
+                Finished = false,
+                Order = (short)(maxOrder + 1)
+            };
+
+            _context.ProjectPartItemOperations.Add(operation);
+            _context.SaveChanges();
+
+            var title = _context.CodeTableOperations
+                .Where(x => x.Id == idCodeTableOperation)
+                .Select(x => x.Title)
+                .FirstOrDefault();
+
+            return new JsonResult(new { successful = true, idProjectPartItemOperation = operation.Id, title });
+        }
+
+        public IActionResult OnPostToggleProjectPartItemOperationFinished(int idProjectPartItemOperation)
+        {
+            var successful = true;
+            var error = "";
+
+            var operation = _context.ProjectPartItemOperations
+                .FirstOrDefault(x => x.Id == idProjectPartItemOperation);
+
+            if (operation != null)
+            {
+                operation.Finished = !operation.Finished;
+                _context.SaveChanges();
+            }
+            else
+            {
+                successful = false;
+                error = $"Operation with ID: {idProjectPartItemOperation} not found";
+            }
+
+            return new JsonResult(new { successful, error, finished = operation?.Finished });
+        }
+
+        public IActionResult OnDeleteProjectPartItemOperation(int idProjectPartItemOperation)
+        {
+            var successful = true;
+            var error = "";
+
+            var operation = _context.ProjectPartItemOperations
+                .FirstOrDefault(x => x.Id == idProjectPartItemOperation);
+
+            if (operation != null)
+            {
+                _context.ProjectPartItemOperations.Remove(operation);
+                _context.SaveChanges();
+            }
+            else
+            {
+                successful = false;
+                error = $"Operation with ID: {idProjectPartItemOperation} not found";
+            }
+
+            return new JsonResult(new { successful, error, idProjectPartItemOperation });
+        }
+
+        public IActionResult OnPostAddDefaultOperations(int idProjectPartItem)
+        {
+            var existingOperationIds = _context.ProjectPartItemOperations
+                .Where(x => x.IdProjectPartItemFk == idProjectPartItem)
+                .Select(x => x.IdCodeTableOperationFk)
+                .ToList();
+
+            var defaultOperations = _context.CodeTableOperations
+                .Where(x => x.Default && !existingOperationIds.Contains(x.Id))
+                .OrderBy(x => x.Title)
+                .ToList();
+
+            var added = new List<object>();
+
+            var maxOrder = _context.ProjectPartItemOperations
+                .Where(x => x.IdProjectPartItemFk == idProjectPartItem)
+                .Select(x => (short?)x.Order)
+                .Max() ?? 0;
+
+            foreach (var op in defaultOperations)
+            {
+                maxOrder++;
+                var newOp = new ProjectPartItemOperation
+                {
+                    IdProjectPartItemFk = idProjectPartItem,
+                    IdCodeTableOperationFk = op.Id,
+                    Finished = false,
+                    Order = maxOrder
+                };
+                _context.ProjectPartItemOperations.Add(newOp);
+                _context.SaveChanges();
+
+                added.Add(new { idProjectPartItemOperation = newOp.Id, idCodeTableOperation = op.Id, title = op.Title });
+            }
+
+            return new JsonResult(new { successful = true, operations = added });
+        }
+
+        public IActionResult OnPostMoveOperation(int idProjectPartItemOperation, string direction)
+        {
+            var operation = _context.ProjectPartItemOperations
+                .FirstOrDefault(x => x.Id == idProjectPartItemOperation);
+
+            if (operation == null)
+                return new JsonResult(new { successful = false, error = "Operation not found" });
+
+            ProjectPartItemOperation neighbor;
+
+            if (direction == "up")
+            {
+                neighbor = _context.ProjectPartItemOperations
+                    .Where(x => x.IdProjectPartItemFk == operation.IdProjectPartItemFk && x.Order < operation.Order)
+                    .OrderByDescending(x => x.Order)
+                    .FirstOrDefault();
+            }
+            else
+            {
+                neighbor = _context.ProjectPartItemOperations
+                    .Where(x => x.IdProjectPartItemFk == operation.IdProjectPartItemFk && x.Order > operation.Order)
+                    .OrderBy(x => x.Order)
+                    .FirstOrDefault();
+            }
+
+            if (neighbor == null)
+                return new JsonResult(new { successful = true });
+
+            var temp = operation.Order;
+            operation.Order = neighbor.Order;
+            neighbor.Order = temp;
+            _context.SaveChanges();
+
+            return new JsonResult(new { successful = true });
+        }
     }
 }

EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml

@@ -7,65 +7,200 @@
     Layout = "~/Pages/Layouts/_Layout.cshtml";
 }
 
-<form method="post">
+<h4 class="d-flex justify-content-between align-items-center w-100 font-weight-bold py-1 mb-4">
+    <span>
+        <span class="text-muted font-weight-light">Projekt /</span> Uvoz pozicij dela projekta
+    </span>
+</h4>
 
-    <h4 class="d-flex justify-content-between align-items-center w-100 font-weight-bold py-1 mb-4">
+<div class="row">
-        <span>
+    <div class="col-6">
-            <span class="text-muted font-weight-light">Projekt /</span> Uvoz pozicij dela projekta
+        <div class="card">
-        </span>
+            <!-- Step 1: Upload -->
-    </h4>
+            <div id="step-upload">
-
-    <div class="row">
-        <div class="col-6">
-            <div class="card">
                 <h6 class="card-header">
-                    Povezovanje @Model.FileName z pozicijo
+                    Podatki pozicije
                 </h6>
                 <div class="card-body">
-                    <input type="hidden" asp-for="IdProjectPart" />
-                    <input type="hidden" asp-for="IdProject" />
-                    <input type="hidden" asp-for="FileName" />
-                    <input type="hidden" asp-for="SelectedItems" name="selectedItems" class="inp-selected-items" />
                     <div class="row">
                         <div class="col-12">
-                        @{
+                            <div class="form-group">
-                            foreach (var item in Model.ExcelItems)
+                                <input type="file" id="fileInput" name="postedFiles" />
-                            {
+                            </div>
-                                <div class="form-group">
-                                    <label class="control-label">@item.Name</label>
-                                    <select data-index="@item.CellIndex" class="form-control select-item" asp-items="ViewBag.ProjectPartItems"></select>
-                                </div>
-                            }
-                        }
                         </div>
                     </div>
                 </div>
                 <div class="card-footer py-3 text-right">
-                    <button type="submit" class="btn btn-primary" onclick="prepareData(); return true;">Potrdi</button>
+                    <button type="button" id="btnUpload" class="btn btn-primary">Naloži excel</button>
-                    <a asp-page="Edit" asp-route-id="IdProject" class="btn btn-default">Prekliči</a>
+                    <a asp-page="Edit" asp-route-id="@Model.IdProject" class="btn btn-default">Prekliči</a>
+                </div>
+            </div>
+
+            <!-- Step 2: Mapping -->
+            <div id="step-mapping" style="display: none;">
+                <h6 class="card-header">
+                    Povezovanje <span id="mappingFileName"></span> z pozicijo
+                </h6>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-12" id="mappingFields">
+                        </div>
+                    </div>
+                </div>
+                <div class="card-footer py-3 text-right">
+                    <button type="button" id="btnImport" class="btn btn-primary">Potrdi</button>
+                    <a asp-page="Edit" asp-route-id="@Model.IdProject" class="btn btn-default">Prekliči</a>
                 </div>
             </div>
         </div>
     </div>
+    <div class="col-6">
+        <div id="validation-errors" style="display: none;">
+            <div class="card border-danger">
+                <h6 class="card-header bg-danger text-white">Napake pri uvozu</h6>
+                <div class="card-body p-0">
+                    <table class="table table-sm table-bordered m-0">
+                        <thead>
+                            <tr>
+                                <th>Vrstica</th>
+                                <th>Polje</th>
+                                <th>Vrednost</th>
+                                <th>Napaka</th>
+                            </tr>
+                        </thead>
+                        <tbody id="validation-errors-body">
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+@Html.AntiForgeryToken()
-
-</form>
 
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 
     <script type="text/javascript">
-        function prepareData(){
+        var uploadedFileName = '';
-            let data = "";
+
-            $('.select-item').each(function(index, element) {
+        $('#btnUpload').click(function () {
-                let value = $(element).val();
+            var fileInput = document.getElementById('fileInput');
-                if (value !== '') {
+            if (fileInput.files.length === 0) {
-                    let dataIndex = $(element).attr("data-index");
+                Swal.fire('Izberite datoteko.');
-                    data += `${dataIndex};${value}#`;
+                return;
+            }
+
+            var formData = new FormData();
+            formData.append('postedFiles', fileInput.files[0]);
+            formData.append('idProject', '@Model.IdProject');
+            formData.append('idProjectPart', '@Model.IdProjectPart');
+
+            $.blockUI();
+            $.ajax({
+                type: "POST",
+                beforeSend: function (xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreatePartItemImportExcel?handler=Upload",
+                data: formData,
+                processData: false,
+                contentType: false,
+                success: function (data) {
+                    $.unblockUI();
+                    if (data.successful) {
+                        uploadedFileName = data.fileName;
+                        $('#mappingFileName').text(data.fileName);
+
+                        var container = $('#mappingFields');
+                        container.empty();
+
+                        $.each(data.excelItems, function (i, item) {
+                            var group = $('<div class="form-group"></div>');
+                            group.append('<label class="control-label">' + item.name + '</label>');
+
+                            var select = $('<select class="form-control select-item" data-index="' + item.cellIndex + '"></select>');
+                            select.append('<option value="">Ni izbrano</option>');
+                            $.each(data.mappingOptions, function (j, opt) {
+                                select.append('<option value="' + opt.name + '">' + opt.display + '</option>');
+                            });
+
+                            group.append(select);
+                            container.append(group);
+                        });
+
+                        $('#step-upload').hide();
+                        $('#step-mapping').show();
+                    } else {
+                        Swal.fire('Napaka', data.error, 'error');
+                    }
+                },
+                error: function (xhr) {
+                    $.unblockUI();
+                    console.log(xhr);
+                    alert(xhr.responseText);
                 }
             });
-            $('.inp-selected-items').val(data);
+        });
-        }
+
+        $('#btnImport').click(function () {
+            var data = "";
+            $('.select-item').each(function (index, element) {
+                var value = $(element).val();
+                if (value !== '') {
+                    var dataIndex = $(element).attr("data-index");
+                    data += dataIndex + ";" + value + "#";
+                }
+            });
+
+            if (data === '') {
+                Swal.fire('Izberite vsaj eno polje.');
+                return;
+            }
+
+            $.blockUI();
+            $.ajax({
+                type: "POST",
+                beforeSend: function (xhr) {
+                    xhr.setRequestHeader("XSRF-TOKEN",
+                        $('input:hidden[name="__RequestVerificationToken"]').val());
+                },
+                url: "CreatePartItemImportExcel?handler=Import",
+                data: {
+                    selectedItems: data,
+                    fileName: uploadedFileName,
+                    idProjectPart: '@Model.IdProjectPart',
+                    idProject: '@Model.IdProject'
+                },
+                success: function (data) {
+                    $.unblockUI();
+                    if (data.successful) {
+                        window.location.href = data.redirectUrl;
+                    } else if (data.validationErrors && data.validationErrors.length > 0) {
+                        var tbody = $('#validation-errors-body');
+                        tbody.empty();
+                        $.each(data.validationErrors, function (i, err) {
+                            tbody.append('<tr>' +
+                                '<td>' + err.row + '</td>' +
+                                '<td>' + err.property + '</td>' +
+                                '<td><code>' + (err.value || '') + '</code></td>' +
+                                '<td class="text-danger">' + err.message + '</td>' +
+                            '</tr>');
+                        });
+                        $('#validation-errors').show();
+                        Swal.fire('Napaka pri uvozu', 'Podatki vsebujejo ' + data.validationErrors.length + ' napak. Preglejte tabelo napak.', 'error');
+                    } else {
+                        Swal.fire('Napaka', data.error, 'error');
+                    }
+                },
+                error: function (xhr) {
+                    $.unblockUI();
+                    console.log(xhr);
+                    alert(xhr.responseText);
+                }
+            });
+        });
     </script>
 }

EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml.cs

@@ -48,31 +48,48 @@ namespace EveryThing.Pages.Projects
         public string SelectedItems { get; set; }
 
 
-        public IActionResult OnGet(int idProject, int idProjectPart, string fileName)
+        public IActionResult OnGet(int idProject, int idProjectPart)
         {
-            var user = _userManager.GetUserAsync(User).Result;
-
             IdProject = idProject;
             IdProjectPart = idProjectPart;
-            FileName = fileName;
-
-            var tmpList = typeof(Models.Project.ProjectPartItem).GetProperties()
-                .Where(x => x.GetCustomAttributes(true).Length > 0 && x.GetCustomAttributes(true).Any(y => y.GetType() == typeof(System.ComponentModel.DataAnnotations.DisplayAttribute)))
-                .Select(x => new
-                {
-                    Name = x.Name,
-                    Display = ((System.ComponentModel.DataAnnotations.DisplayAttribute)x.GetCustomAttributes(true).First(y => y.GetType() == typeof(System.ComponentModel.DataAnnotations.DisplayAttribute))).Name
-                }).ToList();
-            tmpList.Insert(0, new { Name = "", Display = "Ni izbrano" });
-
-            ViewData["ProjectPartItems"] = new SelectList(tmpList, "Name", "Display");
-
             ExcelItems = new List<ExcelItem>();
-            var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport", fileName);
 
-            var xlWorkbook = new XLWorkbook(path);
+            return Page();
+        }
 
-            //ONLY FIRST LIST
+        public async Task<IActionResult> OnPostUpload(int idProject, int idProjectPart, List<IFormFile> postedFiles)
+        {
+            if (postedFiles == null 
+                || postedFiles.Count != 1)
+            {
+                return new JsonResult(new { successful = false, error = "Izberite eno datoteko." });
+            }
+            var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport");
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+            else
+            {
+                //Pocistimo mapo
+                foreach (var fileInfo in new DirectoryInfo(path).GetFiles("*.*"))
+                {
+                    fileInfo.Delete();
+                }
+            }
+
+            var postedFile = postedFiles[0];
+
+            var fileName = postedFile.FileName;
+            await using (var stream = new FileStream(Path.Combine(path, fileName), FileMode.Create))
+            {
+                await postedFile.CopyToAsync(stream);
+            }
+
+            // Read excel headers
+            var excelItems = new List<ExcelItem>();
+            var filePath = Path.Combine(path, fileName);
+            var xlWorkbook = new XLWorkbook(filePath);
             var worksheet = xlWorkbook.Worksheet(1);
 
             int i = 1;
@@ -82,26 +99,36 @@ namespace EveryThing.Pages.Projects
                 int j = 1;
                 while (!row.Cell(j).IsEmpty())
                 {
-                    var cellData = row.Cell(j).Value;
+                    excelItems.Add(new ExcelItem
-
-                    ExcelItems.Add(new ExcelItem
                     {
                         CellIndex = j,
-                        Name = cellData.ToString(),
+                        Name = row.Cell(j).Value.ToString(),
                     });
-                    
                     j++;
                 }
             }
 
-            return Page();
+            // Build mapping options
+            var mappingOptions = typeof(Models.Project.ProjectPartItem).GetProperties()
+                .Where(x => x.GetCustomAttributes(true).Length > 0 && x.GetCustomAttributes(true).Any(y => y.GetType() == typeof(System.ComponentModel.DataAnnotations.DisplayAttribute)))
+                .Select(x => new
+                {
+                    name = x.Name,
+                    display = ((System.ComponentModel.DataAnnotations.DisplayAttribute)x.GetCustomAttributes(true).First(y => y.GetType() == typeof(System.ComponentModel.DataAnnotations.DisplayAttribute))).Name
+                }).ToList();
+
+            return new JsonResult(new { successful = true, fileName, excelItems, mappingOptions });
         }
 
-        public async Task<IActionResult> OnPostAsync(string selectedItems)
+        public async Task<IActionResult> OnPostImport(string selectedItems, string fileName, int idProjectPart, int idProject)
         {
-            if (selectedItems == "")
+            FileName = fileName;
+            IdProjectPart = idProjectPart;
+            IdProject = idProject;
+
+            if (string.IsNullOrEmpty(selectedItems))
             {
-                return Page(); //TODO Error
+                return new JsonResult(new { successful = false, error = "Izberite vsaj eno polje." });
             }
             var user = _userManager.GetUserAsync(User).Result;
 
@@ -128,6 +155,73 @@ namespace EveryThing.Pages.Projects
             //ONLY FIRST LIST
             var worksheet = xlWorkbook.Worksheet(1);
 
+            // Build display name lookup for properties
+            var propertyDisplayNames = typeof(Models.Project.ProjectPartItem).GetProperties()
+                .Where(x => x.GetCustomAttributes(true).Any(y => y is System.ComponentModel.DataAnnotations.DisplayAttribute))
+                .ToDictionary(
+                    x => x.Name,
+                    x => ((System.ComponentModel.DataAnnotations.DisplayAttribute)x.GetCustomAttributes(true).First(y => y is System.ComponentModel.DataAnnotations.DisplayAttribute)).Name
+                );
+
+            // Validation pass - check all rows before importing
+            var errors = new List<object>();
+            int validationRow = 2; // Skip header
+            while (!worksheet.Row(validationRow).IsEmpty())
+            {
+                IXLRow row = worksheet.Row(validationRow);
+
+                // Check if all mapped cells in the row are empty
+                bool allEmpty = excelItems.All(ei =>
+                    row.Cell(ei.CellIndex) == null || string.IsNullOrWhiteSpace(row.Cell(ei.CellIndex).Value.ToString()));
+
+                if (allEmpty)
+                {
+                    errors.Add(new { row = validationRow, property = "-", value = "", message = "Vsa polja v vrstici so prazna." });
+                    validationRow++;
+                    continue;
+                }
+
+                foreach (var excelItem in excelItems)
+                {
+                    if (row.Cell(excelItem.CellIndex) == null)
+                        continue;
+
+                    string value = row.Cell(excelItem.CellIndex).Value.ToString();
+                    string displayName = propertyDisplayNames.ContainsKey(excelItem.Name) ? propertyDisplayNames[excelItem.Name] : excelItem.Name;
+
+                    // Empty individual cells are allowed - skip validation
+                    if (string.IsNullOrWhiteSpace(value))
+                        continue;
+
+                    if (excelItem.Name is "IdItemFk" or "IdMaterialFk" or "IdMaterialSupplierFk")
+                    {
+                        // These are text lookups, no type conversion needed
+                        continue;
+                    }
+
+                    // Validate type conversion for other properties
+                    var propertyInfo = typeof(Models.Project.ProjectPartItem).GetProperties().FirstOrDefault(x => x.Name == excelItem.Name);
+                    if (propertyInfo != null)
+                    {
+                        try
+                        {
+                            var targetType = Nullable.GetUnderlyingType(propertyInfo.PropertyType) ?? propertyInfo.PropertyType;
+                            Convert.ChangeType(value, targetType);
+                        }
+                        catch
+                        {
+                            errors.Add(new { row = validationRow, property = displayName, value, message = $"Ni mogoče pretvoriti v tip {propertyInfo.PropertyType.Name}." });
+                        }
+                    }
+                }
+                validationRow++;
+            }
+
+            if (errors.Count > 0)
+            {
+                return new JsonResult(new { successful = false, validationErrors = errors });
+            }
+
             var insertedParts = _context.ProjectPartItems.Where(x => x.IdProjectPartFk == IdProjectPart);
 
             var currentPositionNumber = insertedParts.Any()
@@ -158,6 +252,9 @@ namespace EveryThing.Pages.Projects
 
                     string value = row.Cell(excelItem.CellIndex).Value.ToString();
 
+                    if (string.IsNullOrWhiteSpace(value))
+                        continue;
+
                     if (excelItem.Name is "IdItemFk" or "IdMaterialFk")
                     {
                         var completableItem = _context.CodeTableItems.FirstOrDefault(x => x.Title == value && x.Active == true);
@@ -218,7 +315,7 @@ namespace EveryThing.Pages.Projects
 
             System.IO.File.Delete(path);
 
-            return RedirectToPage("./Edit", new {id = IdProject});
+            return new JsonResult(new { successful = true, redirectUrl = Url.Page("./Edit", new { id = IdProject }) });
         }
 
         public class ExcelItem

EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml

@@ -1,50 +0,0 @@
-@page
-@using EveryThing.Models.Project
-@model EveryThing.Pages.Projects.CreatePartItemUploadExcelModel
-
-@{
-    ViewData["Title"] = "Uvoz pozicij dela projekta";
-    Layout = "~/Pages/Layouts/_Layout.cshtml";
-}
-
-<form method="post" enctype="multipart/form-data">
-
-    <h4 class="d-flex justify-content-between align-items-center w-100 font-weight-bold py-1 mb-4">
-        <span>
-            <span class="text-muted font-weight-light">Projekt /</span> Uvoz pozicij dela projekta
-        </span>
-    </h4>
-
-    <div class="row">
-        <div class="col-6">
-            <div class="card">
-                <h6 class="card-header">
-                    Podatki pozicije
-                </h6>
-                <div class="card-body">
-                    <input type="hidden" asp-for="IdProjectPart" name="idProjectPart" />
-                    <input type="hidden" asp-for="IdProject" name="idProject"/>
-                    <div class="row">
-                        <div class="col-12">
-                            <div class="form-group">
-                                <input type="file" name="postedFiles" multiple/>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="card-footer py-3 text-right">
-                    <input type="submit" class="btn btn-primary" value="Naloži excel" asp-page-handler="Upload" />
-                    <a asp-page="Edit" asp-route-id="IdProject" class="btn btn-default">Prekliči</a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-
-</form>
-
-@section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}

EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml.cs

@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using EveryThing.Data;
-using EveryThing.Models;
-using EveryThing.Models.Project;
-using Microsoft.AspNetCore.Http;
-using System.IO;
-using Microsoft.AspNetCore.Hosting;
-
-namespace EveryThing.Pages.Projects
-{
-    [Authorize(Roles = "Administrator,ProjecThingUser")]
-    public class CreatePartItemUploadExcelModel : PageModel
-    {
-        private readonly IWebHostEnvironment _hostingEnvironment;
-        private readonly ApplicationDbContext _context;
-        private readonly UserManager<IdentityApplicationUser> _userManager;
-        private readonly SignInManager<IdentityApplicationUser> _loginManager;
-        private readonly RoleManager<IdentityApplicationRole> _roleManager;
-
-        public CreatePartItemUploadExcelModel(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager, SignInManager<IdentityApplicationUser> loginManager, RoleManager<IdentityApplicationRole> roleManager, IWebHostEnvironment environment)
-        {
-            _context = context;
-            _userManager = userManager;
-            _loginManager = loginManager;
-            _roleManager = roleManager;
-            _hostingEnvironment = environment;
-        }
-
-
-        [BindProperty]
-        public IFormFile File { get; set; }
-        [BindProperty]
-        public int IdProject { get; set; }
-        [BindProperty]
-        public int IdProjectPart { get; set; }
-
-
-        public IActionResult OnGet(int idProject, int idProjectPart)
-        {
-            var user = _userManager.GetUserAsync(User).Result;
-
-            IdProject = idProject;
-            IdProjectPart = idProjectPart;
-
-
-            return Page();
-        }
-
-        //public async Task<IActionResult> OnPostAsync()
-        //{
-        //    if (!ModelState.IsValid)
-        //    {
-        //        return Page();
-        //    }
-        //    string uploads = Path.Combine(_hostingEnvironment.WebRootPath, "uploads");
-
-        //    if (File.Length > 0)
-        //    {
-        //        string filePath = Path.Combine(uploads, File.FileName);
-        //        using (Stream fileStream = new FileStream(filePath, FileMode.Create))
-        //        {
-        //            await File.CopyToAsync(fileStream);
-        //        }
-        //    }
-
-        //    return RedirectToPage("./Edit");
-        //}
-
-        //public async Task<IActionResult> OnPostUploadAsync(List<IFormFile> files)
-        //{
-        //    long size = files.Sum(f => f.Length);
-
-        //    foreach (var formFile in files)
-        //    {
-        //        if (formFile.Length > 0)
-        //        {
-        //            var filePath = Path.GetTempFileName();
-        //            System.Diagnostics.Debug.WriteLine(filePath);
-        //            using (var stream = System.IO.File.Create(filePath))
-        //            {
-        //                await formFile.CopyToAsync(stream);
-        //            }
-        //        }
-        //    }
-
-        //    // Process uploaded files
-        //    // Don't rely on or trust the FileName property without validation.
-
-        //    return RedirectToPage("./Edit");
-        //}
-
-        public async Task<IActionResult> OnPostUpload(int idProject, int idProjectPart, List<IFormFile> postedFiles)
-        {
-            if (postedFiles == null 
-                || postedFiles.Count != 1)
-            {
-                return Page();//TODO return error
-            }
-            var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport");
-            if (!Directory.Exists(path))
-            {
-                Directory.CreateDirectory(path);
-            }
-            else
-            {
-                //Pocistimo mapo
-                foreach (var fileInfo in new DirectoryInfo(path).GetFiles("*.*"))
-                {
-                    fileInfo.Delete();
-                }
-            }
-
-            var postedFile = postedFiles[0];
-
-            var fileName = postedFile.FileName;//Guid.NewGuid().ToString().Replace("-", "_") + Path.GetExtension(postedFile.FileName);
-            await using (var stream = new FileStream(Path.Combine(path, fileName), FileMode.Create))
-            {
-                await postedFile.CopyToAsync(stream);
-            }
-            return RedirectToPage("./CreatePartItemImportExcel", new { idProject = idProject, idProjectPart = idProjectPart, fileName = fileName});
-        }
-    }
-}

EveryThing/Pages/Projects/Edit.cshtml

@@ -614,6 +614,7 @@
                                     }
                                     
                                     <div style="float: right">
+                                            <input type="text" class="form-control form-control-sm d-inline-block" style="width: 150px; vertical-align: middle;" placeholder="Iskanje..." oninput="searchPartItems(this, @part.IdProjectPart);" />
                                             <a class="btn btn-xs icon-btn btn-outline-primary borderless" asp-page="/Projects/PrintProjectPartPaths" asp-route-id="@part.IdProjectPart" data-toggle="tooltip" data-placement="top" title="Tiskanje" data-state="primary"><i class="ion ion-md-print"></i></a>
                                         <a asp-page="/Files/Upload" asp-route-idReferenceFk="@part.IdProjectPart" asp-route-fileType="@Models.FileType.ProjectPart" class="btn btn-xs icon-btn btn-outline-secondary borderless" data-toggle="tooltip" data-placement="top" title="Priloži datoteko" data-state="secondary"><i class="fas fa-upload"></i></a>
                                         <a data-idprojectpart="@part.IdProjectPart" class="btn btn-xs icon-btn btn-outline-secondary borderless" data-toggle="tooltip" data-placement="top" title="Kopiraj del projekta" data-state="secondary" href="javascript:;" onclick="copyProjectPart(this);"><i class="far fa-copy"></i></a>
@@ -726,7 +727,7 @@
                                             </div>
                                             <div class="col-6" style="text-align: right">
                                                 <a asp-page="CreateEditPartItem" asp-route-idProject="@Model.Project.IdProject" asp-route-idProjectPart="@part.IdProjectPart" asp-route-edit="@false" class="btn btn-sm btn-primary">Dodaj pozicijo</a>
-                                                <a asp-page="CreatePartItemUploadExcel" asp-route-idProject="@Model.Project.IdProject" asp-route-idProjectPart="@part.IdProjectPart" class="btn btn-sm btn-success">Uvozi kosovnico</a>
+                                                <a asp-page="CreatePartItemImportExcel" asp-route-idProject="@Model.Project.IdProject" asp-route-idProjectPart="@part.IdProjectPart" class="btn btn-sm btn-success">Uvozi kosovnico</a>
                                             </div>
                                         </div>
                                     </div>
@@ -849,6 +850,14 @@
             refreshPrices();
         });
 
+        function searchPartItems(input, idProjectPart) {
+            let filter = $(input).val().toLowerCase();
+            $('#accordion-' + idProjectPart + ' tbody tr').each(function() {
+                let text = $(this).text().toLowerCase();
+                $(this).toggle(text.indexOf(filter) > -1);
+            });
+        }
+
         function showAllInvoices() {
             $(".invoice-row").each(function() {
                 $(this).show();

EveryThing/Pages/Projects/PrintPartItem.cshtml

@@ -0,0 +1,209 @@
+@page
+@using System.Web
+@using EveryThing.Models.Invoice
+@using Org.BouncyCastle.Asn1
+@model EveryThing.Pages.Projects.PrintPartItem
+
+@{
+    ViewData["Title"] = "Izpis";
+    Layout = "~/Pages/Layouts/_Layout.cshtml";
+}
+
+<style type="text/css">
+    table {
+        page-break-inside: auto;
+        color: black !important;
+    }
+
+    tr {
+        page-break-inside: avoid;
+        page-break-after: auto
+    }
+
+    thead {
+        display: table-header-group
+    }
+
+    tfoot {
+        display: table-footer-group
+    }
+
+    body {
+        color: black !important;
+    }
+</style>
+
+<h4 class="d-flex justify-content-between align-items-center w-100 font-weight-bold py-1 mb-4">
+    <span>
+        <span class="text-muted font-weight-light">Projekti / </span> Izpis
+    </span>
+</h4>
+
+<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 class="row">
+            <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>
+        
+        <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">
+                    @foreach (var item in Model.Operations)
+                    {
+                        <tr>
+                            <td>
+                                @(Model.Operations.IndexOf(item) + 1)
+                            </td>
+                            <td>@Html.DisplayFor(x => item.Operation.Title)</td>
+                            <td></td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </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()
+
+@section Scripts {
+    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
+
+    <!-- PDF -->
+    <script src="~/vendor/libs/html2pdf.js/dist/html2pdf.bundle.min.js" asp-append-version="true"></script>
+
+    <script>
+        var laddaPrint = Ladda.create(document.querySelector('#btnPrint'));
+        var laddaPrintAndConfirm = document.querySelector('#btnPrintAndConfirm') == null ? null : Ladda.create(document.querySelector('#btnPrintAndConfirm'));
+
+        var element = document.getElementById('print-content');
+        var opt = {
+            //pagebreak: { mode: 'avoid-all' },
+            filename: 'nalog.pdf',
+            image: { type: 'png' },
+            enableLinks: false,
+            margin: [5, 0, 13, 0],
+            html2canvas: {
+                scale: 1.2,
+                scrollX: 0,
+                scrollY: 0,
+                dpi: 300,
+                letterRendering: true
+            },
+            jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' }
+        };
+
+        function print(confirm) {
+            laddaPrint.start();
+            if (laddaPrintAndConfirm != null) {
+                laddaPrintAndConfirm.start();
+            }
+            
+
+            html2pdf().set(opt).from(element).toPdf().get('pdf').then(function (pdf) {
+
+                var totalPages = pdf.internal.getNumberOfPages();
+                for (i = 1; i <= totalPages; i++) {
+                    pdf.setPage(i);
+                    pdf.setFontSize(8);
+                    pdf.setTextColor(0);
+                    var fontSize = pdf.internal.getFontSize();
+                    var pageWidth = pdf.internal.pageSize.width;
+
+                    var txt = $('#footer1').text();
+                    var txtWidth = pdf.getStringUnitWidth(txt) * fontSize / pdf.internal.scaleFactor;
+                    var x = (pageWidth - txtWidth) / 2;
+
+                    pdf.text(x, pdf.internal.pageSize.getHeight() - 8, txt);
+
+                    txt = $('#footer2').text();
+                    txtWidth = pdf.getStringUnitWidth(txt) * fontSize / pdf.internal.scaleFactor;
+                    x = (pageWidth - txtWidth) / 2;
+
+                    pdf.text(x, pdf.internal.pageSize.getHeight() - 5, txt);
+
+                    //pdf.addImage("YOUR_IMAGE", 'JPEG', pdf.internal.pageSize.getWidth() - 1.1, pdf.internal.pageSize.getHeight() - 0.25, 1, 0.2);
+                }
+                laddaPrint.stop();
+                if (laddaPrintAndConfirm != null) {
+                    laddaPrintAndConfirm.stop();
+                }
+                
+                //window.open(pdf.output('bloburl'), '_blank');
+                let link = document.createElement('a');
+                link.target = '_blank';
+                link.href = pdf.output('bloburl');
+                link.download = '@Model.PartItem.ProjectPartNumberFormatted.Replace("-", "_")';
+                link.click();
+                link.remove();
+                if (confirm) {
+                    confirmInvoice();
+                }
+
+            });
+        }
+
+        $(document).ready(function () {
+            //print();
+        });
+
+        $(".btn-print").click(function () {
+            print($(this).attr("data-confirm") === 'true');
+        });
+
+    </script>
+}

EveryThing/Pages/Projects/PrintPartItem.cshtml.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.EntityFrameworkCore;
+using EveryThing.Data;
+using EveryThing.Models;
+using EveryThing.Models.Project;
+using EveryThing.Models.Transport;
+using DocumentFormat.OpenXml.Wordprocessing;
+using System.ComponentModel.DataAnnotations;
+
+namespace EveryThing.Pages.Projects
+{
+    [Authorize(Roles = "Administrator,InvoicingUser,ProjecThingUser")]
+    public class PrintPartItem : PageModel
+    {
+
+
+        private readonly ApplicationDbContext _context;
+        private readonly UserManager<IdentityApplicationUser> _userManager;
+
+        public ProjectPartItem PartItem { get; set; }
+
+        public IList<ProjectPartItemOperation> Operations { get; set; }
+
+        public PrintPartItem(ApplicationDbContext context, UserManager<IdentityApplicationUser> userManager)
+        {
+            _context = context;
+            _userManager = userManager;
+        }
+
+        public async Task<IActionResult> OnGetAsync(int id)
+        {
+            var user = _userManager.GetUserAsync(User).Result;
+
+            PartItem = 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);
+
+            if (PartItem == null)
+                return NotFound();
+
+
+            Operations = await _context.ProjectPartItemOperations
+                .Include(x => x.Operation)
+                .Where(x => x.IdProjectPartItemFk == PartItem.IdProjectPartItem)
+                .ToListAsync();
+
+
+            return Page();
+        }
+    }
+}

EveryThing/wwwroot/js/codeTableOperationHelper.js

@@ -0,0 +1,162 @@
+//ce jamra da ne najde post je treba dati @Html.AntiForgeryToken() v page
+function codeTableOperationAddEdit(placeholderSelector, edit, idCodeTableOperation, onAddEdit, onCancel){
+    $.blockUI();
+    $.ajax({
+        type: "GET",
+        url: "/CodeTableOperations/Index/?handler=CodeTableOperationModal",
+        data: { edit: edit, idCodeTableOperation: edit ? idCodeTableOperation : -1 },
+        success: function(data) {
+            $.unblockUI();
+            $(placeholderSelector).html(data);
+            if (edit){
+                $('#modalAddEditCodeTableOperationTitle').html(`Urejanje operacije: ${$('#inpModalAddEditCodeTableOperationTitle').val()}`);
+                $('#btnModalAddEditCodeTableOperationConfirm').html('Shrani');
+            } else {
+                $('#modalAddEditCodeTableOperationTitle').html('Dodajanje nove operacije');
+                $('#btnModalAddEditCodeTableOperationConfirm').html('Dodaj');
+            }
+            $('#btnModalAddEditCodeTableOperationConfirm').off();
+            $('#btnModalAddEditCodeTableOperationCancel').off();
+
+            //Save to db
+            $('#btnModalAddEditCodeTableOperationConfirm').on('click', () =>{
+                let title = $('#inpModalAddEditCodeTableOperationTitle').val();
+                let defaultValue = $('#inpModalAddEditCodeTableOperationDefault').is(':checked');
+                let edit = $('#inpModalAddEditCodeTableOperationEdit').val() === 'true';
+                let idCodeTableOperation = parseInt($('#inpModalAddEditCodeTableOperationIdCodeTableOperation').val());
+
+                if (title === '' || title === null){
+                    Swal.fire('Zahtevano polje naziv!');
+                    return;
+                }
+
+                $.blockUI();
+                $.ajax({
+                    type: "POST",
+                    beforeSend: function(xhr) {
+                        xhr.setRequestHeader("XSRF-TOKEN",
+                            $('input:hidden[name="__RequestVerificationToken"]').val());
+                    },
+                    url: "/CodeTableOperations/Index/?handler=CodeTableOperation",
+                    data: {
+                        title,
+                        defaultValue,
+                        edit,
+                        idCodeTableOperation
+                    },
+                    success: function(data) {
+                        $.unblockUI();
+                        if (data.successful){
+                            $("#divModalAddEditCodeTableOperation").modal('hide');
+                            if (onAddEdit != null){
+                                onAddEdit(data.idCodeTableOperation);
+                            }
+                        } else {
+                            Swal.fire('Napaka pri dodajanju/posodabljanju',
+                            data.error,
+                            'error');
+                        }
+                        
+                    },
+                    error: function (xhr, ajaxOptions, thrownError) {
+                        console.log(xhr);
+                        alert(xhr.responseText);
+                        $.unblockUI();
+                    }
+                });
+            });
+
+            //Cancel
+            $('#btnModalAddEditCodeTableOperationCancel').on('click', () =>{
+                $("#divModalAddEditCodeTableOperation").modal('hide');
+                if (onCancel != null){
+                    onCancel();
+                }
+            });
+
+            $("#divModalAddEditCodeTableOperation").modal('show');
+        },
+        error: function (xhr, ajaxOptions, thrownError) {
+            alert(xhr.responseText);
+            $.unblockUI();
+        }
+    });
+}
+
+function codeTableOperationDelete(idCodeTableOperation, onDelete, onCancel){
+    $.blockUI();
+    $.ajax({
+        type: "GET",
+        url: "/CodeTableOperations/Index/?handler=CodeTableOperation",
+        data: {
+            idCodeTableOperation
+        },
+        success: function(data) {
+            $.unblockUI();
+            if (data.successful){
+                if (data.inUse){
+                    Swal.fire('Operacija je v uporabi!',
+                                    'Brisanje ni možno!',
+                                    'warning');
+                    return;
+                }
+                Swal.fire({
+                    title: `Izbrišem operacijo ${data.operation.title}?`,
+                    text: "Tega dejanja ni možno razveljaviti!",
+                    icon: 'warning',
+                    showCancelButton: true,
+                    confirmButtonColor: '#3085d6',
+                    cancelButtonColor: '#d33',
+                    confirmButtonText: 'Da, izbriši!',
+                    cancelButtonText: 'Prekliči!'
+                  }).then((result) => {
+                    if (result.isConfirmed) {
+                        $.blockUI();
+                        $.ajax({
+                            type: "DELETE",
+                            beforeSend: function(xhr) {
+                                xhr.setRequestHeader("XSRF-TOKEN",
+                                    $('input:hidden[name="__RequestVerificationToken"]').val());
+                            },
+                            url: "/CodeTableOperations/Index/?handler=CodeTableOperation",
+                            data: {
+                                idCodeTableOperation
+                            },
+                            success: function(data) {
+                                $.unblockUI();
+                                if (data.successful){
+                                    if (onDelete != null){
+                                        onDelete(data.idCodeTableOperation);
+                                    }
+                                } else {
+                                    Swal.fire('Napaka pri brisanju operacije',
+                                    data.error,
+                                    'error');
+                                }
+                                
+                            },
+                            error: function (xhr, ajaxOptions, thrownError) {
+                                console.log(xhr);
+                                alert(xhr.responseText);
+                                $.unblockUI();
+                            }
+                        });
+                    } else{
+                        if (onCancel != null){
+                            onCancel();
+                        }
+                    }
+                  });
+            } else {
+                Swal.fire('Napaka pri branju operacije',
+                data.error,
+                'error');
+            }
+        },
+        error: function (xhr, ajaxOptions, thrownError) {
+            console.log(xhr);
+            alert(xhr.responseText);
+            $.unblockUI();
+        }
+    });
+}