diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index 783e0bf..6156bc3 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -208,7 +208,7 @@ namespace StockManMVC .WithHeaderText("Operatore") .WithValueExpression(i => i.Operator.LastName + ", " + i.Operator.FirstName); cols.Add("Note").WithColumnName("Note") - .WithVisibility(true, false) + .WithVisibility(false, true) .WithHeaderText("Note") .WithValueExpression(i => i.Note); cols.Add("EditLink").WithColumnName("EditLink") diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs index 422979c..e0be3ed 100644 --- a/StockManMVC/Controllers/ItemFluxesController.cs +++ b/StockManMVC/Controllers/ItemFluxesController.cs @@ -270,8 +270,8 @@ namespace StockManMVC.Controllers ViewBag.ItemID = new SelectList(db.Item, "ID", "Descr", itemFlux.ItemID); ViewBag.OperatorID = new SelectList(db.Operator, "ID", "CodExt", itemFlux.OperatorID); ViewBag.ExtLocationID = new SelectList(db.Location, "ID", "Descr", itemFlux.ExtLocationID); - - return View(itemFlux); + + return PartialView("_CreatePrecompiled", itemFlux); } // GET: ItemFluxes/Edit/5 @@ -319,7 +319,7 @@ namespace StockManMVC.Controllers db.Entry(itemFlux).State = EntityState.Modified; db.SaveChanges(); - // rimando ad azione differente... + // rimando pag dettaglio... return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); //return RedirectToAction("Index"); } @@ -329,7 +329,8 @@ namespace StockManMVC.Controllers ViewBag.OperatorID = new SelectList(db.Operator, "ID", "CodExt", itemFlux.OperatorID); ViewBag.ExtLocationID = new SelectList(db.Location, "ID", "Descr", itemFlux.ExtLocationID); - return View(itemFlux); + // rimando pag dettaglio... + return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); } // GET: ItemFluxes/Delete/5 diff --git a/StockManMVC/Controllers/ItemsController.cs b/StockManMVC/Controllers/ItemsController.cs index 6e85fdf..77cb53d 100644 --- a/StockManMVC/Controllers/ItemsController.cs +++ b/StockManMVC/Controllers/ItemsController.cs @@ -216,14 +216,14 @@ namespace StockManMVC.Controllers ViewBag.ItemID = (int)id; return View(item.ToList()); } - + public ActionResult Grid() { var item = db.Item.Include(i => i.ItemFamily); return View(item.ToList()); } - + // GET: Items/Details/5 public ActionResult Details(int? id) { @@ -239,6 +239,24 @@ namespace StockManMVC.Controllers return View(item); } + + // GET: Items/Details/5 + public ActionResult CurrItemDetail(int? id) + { + if (id == null) + { + return new HttpStatusCodeResult(HttpStatusCode.BadRequest); + } + Item item = db.Item.Find(id); + if (item == null) + { + return HttpNotFound(); + } + return PartialView("_ItemDetail", item); + } + + + // GET: Items/Create public ActionResult Create() { @@ -312,7 +330,7 @@ namespace StockManMVC.Controllers { db.Entry(item).State = EntityState.Modified; db.SaveChanges(); - return RedirectToAction("Index"); + return RedirectToAction("Details", "Items", new { ID = item.ID, StockItemID = item.ID, FluxItemID = item.ID }); } ViewBag.ItemFamilyID = new SelectList(db.ItemFamily, "ID", "Descr", item.ItemFamilyID); return View(item); diff --git a/StockManMVC/Models/Metadata.cs b/StockManMVC/Models/Metadata.cs index 224c247..eb9c9d2 100644 --- a/StockManMVC/Models/Metadata.cs +++ b/StockManMVC/Models/Metadata.cs @@ -53,29 +53,38 @@ namespace StockManMVC.Models public Nullable dtExport; } - //public class ItemsMetadata - //{ - // [StringLength(250)] - // [Display(Name = "Descrizione Articolo")] - // public string Descr; + public class ItemMetadata + { + [StringLength(250)] + [Display(Name = "Descr. Articolo")] + public string Descr; - // [StringLength(50)] - // [Display(Name = "Famiglia Articolo")] - // public string Family; + [StringLength(50)] + [Display(Name = "Fam. Articolo")] + public string ItemFamily; - // [StringLength(250)] - // [Display(Name = "Descrizione Articolo Ext")] - // public string DescrExt; + [StringLength(250)] + [Display(Name = "Descr. Articolo Ext")] + public string DescrExt; - // [StringLength(250)] - // [Display(Name = "Cod Articolo Ext")] - // public string CodExt; + [StringLength(250)] + [Display(Name = "Cod. Ext")] + public string CodExt; - // [StringLength(50)] - // [Display(Name = "Cod Articolo Int")] - // public string CodInt; + [StringLength(50)] + [Display(Name = "Cod. Int")] + public string CodInt; - //} + [Display(Name = "Giacenza Minima")] + public string QtaMin; + + [Display(Name = "Lotto acquisto")] + public string QtaBatch; + + [Display(Name = "Valore unit.")] + public string CurrValue; + + } public class ItemStocksMetadata { diff --git a/StockManMVC/Models/PartialClasses.cs b/StockManMVC/Models/PartialClasses.cs index d1831ec..b2ceea2 100644 --- a/StockManMVC/Models/PartialClasses.cs +++ b/StockManMVC/Models/PartialClasses.cs @@ -30,10 +30,10 @@ namespace StockManMVC.Models { } - //[MetadataType(typeof(ItemsMetadata))] - //public partial class Items - //{ - //} + [MetadataType(typeof(ItemMetadata))] + public partial class Item + { + } //[MetadataType(typeof(EnrollmentMetadata))] //public partial class Enrollment diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj index d2bb64d..1d2fc02 100644 --- a/StockManMVC/StockManMVC.csproj +++ b/StockManMVC/StockManMVC.csproj @@ -449,6 +449,7 @@ + diff --git a/StockManMVC/Views/ItemFluxes/Edit.cshtml b/StockManMVC/Views/ItemFluxes/Edit.cshtml index 582ab21..b9ea8a5 100644 --- a/StockManMVC/Views/ItemFluxes/Edit.cshtml +++ b/StockManMVC/Views/ItemFluxes/Edit.cshtml @@ -89,14 +89,6 @@ - @*
- @Html.LabelFor(model => model.dtExport, htmlAttributes: new { @class = "control-label col-md-2" }) -
- @Html.TextBoxFor(model => model.dtExport, new { @Value = Convert.ToDateTime(Model.dtExport).ToString("yyyy-MM-dd"), @class = "form-control date-picker", type = "date" }) - @Html.ValidationMessageFor(model => model.dtExport, "", new { @class = "text-danger" }) -
-
*@ -
@Html.LabelFor(model => model.OperatorID, "OperatorID", htmlAttributes: new { @class = "control-label col-md-2" })
@@ -105,26 +97,18 @@
- @*
-
- -
-
*@ -
- +
Torna ad elenco
+ } -@*
- @Html.ActionLink("Torna ad elenco", "Details", "Items", new { id = Model.ItemID, StockItemID = Model.ItemID, FluxItemID = Model.ItemID }, null) -
*@ @section Scripts { @Scripts.Render("~/bundles/jqueryval") diff --git a/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml b/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml index f6b69d6..143fb3f 100644 --- a/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml +++ b/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml @@ -75,11 +75,10 @@
- +
- @*@Html.ActionLink("Torna ad elenco", "Details", "Items", new { id = itemID, StockItemID = itemID, FluxItemID = itemID }, null)*@ - Annulla + Annulla
diff --git a/StockManMVC/Views/Items/Details.cshtml b/StockManMVC/Views/Items/Details.cshtml index 5511b42..02e9b35 100644 --- a/StockManMVC/Views/Items/Details.cshtml +++ b/StockManMVC/Views/Items/Details.cshtml @@ -13,82 +13,16 @@ Dettaglio Articolo
-
-
-
- @Html.DisplayNameFor(model => model.Descr) -
- -
- @Html.DisplayFor(model => model.Descr) -
- -
- @Html.DisplayNameFor(model => model.CodInt) -
- -
- @Html.DisplayFor(model => model.CodInt) -
- -
- @Html.DisplayNameFor(model => model.CodExt) -
- -
- @Html.DisplayFor(model => model.CodExt) -
- -
- @Html.DisplayNameFor(model => model.DescrExt) -
- -
- @Html.DisplayFor(model => model.DescrExt) -
- -
- @Html.DisplayNameFor(model => model.QtaMin) -
- -
- @Html.DisplayFor(model => model.QtaMin) -
- -
- @Html.DisplayNameFor(model => model.QtaBatch) -
- -
- @Html.DisplayFor(model => model.QtaBatch) -
- -
- @Html.DisplayNameFor(model => model.CurrValue) -
- -
- @Html.DisplayFor(model => model.CurrValue) -
- -
- @Html.DisplayNameFor(model => model.ItemFamily.Descr) -
- -
- @Html.DisplayFor(model => model.ItemFamily.Descr) -
- -
+ @Html.Partial("_ItemDetail") +
+ @*qui carico dinamicamente le view dell'ITEM*@
-

- @Html.ActionLink("Edit", "Edit", new { id = Model.ID }) | - @Html.ActionLink("Back to List", "Index") -

+ +
-
+
Stock Giacenze @@ -98,13 +32,13 @@
- + Conf. movimenti
- + Elim. duplicati @@ -116,7 +50,7 @@
- +
@@ -128,20 +62,20 @@
-
+
Movimenti (data indica movimenti confermati o da registrare)
@Html.Partial("_MVCGridToolbar", new StockManMVC.Models.MVCGridToolbarModel() - { - MVCGridName = "FluxItemsGrid", - PageSize = true, - ColumnVisibility = true, - Export = false, - GlobalSearch = true - }) + { + MVCGridName = "FluxItemsGrid", + PageSize = true, + ColumnVisibility = true, + Export = false, + GlobalSearch = true + }) @Html.MVCGrid("FluxItemsGrid")
@@ -152,4 +86,12 @@ function CreateNewMov(ItemID, MovTypeID) { $("#divCreateMov").load('@(Url.Action("CreatePrecompiled", "ItemFluxes", null, Request.Url.Scheme))?ItemID=' + ItemID + '&MovTypeID=' + MovTypeID); } + + function LoadItemDetail(ItemID) { + $("#itemPartialView").load('@(Url.Action("CurrItemDetail", "Items", null, Request.Url.Scheme))?ID=' + ItemID); + } + + function LoadItemEdit(ItemID) { + $("#itemPartialView").load('@(Url.Action("Edit", "Items", null, Request.Url.Scheme))?ID=' + ItemID); + } \ No newline at end of file diff --git a/StockManMVC/Views/Items/Edit.cshtml b/StockManMVC/Views/Items/Edit.cshtml index a15aa30..570bbad 100644 --- a/StockManMVC/Views/Items/Edit.cshtml +++ b/StockManMVC/Views/Items/Edit.cshtml @@ -4,7 +4,7 @@ ViewBag.Title = "Edit"; } -

