Michele: sggiunte colonne su tabelle

This commit is contained in:
michele 2024-07-30 09:51:48 +02:00
parent 6d97a828cb
commit c5860e556b
4 changed files with 69 additions and 70 deletions

View File

@ -49,32 +49,30 @@
<tbody class="table-border-bottom-0">
@foreach (var item in Model) {
int diffBancali = 0;
string cl = string.Empty;
@if (item.ConsFatta != null)
{
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
string cl = string.Empty;
@if (item.ConsFatta != null)
{
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
@if (item.ConsFatta.consFattaFlagCons != null && item.ConsFatta.consFattaFlagCons.Contains("S"))
{
@*<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:16px;height:16px">*@
cl = "table-success";
}
else
{
cl = "table-danger";
@*<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:16px;height:16px;">*@
}
@if (item.ConsFatta.consFattaFlagCons != null && item.ConsFatta.consFattaFlagCons.Contains("S"))
{
@*<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:16px;height:16px">*@
cl = "table-success";
}
else
{
@* <td>
cl = "table-danger";
@*<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:16px;height:16px;">*@
}
}
else
{
@* <td>
<img alt="notyet" src="@Url.Content("~/images/yellow.png")" style="width:16px;height:16px;">
</td>*@
}
}
<tr class="@cl">
<tr class="@cl">
@* @if (item.ConsFatta != null)
@ -100,83 +98,84 @@
}*@
<td style="font-size:12px;"><i class="bx bxl-angular bx-sm text-danger me-3"></i>@Html.DisplayFor(modelItem => item.Seq)</td>
<td>@Html.DisplayFor(modelItem => item.Committente)</td>
<td>@*@Html.DisplayFor(modelItem => item.CodSede) - *@@Html.DisplayFor(modelItem => item.Sede)</td>
<td>@Html.DisplayFor(modelItem => item.IndirizzoSede)</td>
<td style="font-size:12px;border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i>@Html.DisplayFor(modelItem => item.Seq)</td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.Committente)</td>
<td style="border-right-width:2px">@*@Html.DisplayFor(modelItem => item.CodSede) - *@@Html.DisplayFor(modelItem => item.Sede)</td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.IndirizzoSede)</td>
@if (item.Casse != null && item.Casse > 0)
{
int icasse = 0;
icasse = Convert.ToInt32(item.Casse);
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@icasse
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.Trasf != null && item.Trasf > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => item.Trasf)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.Colli != null && item.Colli > 0)
{
int icolli = 0;
icolli = Convert.ToInt32(item.Colli);
<td style="font-size:12px;">
<td style="font-size:12px;border-right-width:2px">
@icolli
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.num_cons != null && item.num_cons > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px;border-right-width:2px">
@Html.DisplayFor(modelItem => item.num_cons)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.Uova != null && item.Uova > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px;border-right-width:2px">
@Html.DisplayFor(modelItem => item.Uova)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.Cist != null && item.Cist > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px;border-right-width:2px">
@Html.DisplayFor(modelItem => item.Cist)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
<td style="font-size:12px;">
<td style="font-size:12px;border-right-width:2px">
@Html.DisplayFor(modelItem => item.Note)
</td>
@if (item.ConsFatta != null && item.ConsFatta.consFattaBanCar != null && item.ConsFatta.consFattaBanSca!=null)
{
diffBancali = item.ConsFatta.consFattaBanCar.Value - item.ConsFatta.consFattaBanSca.Value;
<td style="text-align:center;">
<td style="text-align:center;border-right-width:2px">
<a href="@Url.ActionLink("Dettaglio","Consegne", new{id = item.Brserial,
codAutista = item.CodAutista,
dataGiro = item.DataCarico,
@ -185,7 +184,7 @@
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (item.ConsFatta == null)
{

View File

@ -24,24 +24,24 @@
@for (var i = 0; i < lst.Count(); i++)
{
<tr>
<td>
<td style="border-right-width:2px">
@Html.CheckBoxFor(a=>lst[i].IsSelected)
</td>
<td>
<td Style="border-right-width:2px">
@Html.DisplayFor(a=>lst[i].DataGiro)
@Html.HiddenFor(a=>lst[i].DataGiro)
</td>
<td>
<td style="border-right-width:2px">
@Html.DisplayFor(a=>lst[i].CodAutista)-@Html.DisplayFor(a=>lst[i].Autista)
@Html.HiddenFor(a=>lst[i].CodAutista)
</td>
<td>
<td style="border-right-width:2px">
@Html.DisplayFor(a=>lst[i].CodMezzo)-@Html.DisplayFor(a=>lst[i].Automezzo)
@Html.HiddenFor(a=>lst[i].CodMezzo)
</td>
<td>
<td style="border-right-width:2px">
<a href="@Url.ActionLink("Index", "Destinazioni", new { id="", codAutista=lst[i].CodAutista, nomeAutista=lst[i].Autista, dataGiro=lst[i].DataGiro, codMezzo=lst[i].CodMezzo, desMezzo=lst[i].Automezzo})" title="Destinazioni" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;"></a>
<a href="@Url.ActionLink("Index", "Destinazioni", new { id="", codAutista=lst[i].CodAutista, nomeAutista=lst[i].Autista, dataGiro=lst[i].DataGiro, codMezzo=lst[i].CodMezzo, desMezzo=lst[i].Automezzo})" title="Destinazioni" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;"></a>
</td>
</tr>
}

View File

@ -86,26 +86,26 @@
totBancaliCaricati = item.BancaliCaricati.Value;
}
<tr>
<td><i class="bx bxl-angular bx-sm text-danger me-3"></i> <span class="fw-medium">@Html.DisplayFor(modelItem => item.DataGiro)</span></td>
<td>@Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista)</td>
<td>
<td style="border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i> <span class="fw-medium">@Html.DisplayFor(modelItem => item.DataGiro)</span></td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista)</td>
<td style="border-right-width:2px">
@Html.DisplayFor(modelItem => item.CodMezzo) - @Html.DisplayFor(modelItem => item.Automezzo)
</td>
<td>
<td style="border-right-width:2px">
@Html.DisplayFor(modelItem => item.DestinazioniFatte)/@Html.DisplayFor(modelItem => item.DestinazioniTutte)
</td>
<td>
<td style="border-right-width:2px">
<span style="color:blue;">@totBancaliCaricati</span>/<span style="color:green;">@Html.DisplayFor(modelItem => item.parzialeBanRec)</span>/<span style="color:brown;">@Html.DisplayFor(modelItem => item.parzialeBanSca)</span>
</td>
@if (item.ImportoDaRecuperare != null && item.ImportoDaRecuperare > 0)
{
<td>
<td style="border-right-width:2px">
@Html.DisplayFor(modelItem => item.ImportoDaRecuperare)/@Html.DisplayFor(modelItem => item.parzialeImpRec)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
<td>

View File

@ -132,80 +132,80 @@
@for (var i = 0; i < modelList.Count(); i++)
{
<tr>
<td style="font-size:12px;"><i class="bx bxl-angular bx-sm text-danger me-3"></i>@Html.DisplayFor(modelItem => modelList[i].Seq)</td>
<td>@Html.DisplayFor(modelItem => modelList[i].Committente)</td>
<td>@Html.DisplayFor(modelItem => modelList[i].Sede)</td>
<td>@Html.DisplayFor(modelItem => modelList[i].IndirizzoSede)</td>
<td style="font-size:12px; border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i>@Html.DisplayFor(modelItem => modelList[i].Seq)</td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => modelList[i].Committente)</td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => modelList[i].Sede)</td>
<td style="border-right-width:2px">@Html.DisplayFor(modelItem => modelList[i].IndirizzoSede)</td>
@if (modelList[i].Casse != null && modelList[i].Casse > 0)
{
int icasse = 0;
icasse = Convert.ToInt32(modelList[i].Casse);
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@icasse
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (modelList[i].Trasf != null && modelList[i].Trasf > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => modelList[i].Trasf)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (modelList[i].Colli != null && modelList[i].Colli > 0)
{
int icolli = 0;
icolli = Convert.ToInt32(modelList[i].Colli);
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@icolli
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (modelList[i].num_cons != null && modelList[i].num_cons > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => modelList[i].num_cons)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (modelList[i].Uova != null && modelList[i].Uova > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => modelList[i].Uova)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
@if (modelList[i].Cist != null && modelList[i].Cist > 0)
{
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => modelList[i].Cist)
</td>
}
else
{
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
}
<td style="font-size:12px;">
<td style="font-size:12px; border-right-width:2px">
@Html.DisplayFor(modelItem => modelList[i].Note)
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
<td style="border-right-width:2px">&nbsp;</td>
@* @if (modelList[i].ConsFatta == null)
{
<td>