Eliminato filtro URL su FluxItemID non + necessario (ed eliminato oggetto MVCGrid relativo)

This commit is contained in:
Samuele E. Locatelli
2016-10-21 17:05:48 +02:00
parent ea15379ea2
commit b5edb920b5
18 changed files with 20 additions and 112 deletions
Binary file not shown.
+2 -94
View File
@@ -57,7 +57,7 @@ namespace StockManMVC
.WithVisibility(true, false)
.WithAllowChangeVisibility(false)
.WithHtmlEncoding(false)
.WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID, FluxItemID = i.ID }))
.WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID }))
.WithValueTemplate("<a href='{Value}' title='Vedi Dettagli' class='btn btn-xs btn-info'><i class='glyphicon glyphicon-search' aria-hidden='true'></i></a>");
cols.Add("Family").WithColumnName("Family")
.WithVisibility(true, false)
@@ -163,98 +163,6 @@ namespace StockManMVC
})
);
MVCGridDefinitionTable.Add("FluxItemsGrid", new MVCGridBuilder<Models.ItemFlux>(gridDefaults, colDefaults) // aggiungo valori di default...
.WithSorting(sorting: true, defaultSortColumn: "dtMov", defaultSortDirection: SortDirection.Dsc)
.WithAdditionalQueryOptionNames("ItemID")
.WithAdditionalQueryOptionNames("search")
//.WithRowCssClassExpression(p => p.dtExport.ToString() == "" ? "warning" : "")
.WithQueryStringPrefix("Flux")
.WithPaging(true)
.AddColumns(cols =>
{
cols.Add("dtMov").WithColumnName("dtMov")
.WithVisibility(true, false)
.WithHeaderText("data")
.WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "text-warning mark" : "deleted")
.WithValueExpression(i => i.dtMov.ToShortDateString());
cols.Add("Posizione").WithColumnName("Posizione")
.WithVisibility(true, false)
.WithHeaderText("Posizione")
.WithValueExpression(i => i.Location.Descr);
cols.Add("Tipo").WithColumnName("Tipo")
.WithVisibility(false, true)
.WithHeaderText("Tipo")
.WithValueExpression(i => i.MovTypeID);
cols.Add("Qta").WithColumnName("Qta")
.WithVisibility(true, false)
.WithHeaderText("Qta")
.WithCellCssClassExpression(p => p.MovType.CssClass + " text-right")
.WithValueExpression(i => i.Qta.ToString());
cols.Add("UnitVal").WithColumnName("UnitVal")
.WithVisibility(false, true)
.WithHeaderText("Val/cad")
.WithCellCssClassExpression(p => " text-right")
.WithValueExpression(i => i.UnitVal.ToString("C2"));
cols.Add("TotValue").WithColumnName("TotValue")
.WithHeaderText("Importo")
.WithCellCssClassExpression(p => " text-right")
.WithValueExpression(i => i.TotValue.ToString("C2"));
cols.Add("Riferimento").WithColumnName("Riferimento")
.WithVisibility(true, false)
.WithHeaderText("Riferimento")
.WithValueExpression(i => i.ExtLocationID);
cols.Add("Operatore").WithColumnName("Operatore")
.WithVisibility(false, true)
.WithHeaderText("Operatore")
.WithValueExpression(i => i.Operator.LastName + ", " + i.Operator.FirstName);
cols.Add("Note").WithColumnName("Note")
.WithVisibility(false, true)
.WithHeaderText("Note")
.WithValueExpression(i => i.Note);
cols.Add("EditLink").WithColumnName("EditLink")
.WithSorting(false)
.WithVisibility(true, false)
.WithHeaderText("")
.WithHtmlEncoding(false)
.WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "" : "hidden deleted")
.WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("Edit", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID }))
.WithValueTemplate("<a href='{Value}' data-toggle=\"tooltip\" title=\"Modifica\"><i class=\"glyphicon glyphicon-edit\"></i></a>");
cols.Add("ConvOrder").WithColumnName("ConvOrder")
.WithSorting(false)
.WithVisibility( true, false)
.WithHeaderText("")
.WithHtmlEncoding(false)
.WithCellCssClassExpression(i => i.dtExport.ToString() == "" && i.MovTypeID == "OFOR" ? "" : "hidden deleted")
.WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("ConvOrder", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID }))
.WithValueTemplate("<a href='{Value}' data-toggle=\"tooltip\" title=\"Converti Ordine in Carico\"><i class=\"glyphicon glyphicon-flash\"></i></a>");
cols.Add("DeleteLink").WithColumnName("DeleteLink")
.WithSorting(false)
.WithVisibility(true, false)
.WithHeaderText("")
.WithHtmlEncoding(false)
.WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "" : "hidden deleted")
.WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("Delete", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID }))
.WithValueTemplate("<a href='{Value}' data-toggle=\"tooltip\" title=\"Elimina\"><i class=\"glyphicon glyphicon-trash\"></i></a>");
})
.WithRetrieveDataMethod((context) =>
{
var options = context.QueryOptions;
string sItemID = options.GetAdditionalQueryOptionString("ItemID");
if (String.IsNullOrEmpty(sItemID)) sItemID = "0";
int ItemID = Convert.ToInt32(sItemID);
string SearchVal = options.GetAdditionalQueryOptionString("search");
if (String.IsNullOrEmpty(SearchVal)) SearchVal = "";
return new QueryResult<Models.ItemFlux>()
{
Items = ItemFluxesController.SelectPage(ItemID, SearchVal, options.SortColumnName.ToLower(), options.SortDirection.ToString().ToLower(), (int)options.PageIndex, (int)options.ItemsPerPage).ToList(),
TotalRecords = ItemFluxesController.SelectCount(ItemID, SearchVal)
};
})
);
MVCGridDefinitionTable.Add("ItemsFlux2SaveGrid", new MVCGridBuilder<Models.vItemFlux2Save>(gridDefaults, colDefaults) // aggiungo valori di default...
.WithSorting(sorting: true, defaultSortColumn: "dtMov") //, defaultSortDirection: SortDirection.Dsc
.WithQueryStringPrefix("IF2S")
@@ -308,7 +216,7 @@ namespace StockManMVC
.WithAllowChangeVisibility(false)
//.WithHeaderText("<a href='/Items' class='btn btn-xs btn-default' title='reset'><i class='glyphicon glyphicon-refresh' aria-hidden='true'></i></a>")
.WithHtmlEncoding(false)
.WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID }))
.WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID }))
.WithValueTemplate("<a href='{Value}' class='btn btn-xs btn-info' title='Vedi Dettagli'><i class='glyphicon glyphicon-search' aria-hidden='true'></i></a>");
})
.WithRetrieveDataMethod((context) =>
@@ -387,7 +387,7 @@ namespace StockManMVC.Controllers
db.ItemFlux.Add(itemFlux);
db.SaveChanges();
// rimando a pag esterna...
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID });
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID });
//return RedirectToAction("Index");
}
@@ -419,7 +419,7 @@ namespace StockManMVC.Controllers
db.SaveChanges();
}
// ritorno a dettaglio!
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID });
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID });
}
// GET: ItemFluxes/Edit/5
@@ -505,7 +505,7 @@ namespace StockManMVC.Controllers
db.SaveChanges();
// rimando pag dettaglio...
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID });
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID });
//return RedirectToAction("Index");
}
ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr", itemFlux.LocationID);
@@ -553,7 +553,7 @@ namespace StockManMVC.Controllers
db.ItemFlux.Remove(itemFlux);
db.SaveChanges();
//return RedirectToAction("Index");
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID });
return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID });
}
protected override void Dispose(bool disposing)
+3 -3
View File
@@ -176,7 +176,7 @@ namespace StockManMVC.Controllers
// rimanda alla view principale da cui è stata fatta la chiamata...
if (caller == "Items")
{
return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id, FluxItemID = id });
return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id });
}
else
{
@@ -204,7 +204,7 @@ namespace StockManMVC.Controllers
// rimanda alla view principale da cui è stata fatta la chiamata...
if (caller == "Items")
{
return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id, FluxItemID = id });
return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id });
}
else
{
@@ -376,7 +376,7 @@ namespace StockManMVC.Controllers
{
db.Entry(item).State = EntityState.Modified;
db.SaveChanges();
return RedirectToAction("Details", "Items", new { ID = item.ID, StockItemID = item.ID, FluxItemID = item.ID });
return RedirectToAction("Details", "Items", new { ID = item.ID, StockItemID = item.ID });
}
ViewBag.ItemFamilyID = new SelectList(db.ItemFamily, "ID", "Descr", item.ItemFamilyID);
return View("Edit", item);
@@ -90,7 +90,7 @@
<button type="submit" class="btn btn-sm btn-primary form-control">Salva <i class="glyphicon glyphicon-ok-circle"></i></button>
</div>
<div class="col-md-6">
<a href="@Url.Action("Details","Items", new { id = itemID, StockItemID = itemID, FluxItemID = itemID })" class="btn btn-sm btn-info form-control">Annulla <i class="glyphicon glyphicon-remove-circle"></i></a>
<a href="@Url.Action("Details","Items", new { id = itemID, StockItemID = itemID })" class="btn btn-sm btn-info form-control">Annulla <i class="glyphicon glyphicon-remove-circle"></i></a>
</div>
</div>
</div>
+1 -1
View File
@@ -111,7 +111,7 @@
<button type="submit" value="Delete" class="btn btn-danger form-control">Elimina <i class="glyphicon glyphicon-remove-circle"></i></button>
</div>
<div class="col-sm-6">
<a href="@Url.Action("Details", "Items", new { id=Model.ItemID, StockItemID= Model.ItemID, FluxItemID= Model.ItemID })" class="btn btn-info form-control">Annulla <i class="glyphicon glyphicon-retweet"></i></a>
<a href="@Url.Action("Details", "Items", new { id=Model.ItemID, StockItemID= Model.ItemID })" class="btn btn-info form-control">Annulla <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
}
+1 -1
View File
@@ -105,7 +105,7 @@
<button type="submit" value="Save" class="btn btn-primary form-control">Salva modifiche <i class="glyphicon glyphicon-ok-circle"></i></button>
</div>
<div class="col-sm-6">
<a href="@Url.Action("Details", "Items", new { id=Model.ItemID, StockItemID= Model.ItemID, FluxItemID= Model.ItemID })" class="btn btn-info form-control">Annulla <i class="glyphicon glyphicon-retweet"></i></a>
<a href="@Url.Action("Details", "Items", new { id=Model.ItemID, StockItemID= Model.ItemID })" class="btn btn-info form-control">Annulla <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
</div>
@@ -82,7 +82,7 @@
<button type="submit" class="btn btn-sm btn-primary form-control">Salva <i class="glyphicon glyphicon-ok-circle"></i></button>
</div>
<div class="col-md-6">
<a href="@Url.Action("Details","Items", new { id = itemID, StockItemID = itemID, FluxItemID = itemID })" class="btn btn-sm btn-info form-control">Annulla <i class="glyphicon glyphicon-remove-circle"></i></a>
<a href="@Url.Action("Details","Items", new { id = itemID, StockItemID = itemID })" class="btn btn-sm btn-info form-control">Annulla <i class="glyphicon glyphicon-remove-circle"></i></a>
</div>
</div>
</div>
@@ -78,7 +78,7 @@
<script type="text/javascript">
function refreshPageSize() {
var PageSizeNew = $("#PageSizeDD").val();
var queryUrl = 'ID=@ViewBag.ID&StockItemID=@ViewBag.ID&FluxItemID=@ViewBag.ID&SearchVal=@ViewBag.SearchVal&SortOrd=@ViewBag.SortOrd&page=1&pageSize=' + PageSizeNew; //riporto a pag 1 in caso di cambio filtro!
var queryUrl = 'ID=@ViewBag.ID&StockItemID=@ViewBag.ID&SearchVal=@ViewBag.SearchVal&SortOrd=@ViewBag.SortOrd&page=1&pageSize=' + PageSizeNew; //riporto a pag 1 in caso di cambio filtro!
// ricarico
window.location.href = '?' + queryUrl;
}
@@ -33,7 +33,7 @@
{
<tr>
<td>
<a href="@Url.Action("Details", "Items", new { id = item.ID, StockItemID = item.ID, FluxItemID = item.ID })" class="btn btn-sm btn-info">
<a href="@Url.Action("Details", "Items", new { id = item.ID, StockItemID = item.ID })" class="btn btn-sm btn-info">
<i class="glyphicon glyphicon-search" aria-hidden="true"></i>
</a>
</td>
+1 -1
View File
@@ -98,7 +98,7 @@
}
else
{
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID, FluxItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
}
</div>
</div>
+1 -1
View File
@@ -33,7 +33,7 @@
{
<tr>
<td>
<a href="@Url.Action("Details", "Items", new { id = item.ID, StockItemID = item.ID, FluxItemID = item.ID })" class="btn btn-sm btn-info">
<a href="@Url.Action("Details", "Items", new { id = item.ID, StockItemID = item.ID })" class="btn btn-sm btn-info">
<i class="glyphicon glyphicon-search" aria-hidden="true"></i>
</a>
</td>
+1 -1
View File
@@ -91,7 +91,7 @@
<button type="submit" value="Delete" class="btn btn-sm btn-danger form-control">Elimina <i class="glyphicon glyphicon-ok-circle"></i></button>
</div>
<div class="col-sm-6">
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID, FluxItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
+1 -1
View File
@@ -89,7 +89,7 @@
<button type="submit" value="Save" class="btn btn-sm btn-primary form-control">Salva Modifiche <i class="glyphicon glyphicon-ok-circle"></i></button>
</div>
<div class="col-sm-6">
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID, FluxItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
<a href="@Url.Action("Details", "Items", new { id=Model.ID, StockItemID= Model.ID })" class="btn btn-sm btn-info form-control">Torna ad Articolo <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
@@ -23,7 +23,7 @@
{
<tr id="@("row_"+item.ID)" class="singleRow">
<td class="text-center" style="width: 4em;">
<a href="@Url.Action("Details", "Items", new { id = item.ItemID, StockItemID = item.ItemID, FluxItemID = item.ItemID })" class="btn btn-xs btn-info">
<a href="@Url.Action("Details", "Items", new { id = item.ItemID, StockItemID = item.ItemID })" class="btn btn-xs btn-info">
<i class="glyphicon glyphicon-search" aria-hidden="true"></i>
</a>
</td>
Binary file not shown.
Binary file not shown.
Binary file not shown.