Edit

+

Modifica Articolo

@using (Html.BeginForm()) @@ -12,7 +12,6 @@ @Html.AntiForgeryToken()
-

Item

@Html.ValidationSummary(true, "", new { @class = "text-danger" }) @Html.HiddenFor(model => model.ID) @@ -81,18 +80,19 @@
-
-
- + +
+
+ +
+
+ Torna ad Articolo
+
} -
- @Html.ActionLink("Back to List", "Index") -
- @section Scripts { @Scripts.Render("~/bundles/jqueryval") } diff --git a/StockManMVC/Views/Items/_ItemDetail.cshtml b/StockManMVC/Views/Items/_ItemDetail.cshtml new file mode 100644 index 0000000..01d4981 --- /dev/null +++ b/StockManMVC/Views/Items/_ItemDetail.cshtml @@ -0,0 +1,79 @@ +@model StockManMVC.Models.Item + +
+
+
+ @Html.DisplayNameFor(model => model.Descr) +
+ +
+ @Html.DisplayFor(model => model.Descr) +
+ +
+ @Html.DisplayNameFor(model => model.CodInt) +
+ +
+ @Html.DisplayFor(model => model.CodInt) +
+ +
+ @Html.DisplayNameFor(model => model.CodExt) +
+ +
+ @Html.DisplayFor(model => model.CodExt) +
+ +
+ @Html.DisplayNameFor(model => model.DescrExt) +
+ +
+ @Html.DisplayFor(model => model.DescrExt) +
+ +
+ @Html.DisplayNameFor(model => model.QtaMin) +
+ +
+ @Html.DisplayFor(model => model.QtaMin) +
+ +
+ @Html.DisplayNameFor(model => model.QtaBatch) +
+ +
+ @Html.DisplayFor(model => model.QtaBatch) +
+ +
+ @Html.DisplayNameFor(model => model.CurrValue) +
+ +
+ @Html.DisplayFor(model => model.CurrValue) +
+ +
+ @Html.DisplayNameFor(model => model.ItemFamily.Descr) +
+ +
+ @Html.DisplayFor(model => model.ItemFamily.Descr) +
+ +
+
+ +
+
+ Modifica +
+
+ Torna ad elenco +
+
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index 2c1bf3a..581dc25 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