diff --git a/StockManMVC/Controllers/MagStatusController.cs b/StockManMVC/Controllers/MagStatusController.cs index 08b5b3f..36d6cbb 100644 --- a/StockManMVC/Controllers/MagStatusController.cs +++ b/StockManMVC/Controllers/MagStatusController.cs @@ -20,7 +20,19 @@ namespace StockManMVC.Controllers var vLocationVal = db.vLocationVal.Include(v => v.Location); return View(vLocationVal.ToList()); } - + + + // GET: MagStatus + public ActionResult StockByLocation(string LocationID) + { + var CurrStock = db.ItemStock + .Where(s => s.QtyConf > 0 && s.LocationID == LocationID) + .Include(v => v.Location) + .Include(s => s.Item); + return PartialView("_StockByLocation",CurrStock.ToList()); + } + + protected override void Dispose(bool disposing) { if (disposing) diff --git a/StockManMVC/Controllers/PartialClasses.cs b/StockManMVC/Controllers/PartialClasses.cs new file mode 100644 index 0000000..aae89fc --- /dev/null +++ b/StockManMVC/Controllers/PartialClasses.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Web; + +namespace StockManMVC.Models +{ + [MetadataType(typeof(MovTypeMetadata))] + public partial class MovType + { + } + [MetadataType(typeof(LocTypeMetadata))] + public partial class LocType + { + } + + [MetadataType(typeof(ItemFluxesMetadata))] + public partial class ItemFluxes + { + } + + [MetadataType(typeof(ItemStocksMetadata))] + public partial class ItemStocks + { + } + + //[MetadataType(typeof(ItemsMetadata))] + //public partial class Items + //{ + //} + + //[MetadataType(typeof(EnrollmentMetadata))] + //public partial class Enrollment + //{ + //} +} \ No newline at end of file diff --git a/StockManMVC/Models/Metadata.cs b/StockManMVC/Models/Metadata.cs index d12b733..baa2423 100644 --- a/StockManMVC/Models/Metadata.cs +++ b/StockManMVC/Models/Metadata.cs @@ -77,12 +77,19 @@ namespace StockManMVC.Models //} - //public class StocksMetadata - //{ - // [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)] - // [DataType(DataType.Date)] - // public Nullable dtLastUpd; - //} + public class ItemStocksMetadata + { + [Display(Name = "Giacenza (conf)")] + public string QtyConf; + + [Display(Name = "Note")] + public string Note; + + [DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true)] + [DataType(DataType.Date)] + [Display(Name = "Data mod.")] + public Nullable dtLastUpd; + } public class vLocationMetadata { diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj index 08fb9be..dbaeb77 100644 --- a/StockManMVC/StockManMVC.csproj +++ b/StockManMVC/StockManMVC.csproj @@ -183,6 +183,7 @@ + @@ -443,6 +444,7 @@ + diff --git a/StockManMVC/StockManMVC.csproj.user b/StockManMVC/StockManMVC.csproj.user index 365efe2..615961e 100644 --- a/StockManMVC/StockManMVC.csproj.user +++ b/StockManMVC/StockManMVC.csproj.user @@ -6,7 +6,7 @@ enabled 600 True - False + True False StockManMVC.Models.StockManEntities diff --git a/StockManMVC/Views/MagStatus/Index.cshtml b/StockManMVC/Views/MagStatus/Index.cshtml index 3111b00..1f7a0ec 100644 --- a/StockManMVC/Views/MagStatus/Index.cshtml +++ b/StockManMVC/Views/MagStatus/Index.cshtml @@ -28,7 +28,7 @@ @foreach (var item in Model) - { + { @Html.DisplayFor(modelItem => item.Location.Descr) @@ -44,9 +44,28 @@ } - +
+
+
+ Locazione - selettore tendina +
+
+ @Html.Action("StockByLocation", new { LocationID = "S01" }) +
+
+
+
+
+
+ Locazione - selettore tendina +
+
+ @Html.Action("StockByLocation", new { LocationID = "S02" }) +
+
+
diff --git a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml new file mode 100644 index 0000000..a77b966 --- /dev/null +++ b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml @@ -0,0 +1,51 @@ +@model IEnumerable + + + + + @**@ + + + @**@ + + + + + @foreach (var item in Model) + { + + @**@ + + + @**@ + + + + } + +
+ @Html.DisplayNameFor(model => model.Location.Descr) + + @Html.DisplayNameFor(model => model.Item.Descr) + + @Html.DisplayNameFor(model => model.QtyConf) + + @Html.DisplayNameFor(model => model.Note) + + @Html.DisplayNameFor(model => model.dtLastUpd) +
+ @Html.DisplayFor(modelItem => item.Location.Descr) + + @Html.DisplayFor(modelItem => item.Item.Descr) + + @Html.DisplayFor(modelItem => item.QtyConf) + + @Html.DisplayFor(modelItem => item.Note) + + @Html.DisplayFor(modelItem => item.dtLastUpd) + + @*@Html.ActionLink("Edit", "Edit", new { id=item.ID }) | + @Html.ActionLink("Details", "Details", new { id=item.ID }) | + @Html.ActionLink("Delete", "Delete", new { id = item.ID })*@ + @Html.ActionLink("Sposta", "Move", new { id = item.ID }) +
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index 541bb4c..9df1531 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