Contratos, tamaños fuente indicadores, foramto numero avance a dos decimales

This commit is contained in:
rakcsle
2021-09-28 20:11:40 -07:00
parent ba4543e105
commit 97987ef257
4 changed files with 24 additions and 25 deletions

View File

@@ -172,11 +172,8 @@
<div class="icon"> <div class="icon">
<i class="fa fa-list-ol"></i> <i class="fa fa-list-ol"></i>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -1298,35 +1295,35 @@
<Columns> <Columns>
<asp:BoundField HeaderText="Producto/Servicio" DataField="CodigoPS" ItemStyle-Width="30%" /> <asp:BoundField HeaderText="Producto/Servicio" DataField="CodigoPS" ItemStyle-Width="30%" />
<asp:BoundField HeaderText="Cantidad" DataField="ContratoCantidad" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00##}" ItemStyle-Width="7.5%" /> <asp:BoundField HeaderText="Cantidad" DataField="ContratoCantidad" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00}" ItemStyle-Width="7.5%" />
<asp:BoundField HeaderText="Importe $" DataField="ContratoImporte" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00##}" ItemStyle-Width="7.5%" /> <asp:BoundField HeaderText="Importe $" DataField="ContratoImporte" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00}" ItemStyle-Width="7.5%" />
<asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha"> <asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LBAvanceCantidad" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceCantidad", "{0:###,###,##0.00##}") %>' runat="server" /> <asp:LinkButton ID="LBAvanceCantidad" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceCantidad", "{0:###,###,##0.00}") %>' runat="server" />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha"> <asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LBAvanceImporte" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceImporte", "{0:###,###,##0.00##}") %>' runat="server" /> <asp:LinkButton ID="LBAvanceImporte" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceImporte", "{0:###,###,##0.00}") %>' runat="server" />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:BoundField HeaderText="%" DataField="AvancePorcentaje" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" /> <asp:BoundField HeaderText="%" DataField="AvancePorcentaje" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" />
<asp:BoundField HeaderText="Cantidad" DataField="FaltanteCantidad" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00##}" ItemStyle-Width="7.5%" /> <asp:BoundField HeaderText="Cantidad" DataField="FaltanteCantidad" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00}" ItemStyle-Width="7.5%" />
<asp:BoundField HeaderText="Importe $" DataField="FaltanteImporte" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00##}" ItemStyle-Width="7.5%" /> <asp:BoundField HeaderText="Importe $" DataField="FaltanteImporte" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:###,###,##0.00}" ItemStyle-Width="7.5%" />
<asp:BoundField HeaderText="%" DataField="FaltantePorcentaje" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" /> <asp:BoundField HeaderText="%" DataField="FaltantePorcentaje" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" />
<asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha"> <asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LBAvanceXFacturarCantidad" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceXFacturarCantidad", "{0:###,###,##0.00##}") %>' runat="server" /> <asp:LinkButton ID="LBAvanceXFacturarCantidad" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceXFacturarCantidad", "{0:###,###,##0.00}") %>' runat="server" />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha"> <asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LBAvanceXFacturarImporte" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceXFacturarImporte", "{0:###,###,##0.00##}") %>' runat="server" /> <asp:LinkButton ID="LBAvanceXFacturarImporte" OnClick="MuestaModalVentasAvance" Text='<%# Eval("AvanceXFacturarImporte", "{0:###,###,##0.00}") %>' runat="server" />
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>

View File

@@ -106,7 +106,7 @@
<div class="number" style="display: none!important"> <div class="number" style="display: none!important">
<small>Contratos</small> <small>Contratos</small>
<h3 class="font-purple-soft"> <h3 class="font-purple-soft">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlGrafNumeroContratos" runat="server" /></span> <asp:Literal Text="0" ID="LtlGrafNumeroContratos" runat="server" /></span>
</h3> </h3>
@@ -115,7 +115,7 @@
<div class="number"> <div class="number">
<small>Total</small> <small>Total</small>
<h3 class="font-purple-soft"> <h3 class="font-purple-soft">
<span>$<asp:Literal Text="0" ID="LtlGrafTotal" runat="server" /></span> <span style="font-size: large" >$<asp:Literal Text="0" ID="LtlGrafTotal" runat="server" /></span>
</h3> </h3>
</div> </div>
@@ -140,7 +140,7 @@
<td> <td>
<small>Avance</small> <small>Avance</small>
<h3 class="font-green-sharp"> <h3 class="font-green-sharp">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" /> <asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" />
</span> </span>
<small class="font-green-sharp"></small> <small class="font-green-sharp"></small>
@@ -150,7 +150,7 @@
<td> <td>
<small>Porcentaje</small> <small>Porcentaje</small>
<h3 class="font-green-sharp"> <h3 class="font-green-sharp">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" /> <asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" />
</span> </span>
<small class="font-green-sharp"></small> <small class="font-green-sharp"></small>
@@ -192,7 +192,7 @@
<td> <td>
<small>Faltante</small> <small>Faltante</small>
<h3 class="font-red-haze"> <h3 class="font-red-haze">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlFaltanteImporte" runat="server" /> <asp:Literal Text="0" ID="LtlFaltanteImporte" runat="server" />
</span> </span>
<small class="font-red-haze"></small> <small class="font-red-haze"></small>
@@ -202,7 +202,7 @@
<td> <td>
<small>Porcentaje</small> <small>Porcentaje</small>
<h3 class="font-red-haze"> <h3 class="font-red-haze">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlFaltanteImportePorcentaje1" runat="server" /> <asp:Literal Text="0" ID="LtlFaltanteImportePorcentaje1" runat="server" />
</span> </span>
<small class="font-red-haze"></small> <small class="font-red-haze"></small>

View File

@@ -29,7 +29,7 @@
<div class="number" style="display: none!important"> <div class="number" style="display: none!important">
<small>Numero Estimaciones</small> <small>Numero Estimaciones</small>
<h3 class="font-purple-soft"> <h3 class="font-purple-soft">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlGrafNumeroEstimaciones2" runat="server" /></span> <asp:Literal Text="0" ID="LtlGrafNumeroEstimaciones2" runat="server" /></span>
</h3> </h3>
@@ -38,7 +38,7 @@
<div class="number"> <div class="number">
<small>Numero Estimaciones</small> <small>Numero Estimaciones</small>
<h3 class="font-purple-soft"> <h3 class="font-purple-soft">
<span><asp:Literal Text="0" ID="LtlGrafNumeroEstimaciones" runat="server" /></span> <span style="font-size: large" ><asp:Literal Text="0" ID="LtlGrafNumeroEstimaciones" runat="server" /></span>
</h3> </h3>
</div> </div>
@@ -63,7 +63,7 @@
<td> <td>
<small>Avance</small> <small>Avance</small>
<h3 class="font-green-sharp"> <h3 class="font-green-sharp">
<span> <span style="font-size: large">
<asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" /> <asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" />
</span> </span>
<small class="font-green-sharp"></small> <small class="font-green-sharp"></small>
@@ -73,7 +73,7 @@
<td> <td>
<small>Porcentaje</small> <small>Porcentaje</small>
<h3 class="font-green-sharp"> <h3 class="font-green-sharp">
<span> <span style="font-size: large" >
<asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" /> <asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" />
</span> </span>
<small class="font-green-sharp"></small> <small class="font-green-sharp"></small>
@@ -115,7 +115,7 @@
<td> <td>
<small>Fecha Fin</small> <small>Fecha Fin</small>
<h3 class="font-red-haze"> <h3 class="font-red-haze">
<span> <span style="font-size: large">
<asp:Literal Text="0" ID="LtlFechaFin" runat="server" /> <asp:Literal Text="0" ID="LtlFechaFin" runat="server" />
</span> </span>
<small class="font-red-haze"></small> <small class="font-red-haze"></small>
@@ -125,7 +125,7 @@
<td> <td>
<small>Dias Restantes</small> <small>Dias Restantes</small>
<h3 class="font-red-haze"> <h3 class="font-red-haze">
<span> <span style="font-size: large">
<asp:Literal Text="0" ID="LtlDiasRestantes" runat="server" /> <asp:Literal Text="0" ID="LtlDiasRestantes" runat="server" />
</span> </span>
<small class="font-red-haze"></small> <small class="font-red-haze"></small>

View File

@@ -87,7 +87,7 @@ Partial Class RepContratosObraAvancesDetalle
Dim AvanceImporte As Decimal = DTDatos(0)("AvanceImporte").ToString.ToDecimal Dim AvanceImporte As Decimal = DTDatos(0)("AvanceImporte").ToString.ToDecimal
Dim TotalContratos As Decimal = DTDatos(0)("Importe").ToString.ToDecimal Dim TotalContratos As Decimal = DTDatos(0)("ImporteSubTotal").ToString.ToDecimal
Dim TotalAvancePorcentaje As Decimal = 0 Dim TotalAvancePorcentaje As Decimal = 0
If TotalContratos > 0 Then If TotalContratos > 0 Then
@@ -100,6 +100,8 @@ Partial Class RepContratosObraAvancesDetalle
Dim FechaFinal As Date = DTDatos(0)("FechaFinal").ToString.ToDate Dim FechaFinal As Date = DTDatos(0)("FechaFinal").ToString.ToDate
Dim Dias As Integer = (FechaFinal - Now).Days Dim Dias As Integer = (FechaFinal - Now).Days
Dias = If(Dias < 0, 0, Dias) Dias = If(Dias < 0, 0, Dias)
LtlAvanceImporte.Text = $"$ {AvanceImporte.ToString("###,###,###.00")}" LtlAvanceImporte.Text = $"$ {AvanceImporte.ToString("###,###,###.00")}"
@@ -109,7 +111,7 @@ Partial Class RepContratosObraAvancesDetalle
SPAvance1.Attributes.Add("style", $"width:{TotalAvancePorcentaje.ToString.ToEntero}%") SPAvance1.Attributes.Add("style", $"width:{TotalAvancePorcentaje.ToString.ToEntero}%")
LtlFechaFin.Text = FechaFinal.ToString("dd/MM/yyyy") LtlFechaFin.Text = FechaFinal.ToString("dd/MM/yyyy")
LtlDiasRestantes.Text = Dias.ToString("###,###") LtlDiasRestantes.Text = If(Dias <= 0, "0", Dias.ToString("###,###"))
UpGrafica.Update() UpGrafica.Update()