Completato spostamento su pagina index articoli, tolta pagina specifica x test precedente

This commit is contained in:
Samuele E. Locatelli
2016-09-23 16:18:49 +02:00
parent dcd03a617e
commit 1f4dd2f0f2
9 changed files with 116 additions and 106 deletions
+1
View File
@@ -30,6 +30,7 @@ namespace StockManMVC
bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/bootstrap.css",
"~/Content/font-awesome.css",
//"~/Content/jquery.bootgrid.css",
"~/Content/site.css"));
}
+1 -1
View File
@@ -57,7 +57,7 @@ namespace StockManMVC
.WithHeaderText("")
.WithHtmlEncoding(false)
.WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID }))
.WithValueTemplate("<a href='{Value}'>View</a>");
.WithValueTemplate("<a href='{Value}' title='Vedi Dettagli'><i class='glyphicon glyphicon-search' aria-hidden='true'></i></a>");
cols.Add("Family").WithColumnName("Family")
.WithVisibility(true, false)
.WithHeaderText("Famiglia")
+1 -6
View File
@@ -135,12 +135,7 @@ namespace StockManMVC.Controllers
var item = db.Item.Include(i => i.ItemFamily);
return View(item.ToList());
}
public ActionResult MVCGrid()
{
var item = db.Item.Include(i => i.ItemFamily);
return View(item.ToList());
}
// GET: Items/Details/5
public ActionResult Details(int? id)
{
+8 -1
View File
@@ -239,9 +239,12 @@
<Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\Gridmvc.css" />
<Content Include="Content\PagedList.css" />
<Content Include="favicon.ico" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Content\Site.css" />
@@ -273,6 +276,11 @@
<DependentUpon>SMModel.edmx</DependentUpon>
</Content>
<Content Include="Grid.mvc.readme" />
<Content Include="fonts\FontAwesome.otf" />
<Content Include="fonts\fontawesome-webfont.woff2" />
<Content Include="fonts\fontawesome-webfont.woff" />
<Content Include="fonts\fontawesome-webfont.ttf" />
<Content Include="fonts\fontawesome-webfont.eot" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<None Include="Scripts\jquery-3.1.0.intellisense.js" />
@@ -360,7 +368,6 @@
<Content Include="Views\Shared\_GridPager.cshtml" />
<Content Include="Views\Shared\_Grid.cshtml" />
<Content Include="Views\Items\Grid.cshtml" />
<Content Include="Views\Items\MVCGrid.cshtml" />
<Content Include="Views\Shared\_MVCGridToolbar.cshtml" />
</ItemGroup>
<ItemGroup>
+100 -66
View File
@@ -4,71 +4,105 @@
ViewBag.Title = "Index";
}
<h2>Index</h2>
<p>
@Html.ActionLink("Create New", "Create")
</p>
<table class="table table-condensed table-hover table-striped">
<tr>
<th data-column-id="Descr" data-order="asc">
@Html.DisplayNameFor(model => model.Descr)
</th>
<th data-column-id="CodInt">
@Html.DisplayNameFor(model => model.CodInt)
</th>
<th data-column-id="CodExt">
@Html.DisplayNameFor(model => model.CodExt)
</th>
<th data-column-id="DescrExt">
@Html.DisplayNameFor(model => model.DescrExt)
</th>
<th data-column-id="QtaMin">
@Html.DisplayNameFor(model => model.QtaMin)
</th>
<th data-column-id="QtaBatch">
@Html.DisplayNameFor(model => model.QtaBatch)
</th>
<th data-column-id="CurrValue">
@Html.DisplayNameFor(model => model.CurrValue)
</th>
<th data-column-id="Family">
@Html.DisplayNameFor(model => model.ItemFamily.Descr)
</th>
<th></th>
</tr>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.Descr)
</td>
<td>
@Html.DisplayFor(modelItem => item.CodInt)
</td>
<td>
@Html.DisplayFor(modelItem => item.CodExt)
</td>
<td>
@Html.DisplayFor(modelItem => item.DescrExt)
</td>
<td>
@Html.DisplayFor(modelItem => item.QtaMin)
</td>
<td>
@Html.DisplayFor(modelItem => item.QtaBatch)
</td>
<td>
@Html.DisplayFor(modelItem => item.CurrValue)
</td>
<td>
@Html.DisplayFor(modelItem => item.ItemFamily.Descr)
</td>
<td>
@Html.ActionLink("Edit", "Edit", new { id=item.ID }) |
@Html.ActionLink("Details", "Details", new { id=item.ID }) |
@Html.ActionLink("Delete", "Delete", new { id=item.ID })
</td>
</tr>
}
@using MVCGrid.Web
<div class="row" style="margin-top: 0.5em;">
<div class="col-lg-10 col-lg-offset-1 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="col-xs-8">
<strong>Anagrafica Articoli</strong>
</div>
<div class="col-xs-4 text-right">
@*@Html.ActionLink("Create New", "Create")*@
<a href="@Url.Action("Create", "Items")" class="btn btn-success">
<i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
Aggiunta Nuovo articolo
</a>
</div>
</div>
</div>
<div class="panel-body small">
@Html.Partial("_MVCGridToolbar", new StockManMVC.Models.MVCGridToolbarModel()
{
MVCGridName = "ItemsGrid",
PageSize = true,
ColumnVisibility = true,
Export = true,
GlobalSearch = true
})
@Html.MVCGrid("ItemsGrid")
</div>
</div>
</div>
</div>
</table>
@*<table class="table table-condensed table-hover table-striped">
<tr>
<th data-column-id="Descr" data-order="asc">
@Html.DisplayNameFor(model => model.Descr)
</th>
<th data-column-id="CodInt">
@Html.DisplayNameFor(model => model.CodInt)
</th>
<th data-column-id="CodExt">
@Html.DisplayNameFor(model => model.CodExt)
</th>
<th data-column-id="DescrExt">
@Html.DisplayNameFor(model => model.DescrExt)
</th>
<th data-column-id="QtaMin">
@Html.DisplayNameFor(model => model.QtaMin)
</th>
<th data-column-id="QtaBatch">
@Html.DisplayNameFor(model => model.QtaBatch)
</th>
<th data-column-id="CurrValue">
@Html.DisplayNameFor(model => model.CurrValue)
</th>
<th data-column-id="Family">
@Html.DisplayNameFor(model => model.ItemFamily.Descr)
</th>
<th></th>
</tr>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.Descr)
</td>
<td>
@Html.DisplayFor(modelItem => item.CodInt)
</td>
<td>
@Html.DisplayFor(modelItem => item.CodExt)
</td>
<td>
@Html.DisplayFor(modelItem => item.DescrExt)
</td>
<td>
@Html.DisplayFor(modelItem => item.QtaMin)
</td>
<td>
@Html.DisplayFor(modelItem => item.QtaBatch)
</td>
<td>
@Html.DisplayFor(modelItem => item.CurrValue)
</td>
<td>
@Html.DisplayFor(modelItem => item.ItemFamily.Descr)
</td>
<td>
@Html.ActionLink("Edit", "Edit", new { id=item.ID }) |
@Html.ActionLink("Details", "Details", new { id=item.ID }) |
@Html.ActionLink("Delete", "Delete", new { id=item.ID })
</td>
</tr>
}
</table>*@
-28
View File
@@ -1,28 +0,0 @@
@model IEnumerable<StockManMVC.Models.Item>
@{
ViewBag.Title = "Articoli";
}
@using MVCGrid.Web
<div class="row" style="margin-top: 0.5em;">
<div class="col-lg-10 col-lg-offset-1 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<h4>Anagrafica Articoli</h4>
</div>
<div class="panel-body small">
@Html.Partial("_MVCGridToolbar", new StockManMVC.Models.MVCGridToolbarModel()
{
MVCGridName = "ItemsGrid",
PageSize = true,
ColumnVisibility = true,
Export = true,
GlobalSearch = true
})
@Html.MVCGrid("ItemsGrid")
</div>
</div>
</div>
</div>
+4 -4
View File
@@ -23,7 +23,8 @@
<li>@Html.ActionLink("Home", "Index", "Home")</li>
@*<li>@Html.ActionLink("About", "About", "Home")</li>
<li>@Html.ActionLink("Contact", "Contact", "Home")</li>*@
<li class="dropdown">
<li>@Html.ActionLink("Anagrafica Articoli", "Index", "Items")</li>
@*<li class="dropdown">
<a href="" class="dropdown-toggle" data-toggle="dropdown">
Articoli
<b class="caret"></b>
@@ -31,9 +32,8 @@
<ul class="dropdown-menu">
<li>@Html.ActionLink("Articoli", "Index", "Items")</li>
<li>@Html.ActionLink("Articoli GridMVC", "Grid", "Items")</li>
<li>@Html.ActionLink("Articoli MVCGrid", "MVCGrid", "Items")</li>
</ul>
</li>
</li>*@
<li>@Html.ActionLink("Magazzino Articoli", "Index", "ItemStockStatus")</li>
@*<li>@Html.ActionLink("Stock", "Index", "ItemStocks")</li>
<li>@Html.ActionLink("Flux", "Index", "ItemFluxes")</li>*@
@@ -72,7 +72,7 @@
<!-- Be sure this is after jquery reference -->
<script src="~/MVCGridHandler.axd/script.js"></script>
@Scripts.Render("~/bundles/jqbootgrid")
@*@Scripts.Render("~/bundles/jqbootgrid")*@
@RenderSection("scripts", required: false)
</body>
Binary file not shown.
+1
View File
@@ -3,6 +3,7 @@
<package id="Antlr" version="3.5.0.2" targetFramework="net462" />
<package id="bootstrap" version="3.3.7" targetFramework="net462" />
<package id="EntityFramework" version="6.1.3" targetFramework="net462" />
<package id="FontAwesome" version="4.6.3" targetFramework="net462" />
<package id="Glimpse" version="1.8.6" targetFramework="net462" />
<package id="Glimpse.Ado" version="1.7.3" targetFramework="net462" />
<package id="Glimpse.AspNet" version="1.9.2" targetFramework="net462" />