Michele: modifiche grafiche

This commit is contained in:
michele 2024-10-08 10:48:57 +02:00
parent ecfc109507
commit 4ce271d570
15 changed files with 787 additions and 521 deletions

View File

@ -63,15 +63,13 @@ namespace VirtualTask.Controllers
if (dataIni.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_rapportino.Date >= dataIni.Date).ToList();
ViewData["dataIni"] = dataIni;
//ViewData["dataFin"] = dataFin;
}
else
{
ViewData["dataIni"] = null;
}
if (dataFin.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_rapportino.Date <= dataFin.Date).ToList();
@ -80,7 +78,6 @@ namespace VirtualTask.Controllers
else
{
ViewData["dataFin"] = null;
}
if (!string.IsNullOrEmpty(Codbuono))

View File

@ -78,36 +78,29 @@ namespace VirtualTask.Controllers
{
modelList = modelList.Where(s => s.codice_impianto.Contains(impianto)).ToList();
ViewData["CurrentFilter"] = impianto;
ViewData["impianto"] = impianto;
ViewBag.Impianto = impianto;
}
else
ViewData["CurrentFilter"] = null;
ViewData["impianto"] = null;
if (dataIni.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList();
ViewData["dataIni"] = dataIni;
}
else
ViewData["dataIni"] = null;
if (dataFin.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList();
ViewData["dataFin"] = dataFin;
}
//if (!dataFin.ToString().Substring(0, 10).Equals("01/01/0001"))
//{
// modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date && x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList();
//}
//else
//{
// modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList();
//}
else
ViewData["dataFin"] = null;
if (page != null && page < 1)
{

View File

@ -66,27 +66,36 @@ namespace VirtualTask.Controllers
if (dataIni.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_timbratura.GetValueOrDefault().Date >= dataIni.Date).ToList();
ViewData["dataIni"] = dataIni;
}
else
ViewData["dataIni"] = null;
if (dataFin.Date != DateTime.MinValue)
{
modelList = modelList.Where(x => x.data_timbratura.GetValueOrDefault().Date <= dataFin.Date).ToList();
ViewData["dataFin"] = dataFin;
}
else
ViewData["dataFin"] = null;
if (!string.IsNullOrEmpty(commessa))
{
modelList = modelList.Where(s => s.commessa.Contains(commessa)).ToList();
// ViewData["CurrentFilter"] = commessa;
//ViewBag.Timbrature = commessa;
ViewData["commessa"] = commessa;
}
else
//ViewData["CurrentFilter"] = null;
ViewData["commessa"] = null;
if (!string.IsNullOrEmpty(tecnico))
{
modelList = modelList.Where(s => s.tecnico.ToLower().Contains(tecnico.ToLower())).ToList();
ViewData["tecnico"] = tecnico;
}
else
ViewData["tecnico"] = null;
if (page != null && page < 1)
{

View File

@ -19,22 +19,48 @@
</p>
@using (Html.BeginForm())
{
<div>
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per Rag. Sociale", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per Rag. Sociale", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
</div> *@
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header">Clienti</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
<th>Codice</th>
<th>Rag. Sociale</th>
<th>Codice Fiscale</th>
<th>Partita Iva</th>
<th></th>
</tr>
</thead>
<tbody>
@ -71,6 +97,9 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString=@ViewData["CurrentFilter"] }), new PagedListRenderOptions()

View File

@ -18,14 +18,32 @@
@using (Html.BeginForm())
{
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per tecnico", @class = "agy-form-field require" })</span>
<div>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per tecnico", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
*@
}
<table class="table">

View File

@ -222,6 +222,7 @@
// link = link + item.ser_buono_chiu + ".jpg";
// <td><a href="@link" target="_blank">@item.ser_buono_chiu</a></td>
<td>@item.ser_buono_chiu</td>
}
else
{

View File

@ -19,13 +19,38 @@
</p>
@using (Html.BeginForm())
{
<div>
<div class="card">
<h5 class="card-header">Ricerca</h5>
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require"})</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
</div> *@
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header">Tipi intervento</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
<th>Azienda</th>
@ -69,6 +94,10 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString=@ViewData["CurrentFilter"] }), new PagedListRenderOptions()

View File

@ -20,16 +20,45 @@
@using (Html.BeginForm())
{
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per commessa", @class = "agy-form-field require"})</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per commessa", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
</div> *@
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header">Commesse</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
<th hidden>Seriale Commessa</th>
@ -48,6 +77,7 @@
<th hidden>scala</th>
<th hidden>CAP</th>
<th hidden>provincia</th>
<th></th>
</tr>
</thead>
<tbody>
@ -130,6 +160,10 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString=@ViewData["CurrentFilter"] }), new PagedListRenderOptions()

