diff --git a/EveryThing/Pages/Invoices/Index.cshtml b/EveryThing/Pages/Invoices/Index.cshtml index 855dc2e..dfebf14 100644 --- a/EveryThing/Pages/Invoices/Index.cshtml +++ b/EveryThing/Pages/Invoices/Index.cshtml @@ -7,6 +7,13 @@ Layout = "~/Pages/Layouts/_Layout.cshtml"; } +@section Styles +{ + +} +

@switch (@ViewData["Type"]) @@ -21,7 +28,7 @@ Dobavnice break; case 3: - Naročila kupcev + Naročila ponudbe/kupcev break; case 4: Kooperacije @@ -34,100 +41,101 @@

-
-
-
- -
- - -
- -
- -
-
-
-
-
-
-
- - - +
+
+
+
+ +
+ + +
+ +
+ +
+
+
+ +
+
+
+
+
- - - - + + + + + + @if (Model.ShowProjects) + { - @if (Model.ShowProjects) - { - - } - - + } + + - @foreach (var item in Model.Invoice) - { - - + @foreach (var item in Model.Invoice) + { + + + + + + @if (Model.ShowProjects) + { - - - @if (Model.ShowProjects) - { - - } - - - } + } + + + }
# - @Html.DisplayNameFor(invoice => invoice.Invoice[0].IdPartnerFk) - - @Html.DisplayNameFor(invoice => invoice.Invoice[0].Date) -
# + @Html.DisplayNameFor(invoice => invoice.Invoice[0].IdPartnerFk) + + @Html.DisplayNameFor(invoice => invoice.Invoice[0].Date) + + @Html.DisplayNameFor(invoice => invoice.Invoice[0].State) + - @Html.DisplayNameFor(invoice => invoice.Invoice[0].State) + Projekti - Projekti -
@Html.DisplayFor(modelItem => item.InvoiceNumberFormatted)
@Html.DisplayFor(modelItem => item.InvoiceNumberFormatted) + @Html.DisplayFor(modelItem => item.Partner.Title) + + @Html.DisplayFor(modelItem => item.Date) + + @switch (item.State) + { + case Invoice.InvoiceState.Closed: + @Html.DisplayFor(modelItem => item.State) + break; + case Invoice.InvoiceState.Confirmed: + @Html.DisplayFor(modelItem => item.State) + break; + default: + @Html.DisplayFor(modelItem => item.State) + break; + } + - @Html.DisplayFor(modelItem => item.Partner.Title) - - @Html.DisplayFor(modelItem => item.Date) - - @switch (item.State) + @if (item.InvoiceInvoiceItem.FirstOrDefault() != null) { - case Invoice.InvoiceState.Closed: - @Html.DisplayFor(modelItem => item.State) - break; - case Invoice.InvoiceState.Confirmed: - @Html.DisplayFor(modelItem => item.State) - break; - default: - @Html.DisplayFor(modelItem => item.State) - break; + @string.Join(" ", item.InvoiceInvoiceItem.Select(x => x.ProjectPartItem?.ProjectPart?.Project?.ProjectNumberFormatted).Distinct()) } - @if (item.InvoiceInvoiceItem.FirstOrDefault() != null) - { - @string.Join(" ", item.InvoiceInvoiceItem.Select(x => x.ProjectPartItem?.ProjectPart?.Project?.ProjectNumberFormatted).Distinct()) - } - - - - - -
+ + + + +
+
@switch (@ViewData["Type"]) diff --git a/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml b/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml index 789c310..f257e92 100644 --- a/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml +++ b/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml @@ -19,7 +19,7 @@
- Povezovanje excel z pozicijo + Povezovanje @Model.FileName z pozicijo
@@ -31,10 +31,10 @@ @{ foreach (var item in Model.ExcelItems) { -
- - -
+
+ + +
} }
diff --git a/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml.cs b/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml.cs index 5591584..ee15c53 100644 --- a/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml.cs +++ b/EveryThing/Pages/Projects/CreatePartItemImportExcel.cshtml.cs @@ -47,6 +47,7 @@ namespace EveryThing.Pages.Projects [BindProperty] public string SelectedItems { get; set; } + public IActionResult OnGet(int idProject, int idProjectPart, string fileName) { var user = _userManager.GetUserAsync(User).Result; @@ -67,9 +68,9 @@ namespace EveryThing.Pages.Projects ViewData["ProjectPartItems"] = new SelectList(tmpList, "Name", "Display"); ExcelItems = new List(); - string path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads"); + var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport", fileName); - var xlWorkbook = new XLWorkbook(Path.Combine(path, fileName)); + var xlWorkbook = new XLWorkbook(path); //ONLY FIRST LIST var worksheet = xlWorkbook.Worksheet(1); @@ -120,9 +121,9 @@ namespace EveryThing.Pages.Projects }); } - string path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads"); + var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport", FileName); - var xlWorkbook = new XLWorkbook(Path.Combine(path, FileName)); + var xlWorkbook = new XLWorkbook(path); //ONLY FIRST LIST var worksheet = xlWorkbook.Worksheet(1); @@ -157,8 +158,7 @@ namespace EveryThing.Pages.Projects string value = row.Cell(excelItem.CellIndex).Value.ToString(); - if (excelItem.Name == "IdItemFk" - || excelItem.Name == "IdMaterialFk") + if (excelItem.Name is "IdItemFk" or "IdMaterialFk") { var completableItem = _context.CodeTableItems.FirstOrDefault(x => x.Title == value && x.Active == true); if (completableItem == null) @@ -178,7 +178,32 @@ namespace EveryThing.Pages.Projects newPosition.IdItemFk = completableItem.IdItem; else newPosition.IdMaterialFk = completableItem.IdItem; - } + } + else if (excelItem.Name is "IdMaterialSupplierFk") + { + var tmpPartner = _context.CodeTablePartners.FirstOrDefault(x => x.Title == value && x.Active == true); + if (tmpPartner == null) + { + //Add new if not exists + tmpPartner = new CodeTablePartner() + { + Active = true, + IdCompanyFk = user.IdCompanyFk, + Title = value, + Supplier = true, + IdCountryFk = _context.CodeTableCountries.First(x => x.Code == "SI").IdCountry, + City = "", + Street = "", + HouseNumber = "", + PostNumber = 0, + Post = "", + }; + _context.CodeTablePartners.Add(tmpPartner); + await _context.SaveChangesAsync(); + } + + newPosition.IdMaterialSupplierFk = tmpPartner.IdPartner; + } else { var propertyInfo = newPosition.GetType().GetProperties().First(x => x.Name == excelItem.Name); @@ -190,7 +215,8 @@ namespace EveryThing.Pages.Projects await _context.SaveChangesAsync(); i++; } - + + System.IO.File.Delete(path); return RedirectToPage("./Edit", new {id = IdProject}); } diff --git a/EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml.cs b/EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml.cs index b72afc2..7ce5754 100644 --- a/EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml.cs +++ b/EveryThing/Pages/Projects/CreatePartItemUploadExcel.cshtml.cs @@ -104,21 +104,26 @@ namespace EveryThing.Pages.Projects { return Page();//TODO return error } - string path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads"); + var path = Path.Combine(_hostingEnvironment.WebRootPath, "Uploads", "TempExcelImport"); if (!Directory.Exists(path)) { Directory.CreateDirectory(path); } - - List uploadedFiles = new List(); + else + { + //Pocistimo mapo + foreach (var fileInfo in new DirectoryInfo(path).GetFiles("*.*")) + { + fileInfo.Delete(); + } + } var postedFile = postedFiles[0]; - string fileName = Guid.NewGuid().ToString().Replace("-", "_") + Path.GetExtension(postedFile.FileName); - using (FileStream stream = new FileStream(Path.Combine(path, fileName), FileMode.Create)) + var fileName = postedFile.FileName;//Guid.NewGuid().ToString().Replace("-", "_") + Path.GetExtension(postedFile.FileName); + await using (var stream = new FileStream(Path.Combine(path, fileName), FileMode.Create)) { - postedFile.CopyTo(stream); - uploadedFiles.Add(fileName); + await postedFile.CopyToAsync(stream); } return RedirectToPage("./CreatePartItemImportExcel", new { idProject = idProject, idProjectPart = idProjectPart, fileName = fileName}); } diff --git a/EveryThing/Pages/Projects/Index.cshtml b/EveryThing/Pages/Projects/Index.cshtml index 52562e4..7899513 100644 --- a/EveryThing/Pages/Projects/Index.cshtml +++ b/EveryThing/Pages/Projects/Index.cshtml @@ -48,80 +48,81 @@
-
Seznam projektov
- - - - - - - - - - - - - - - @foreach (var item in Model.Project) - { - - - - - - - - + +
+
- @Html.DisplayNameFor(model => model.Project[0].ProjectNumberFormatted) - - @Html.DisplayNameFor(model => model.Project[0].Title) - - @Html.DisplayNameFor(model => model.Project[0].IdPartnerFk) - - @Html.DisplayNameFor(model => model.Project[0].Description) - - @Html.DisplayNameFor(model => model.Project[0].FirstDeliveryDateString) - - @Html.DisplayNameFor(model => model.Project[0].Status) -
- @Html.DisplayFor(modelItem => item.ProjectNumberFormatted) - - @Html.DisplayFor(modelItem => item.Title) - - @Html.DisplayFor(modelItem => item.Partner.Title) - - @Html.DisplayFor(modelItem => item.Description) - - @Html.DisplayFor(modelItem => item.FirstDeliveryDateString) - - @switch (item.Status) - { - case ProjectStatus.Finished: - @Html.DisplayFor(modelItem => item.Status) - break; - case ProjectStatus.InProduction: - @Html.DisplayFor(modelItem => item.Status) - break; - case ProjectStatus.Offer: - @Html.DisplayFor(modelItem => item.Status) - break; - default: - @Html.DisplayFor(modelItem => item.Status) - break; - } - - - - -
+ + + + + + + + + - } - -
+ @Html.DisplayNameFor(model => model.Project[0].ProjectNumberFormatted) + + @Html.DisplayNameFor(model => model.Project[0].Title) + + @Html.DisplayNameFor(model => model.Project[0].IdPartnerFk) + + @Html.DisplayNameFor(model => model.Project[0].Description) + + @Html.DisplayNameFor(model => model.Project[0].FirstDeliveryDateString) + + @Html.DisplayNameFor(model => model.Project[0].Status) +
+ + + @foreach (var item in Model.Project) + { + + + @Html.DisplayFor(modelItem => item.ProjectNumberFormatted) + + + @Html.DisplayFor(modelItem => item.Title) + + + @Html.DisplayFor(modelItem => item.Partner.Title) + + + @Html.DisplayFor(modelItem => item.Description) + + + @Html.DisplayFor(modelItem => item.FirstDeliveryDateString) + + + @switch (item.Status) + { + case ProjectStatus.Finished: + @Html.DisplayFor(modelItem => item.Status) + break; + case ProjectStatus.InProduction: + @Html.DisplayFor(modelItem => item.Status) + break; + case ProjectStatus.Offer: + @Html.DisplayFor(modelItem => item.Status) + break; + default: + @Html.DisplayFor(modelItem => item.Status) + break; + } + + + + + + + + } + + +
Vnos projekta diff --git a/EveryThing/wwwroot/Uploads/2e04baca_8781_4d37_bae8_e830ff14be4b.xlsx b/EveryThing/wwwroot/Uploads/2e04baca_8781_4d37_bae8_e830ff14be4b.xlsx deleted file mode 100644 index ce212a7..0000000 Binary files a/EveryThing/wwwroot/Uploads/2e04baca_8781_4d37_bae8_e830ff14be4b.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/38e5b032_8b41_472b_ba9d_a10118de6b88.xlsx b/EveryThing/wwwroot/Uploads/38e5b032_8b41_472b_ba9d_a10118de6b88.xlsx deleted file mode 100644 index 3f76871..0000000 Binary files a/EveryThing/wwwroot/Uploads/38e5b032_8b41_472b_ba9d_a10118de6b88.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/699d225b_1b85_4de6_9bde_ad6b938be039.xlsx b/EveryThing/wwwroot/Uploads/699d225b_1b85_4de6_9bde_ad6b938be039.xlsx deleted file mode 100644 index ffa9311..0000000 Binary files a/EveryThing/wwwroot/Uploads/699d225b_1b85_4de6_9bde_ad6b938be039.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/80ed5375_29db_458e_8390_ab7d6410f81e.xlsx b/EveryThing/wwwroot/Uploads/80ed5375_29db_458e_8390_ab7d6410f81e.xlsx deleted file mode 100644 index ffa9311..0000000 Binary files a/EveryThing/wwwroot/Uploads/80ed5375_29db_458e_8390_ab7d6410f81e.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/ad87a62d_4a6c_4056_9a4d_fb7d49c4e508.xlsx b/EveryThing/wwwroot/Uploads/ad87a62d_4a6c_4056_9a4d_fb7d49c4e508.xlsx deleted file mode 100644 index 2cbd5fe..0000000 Binary files a/EveryThing/wwwroot/Uploads/ad87a62d_4a6c_4056_9a4d_fb7d49c4e508.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/b74e3bd7_096d_4c77_b345_21c3858501ce.xlsx b/EveryThing/wwwroot/Uploads/b74e3bd7_096d_4c77_b345_21c3858501ce.xlsx deleted file mode 100644 index ce212a7..0000000 Binary files a/EveryThing/wwwroot/Uploads/b74e3bd7_096d_4c77_b345_21c3858501ce.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/bd061f30_62a4_4dbd_86b0_0fe39d4f199b.xlsx b/EveryThing/wwwroot/Uploads/bd061f30_62a4_4dbd_86b0_0fe39d4f199b.xlsx deleted file mode 100644 index 6bdc4a2..0000000 Binary files a/EveryThing/wwwroot/Uploads/bd061f30_62a4_4dbd_86b0_0fe39d4f199b.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/c3ba1a27_8aae_4888_975f_de80ddadaa83.xlsx b/EveryThing/wwwroot/Uploads/c3ba1a27_8aae_4888_975f_de80ddadaa83.xlsx deleted file mode 100644 index 6bdc4a2..0000000 Binary files a/EveryThing/wwwroot/Uploads/c3ba1a27_8aae_4888_975f_de80ddadaa83.xlsx and /dev/null differ diff --git a/EveryThing/wwwroot/Uploads/ff70c602_1568_4468_b13a_e1e7971dea4c.xlsx b/EveryThing/wwwroot/Uploads/ff70c602_1568_4468_b13a_e1e7971dea4c.xlsx deleted file mode 100644 index ce212a7..0000000 Binary files a/EveryThing/wwwroot/Uploads/ff70c602_1568_4468_b13a_e1e7971dea4c.xlsx and /dev/null differ