From 77e1372df8ba0a973ac34e0cc23b7d45dbfec127 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli"
Date: Thu, 22 Sep 2016 12:05:32 +0200
Subject: [PATCH] sistemata relazione tra flussi e locations...
---
.../Controllers/ItemFluxesController.cs | 6 +++-
StockManMVC/Models/ItemFlux.cs | 1 +
StockManMVC/Models/Location.cs | 3 ++
StockManMVC/Models/SMModel.edmx | 34 ++++++++++++++++++
StockManMVC/Models/SMModel.edmx.diagram | 9 ++---
StockManMVC/Views/ItemFluxes/Create.cshtml | 4 +--
StockManMVC/Views/ItemFluxes/Delete.cshtml | 16 ++++-----
StockManMVC/Views/ItemFluxes/Details.cshtml | 16 ++++-----
StockManMVC/Views/ItemFluxes/Edit.cshtml | 4 +--
StockManMVC/Views/ItemFluxes/Index.cshtml | 12 +++----
StockManMVC/bin/StockManMVC.dll | Bin 72192 -> 74752 bytes
11 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs
index e8f883a..e19094f 100644
--- a/StockManMVC/Controllers/ItemFluxesController.cs
+++ b/StockManMVC/Controllers/ItemFluxesController.cs
@@ -17,7 +17,7 @@ namespace StockManMVC.Controllers
// GET: ItemFluxes
public ActionResult Index()
{
- var itemFlux = db.ItemFlux.Include(i => i.Location).Include(i => i.MovType).Include(i => i.Item).Include(i => i.Operator);
+ var itemFlux = db.ItemFlux.Include(i => i.Location).Include(i => i.MovType).Include(i => i.Item).Include(i => i.Operator).Include(i => i.Location1);
return View(itemFlux.ToList());
}
@@ -43,6 +43,7 @@ namespace StockManMVC.Controllers
ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr");
ViewBag.ItemID = new SelectList(db.Item, "ID", "Descr");
ViewBag.OperatorID = new SelectList(db.Operator, "ID", "CodExt");
+ ViewBag.ExtLocationID = new SelectList(db.Location, "ID", "Descr");
return View();
}
@@ -64,6 +65,7 @@ namespace StockManMVC.Controllers
ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", itemFlux.MovTypeID);
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);
}
@@ -83,6 +85,7 @@ namespace StockManMVC.Controllers
ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", itemFlux.MovTypeID);
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);
}
@@ -103,6 +106,7 @@ namespace StockManMVC.Controllers
ViewBag.MovTypeID = new SelectList(db.MovType, "ID", "Descr", itemFlux.MovTypeID);
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);
}
diff --git a/StockManMVC/Models/ItemFlux.cs b/StockManMVC/Models/ItemFlux.cs
index 0996190..1149a02 100644
--- a/StockManMVC/Models/ItemFlux.cs
+++ b/StockManMVC/Models/ItemFlux.cs
@@ -31,5 +31,6 @@ namespace StockManMVC.Models
public virtual MovType MovType { get; set; }
public virtual Item Item { get; set; }
public virtual Operator Operator { get; set; }
+ public virtual Location Location1 { get; set; }
}
}
diff --git a/StockManMVC/Models/Location.cs b/StockManMVC/Models/Location.cs
index 399a0fd..033eb5c 100644
--- a/StockManMVC/Models/Location.cs
+++ b/StockManMVC/Models/Location.cs
@@ -19,6 +19,7 @@ namespace StockManMVC.Models
{
this.ItemFlux = new HashSet();
this.ItemStock = new HashSet();
+ this.ItemFlux1 = new HashSet();
}
public string ID { get; set; }
@@ -30,5 +31,7 @@ namespace StockManMVC.Models
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection ItemStock { get; set; }
public virtual LocType LocType { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection ItemFlux1 { get; set; }
}
}
diff --git a/StockManMVC/Models/SMModel.edmx b/StockManMVC/Models/SMModel.edmx
index aa99eb5..c76c6fc 100644
--- a/StockManMVC/Models/SMModel.edmx
+++ b/StockManMVC/Models/SMModel.edmx
@@ -161,6 +161,18 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
+
+
+
+
+
+
+
+
+
+
+
@@ -266,6 +278,10 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
+
+
+
@@ -311,6 +327,7 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
@@ -335,6 +352,7 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
@@ -448,6 +466,10 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
+
+
+
@@ -554,6 +576,18 @@ warning 6002: The table/view 'StockMan.dbo.vItemStockStatus' does not have a pri
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/StockManMVC/Models/SMModel.edmx.diagram b/StockManMVC/Models/SMModel.edmx.diagram
index 40965a9..c7aacab 100644
--- a/StockManMVC/Models/SMModel.edmx.diagram
+++ b/StockManMVC/Models/SMModel.edmx.diagram
@@ -6,10 +6,10 @@
-
-
-
-
+
+
+
+
@@ -22,6 +22,7 @@
+
diff --git a/StockManMVC/Views/ItemFluxes/Create.cshtml b/StockManMVC/Views/ItemFluxes/Create.cshtml
index f0fc494..acfc0d5 100644
--- a/StockManMVC/Views/ItemFluxes/Create.cshtml
+++ b/StockManMVC/Views/ItemFluxes/Create.cshtml
@@ -40,9 +40,9 @@
diff --git a/StockManMVC/Views/ItemFluxes/Delete.cshtml b/StockManMVC/Views/ItemFluxes/Delete.cshtml
index 0003b85..b8d18b0 100644
--- a/StockManMVC/Views/ItemFluxes/Delete.cshtml
+++ b/StockManMVC/Views/ItemFluxes/Delete.cshtml
@@ -11,14 +11,6 @@
ItemFlux
- -
- @Html.DisplayNameFor(model => model.ExtLocationID)
-
-
- -
- @Html.DisplayFor(model => model.ExtLocationID)
-
-
-
@Html.DisplayNameFor(model => model.dtMov)
@@ -99,6 +91,14 @@
@Html.DisplayFor(model => model.Operator.CodExt)
+ -
+ @Html.DisplayNameFor(model => model.Location1.Descr)
+
+
+ -
+ @Html.DisplayFor(model => model.Location1.Descr)
+
+
@using (Html.BeginForm()) {
diff --git a/StockManMVC/Views/ItemFluxes/Details.cshtml b/StockManMVC/Views/ItemFluxes/Details.cshtml
index 4f8c88a..585b4ee 100644
--- a/StockManMVC/Views/ItemFluxes/Details.cshtml
+++ b/StockManMVC/Views/ItemFluxes/Details.cshtml
@@ -10,14 +10,6 @@
ItemFlux
- -
- @Html.DisplayNameFor(model => model.ExtLocationID)
-
-
- -
- @Html.DisplayFor(model => model.ExtLocationID)
-
-
-
@Html.DisplayNameFor(model => model.dtMov)
@@ -98,6 +90,14 @@
@Html.DisplayFor(model => model.Operator.CodExt)
+ -
+ @Html.DisplayNameFor(model => model.Location1.Descr)
+
+
+ -
+ @Html.DisplayFor(model => model.Location1.Descr)
+
+
diff --git a/StockManMVC/Views/ItemFluxes/Edit.cshtml b/StockManMVC/Views/ItemFluxes/Edit.cshtml
index 5398444..e3bfbe6 100644
--- a/StockManMVC/Views/ItemFluxes/Edit.cshtml
+++ b/StockManMVC/Views/ItemFluxes/Edit.cshtml
@@ -42,9 +42,9 @@
diff --git a/StockManMVC/Views/ItemFluxes/Index.cshtml b/StockManMVC/Views/ItemFluxes/Index.cshtml
index 172beed..3548aa5 100644
--- a/StockManMVC/Views/ItemFluxes/Index.cshtml
+++ b/StockManMVC/Views/ItemFluxes/Index.cshtml
@@ -11,9 +11,6 @@
- |
- @Html.DisplayNameFor(model => model.ExtLocationID)
- |
@Html.DisplayNameFor(model => model.dtMov)
|
@@ -44,14 +41,14 @@
@Html.DisplayNameFor(model => model.Operator.CodExt)
|
+
+ @Html.DisplayNameFor(model => model.Location1.Descr)
+ |
|
@foreach (var item in Model) {
- |
- @Html.DisplayFor(modelItem => item.ExtLocationID)
- |
@Html.DisplayFor(modelItem => item.dtMov)
|
@@ -82,6 +79,9 @@
@Html.DisplayFor(modelItem => item.Operator.CodExt)
|
+
+ @Html.DisplayFor(modelItem => item.Location1.Descr)
+ |
@Html.ActionLink("Edit", "Edit", new { id=item.ID }) |
@Html.ActionLink("Details", "Details", new { id=item.ID }) |
diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll
index ed860bb3ff4321dcf090dc248737c86ef8d1ea2a..dffa11e55c865dca264ab3418576099fe7421a5e 100644
GIT binary patch
delta 13870
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 | |