View File

@ -14,7 +14,11 @@
<p>
<a asp-action="Create" ><img src="~/assets/images/icons8-nuovo-50.png" alt="Crea un nuovo elemento" /></a>
</p>
<table class="table">
<div class="card">
<h5 class="card-header"></h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
@ -36,7 +40,8 @@
</tr>
</thead>
<tbody>
@foreach (var item in Model) {
@foreach (var item in Model)
{
<tr>
<td>
@ -83,4 +88,8 @@
</table>
</div>
</div>
</div>
</div>
</div>

View File

@ -48,7 +48,7 @@
&nbsp;
</div>
<div class="card">
<h5 class="card-header">IMPIANTI</h5>
<h5 class="card-header">Impianti</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>

View File

@ -18,17 +18,43 @@
</p> *@
@using (Html.BeginForm())
{
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per tipo", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per tipo", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
</div> *@
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header">Progressivi</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
<th>Azienda</th>
@ -68,6 +94,9 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString=@ViewData["CurrentFilter"] }), new PagedListRenderOptions()

View File

@ -66,8 +66,9 @@
</div>
<div class="card">
<h5 class="card-header">BUONI INTERVENTO</h5>
<h5 class="card-header">Buoni Intervento</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
@ -235,8 +236,8 @@
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString = @ViewData["CurrentFilter"],
CodBuono = ViewData["Codbuono"], tecnico = @ViewData["tecnico"], dataIni = ViewData["dataIni"], dataFin=@ViewData["dataFin"]}), new PagedListRenderOptions()
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, /* searchString = @ViewData["CurrentFilter"], */
CodBuono = @ViewData["Codbuono"], tecnico = @ViewData["tecnico"], dataIni = @ViewData["dataIni"], dataFin=@ViewData["dataFin"]}), new PagedListRenderOptions()
{
ActiveLiElementClass = "active",
PageClasses = new[]{ "page-link"},

View File

@ -15,47 +15,73 @@
<div class="row">
@using (Html.BeginForm("Index", "Rapportini"))
{
<div>
<div style="float:left;width:40%;padding:0 20px;">
<th><b>Impianto:</b></th>
@Html.DropDownList("impianto", ViewBag.Rapportini, null, new { @class = "agy-form-field require" })
@* <div style="float:left;width:40%;padding:0 20px;"> *@
<th><b>Data da:</b></th>
@Html.TextBox("dataIni", null, new { type = "date", @class = "agy-form-field require" })
@* </div> *@
@* <div style="float:left;width:40%;padding:0 20px;"> *@
<th><b>Data a:</b></th>
@Html.TextBox("dataFin", null, new { type = "date", @class = "agy-form-field require" })
@* </div> *@
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Impianto:</i>
<span class="fw-medium">@Html.DropDownList("impianto", ViewBag.Rapportini, null, new { @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Data da:</i>
<span class="fw-medium">@Html.TextBox("dataIni", null, new { type = "date", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Data a:</i>
<span class="fw-medium">@Html.TextBox("dataFin", null, new { type = "date", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:2%;">&nbsp;</div>
</div>
}
<br>
<br>
<br>
<div style="width:100%;height:30px;">
&nbsp;
</div>
@using (Html.BeginForm("ExportDataToExcel", "Rapportini"))
{
<div class="card">
<h5 class="card-header">Estrai</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
@Html.Hidden("dataIni", ViewBag.Rapportini, null)
@Html.Hidden("dataFin", ViewBag.Rapportini, null)
@Html.Hidden("impianto", ViewBag.Rapportini, null)
<div style="float:left;width:40%;padding:0 20px;">
<input type="submit" value="Esporta excel" name="Esporta excel" class="agy-btn submitForm" />
</td>
<td>
<span class="fw-medium"><input type="submit" value="Esporta excel" name="Esporta excel" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header"></h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
<th>Seriale buono</th>
@ -82,33 +108,19 @@
<td>
@Html.DisplayFor(modelItem => item.codice_impianto)
</td>
@* <td>
@Html.DisplayFor(modelItem => item.seriale_commessa)
</td>
<td>
@Html.DisplayFor(modelItem => item.data_rapportino)
</td>
*@
@* <td>
<a href="@Url.Action("Edit", "Anag", new { id=item.seriale_rapportino })" title="Modifica" class="links">
<img alt="Modifica" src="@Url.Content("~/assets/images/icons8-modificare-64.png")" style="width:30px;height:30px;">
</a>
|
<a href="@Url.Action("Details", "Anag", new { id=item.seriale_rapportino })" title="Dettaglio" class="links">
<img alt="Dettaglio" src="@Url.Content("~/assets/images/icons8-visualizza-file-64.png")" style="width:30px;height:30px;">
</a>
|
<a href="@Url.Action("Delete", "Anag", new { id=item.seriale_rapportino })" title="Elimina" class="links">
<img alt="Elimina" src="@Url.Content("~/assets/images/icons8-elimina-50.png")" style="width:30px;height:30px;">
</a>
</td> *@
</tr>
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString = @ViewData["CurrentFilter"] }), new PagedListRenderOptions()
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, impianto = @ViewData["impianto"], dataIni = @ViewData["dataIni"],
dataFin = @ViewData["dataFin"]}), new PagedListRenderOptions()
{
ActiveLiElementClass = "active",
PageClasses = new[] { "page-link" },

View File

@ -20,14 +20,41 @@
</p>
@using (Html.BeginForm())
{
<div>
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
</div> *@
}
<table class="table">
<div style="width:100%;height:30px;">
&nbsp;
</div>
<div class="card">
<h5 class="card-header">Tecnici</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thread>
<tr>
<th>Codice</th>
@ -39,6 +66,7 @@
<th hidden>Costo notturno</th>
<th hidden>Costo straordinario</th>
<th hidden>Costo festivo</th>
<th></th>
</tr>
</thread>
<tbody>
@ -90,6 +118,10 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString=@ViewData["CurrentFilter"] }), new PagedListRenderOptions()

View File

@ -16,7 +16,45 @@
<div class="row">
@using (Html.BeginForm("Index", "Timbrature"))
{
<div>
<div class="card">
<h5 class="card-header">Ricerca</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Data da:</i>
<span class="fw-medium">@Html.TextBox("dataIni", null, new { type = "date", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Data a:</i>
<span class="fw-medium">@Html.TextBox("dataFin", null, new { type = "date", @class = "agy-form-field require" })</span>
</td>
<td>
&nbsp;
</td>
</tr>
<tr>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Commessa:</i>
<span class="fw-medium">@Html.DropDownList("commessa", ViewBag.Timbrature, null, new { @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">Tecnico:</i>
<span class="fw-medium">@Html.TextBox("tecnico", null, new { placeholder = "", @class = "agy-form-field require" })</span>
</td>
<td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
<span class="fw-medium"><input type="submit" value="Cerca" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
@* <div>
<div style="float:left;width:40%;padding:0 20px;">
<th><b>Data da:</b></th>
@ -38,27 +76,55 @@
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:2%;">&nbsp;</div>
</div>
</div> *@
}
<div style="width:100%;height:30px;">
&nbsp;
</div>
@* <br>
<br>
<br>
<br>
<br> *@
@using (Html.BeginForm("ExportExcel", "Timbrature"))
{
<div class="card">
<h5 class="card-header">Estrai</h5>
<div class="table-responsive text-nowrap">
<table class="table">
<tbody class="table-border-bottom-0">
<tr>
<td>
@Html.Hidden("dataIni", ViewBag.Timbrature, null)
@Html.Hidden("dataFin", ViewBag.Timbrature, null)
@Html.Hidden("commessa", ViewBag.Timbrature, null)
@Html.Hidden("tecnico", ViewBag.Timbrature, null)
</td>
<td>
<span class="fw-medium"><input type="submit" value="Esporta excel" name="Esporta excel" class="agy-btn submitForm" /></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
@*
<div style="float:left;width:40%;padding:0 20px;">
<input type="submit" value="Esporta excel" name="Esporta excel" class="agy-btn submitForm" />
</div>
</div> *@
}
<div style="width:100%;height:30px;">
&nbsp;
</div>
<table class="table">
<div class="card">
<h5 class="card-header">Timbrature</h5>
<div class="table-responsive text-nowrap">
<table class="table table-striped">
<thead>
<tr>
@ -72,9 +138,11 @@
<th>Totale ore</th>
<th>Giorno sett.</th>
<th>Tecnico</th>
<th></th>
<th hidden>Id</th>
<th hidden>Azienda</th>
<th hidden>Note</th>
</tr>
</thead>
<tbody>
@ -105,9 +173,14 @@
}
</tbody>
</table>
</div>
</div>
<br />
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString = @ViewData["CurrentFilter"] }), new PagedListRenderOptions()
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, commessa=@ViewData["commessa"],
tecnico=@ViewData["tecnico"], dataIni=@ViewData["dataIni"], dataFin=@ViewData["dataFin"]/* searchString = @ViewData["CurrentFilter"] */ }), new PagedListRenderOptions()
{
ActiveLiElementClass = "active",
PageClasses = new[] { "page-link" },