From 97987ef25758fe13f8c1bcf35541a6a7374e205b Mon Sep 17 00:00:00 2001
From: rakcsle <rakcsle.rakcsle@gmail.com>
Date: Tue, 28 Sep 2021 20:11:40 -0700
Subject: [PATCH] =?UTF-8?q?Contratos,=20tama=C3=B1os=20fuente=20indicadore?=
 =?UTF-8?q?s,=20foramto=20numero=20avance=20a=20dos=20decimales?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Contratos/ContratoObra.aspx                   | 19 ++++++++-----------
 Contratos/RepContratosObraAvances.aspx        | 12 ++++++------
 Contratos/RepContratosObraAvancesDetalle.aspx | 12 ++++++------
 .../RepContratosObraAvancesDetalle.aspx.vb    |  6 ++++--
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Contratos/ContratoObra.aspx b/Contratos/ContratoObra.aspx
index fb9be9b1a..546f57bcf 100644
--- a/Contratos/ContratoObra.aspx
+++ b/Contratos/ContratoObra.aspx
@@ -172,11 +172,8 @@
                                         <div class="icon">
                                             <i class="fa fa-list-ol"></i>
                                         </div>
-
                                     </div>
-
                                 </div>
-
                             </div>
 
 
@@ -1298,35 +1295,35 @@
                                                                 <Columns>
                                                                     <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="Importe $" DataField="ContratoImporte" 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:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
                                                                         <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>
                                                                     </asp:TemplateField>
                                                                     <asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
                                                                         <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>
                                                                     </asp:TemplateField>
                                                                     <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="Importe $" DataField="FaltanteImporte" 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="%" DataField="FaltantePorcentaje" ItemStyle-HorizontalAlign="Right"   ItemStyle-Width="5%" />
 
 
                                                                     
                                                                     <asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
                                                                         <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>
                                                                     </asp:TemplateField>
                                                                     <asp:TemplateField HeaderText="Importe $" ItemStyle-Width="7.5%" ItemStyle-CssClass="Derecha">
                                                                         <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>
                                                                     </asp:TemplateField>
 
diff --git a/Contratos/RepContratosObraAvances.aspx b/Contratos/RepContratosObraAvances.aspx
index 13488ad15..80af972f4 100644
--- a/Contratos/RepContratosObraAvances.aspx
+++ b/Contratos/RepContratosObraAvances.aspx
@@ -106,7 +106,7 @@
                                                 <div class="number" style="display: none!important">
                                                     <small>Contratos</small>
                                                     <h3 class="font-purple-soft">
-                                                        <span>
+                                                        <span style="font-size: large" >
                                                             <asp:Literal Text="0" ID="LtlGrafNumeroContratos" runat="server" /></span>
                                                     </h3>
 
@@ -115,7 +115,7 @@
                                                 <div class="number">
                                                     <small>Total</small>
                                                     <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>
                                                 </div>
 
@@ -140,7 +140,7 @@
                                     <td>
                                         <small>Avance</small>
                                         <h3 class="font-green-sharp">
-                                        <span>
+                                        <span style="font-size: large" >
                                                 <asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" />
                                         </span>
                                         <small class="font-green-sharp"></small>
@@ -150,7 +150,7 @@
                                     <td>
                                         <small>Porcentaje</small>
                                         <h3 class="font-green-sharp">
-                                        <span>
+                                        <span style="font-size: large" >
                                             <asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" />
                                         </span>
                                         <small class="font-green-sharp"></small>
@@ -192,7 +192,7 @@
                                     <td>
                                         <small>Faltante</small>
                                         <h3 class="font-red-haze">
-                                        <span>
+                                        <span style="font-size: large" >
                                                 <asp:Literal Text="0" ID="LtlFaltanteImporte" runat="server" />
                                         </span>
                                         <small class="font-red-haze"></small>
@@ -202,7 +202,7 @@
                                     <td>
                                         <small>Porcentaje</small>
                                         <h3 class="font-red-haze">
-                                        <span>
+                                        <span style="font-size: large" >
                                             <asp:Literal Text="0" ID="LtlFaltanteImportePorcentaje1" runat="server" />
                                         </span>
                                         <small class="font-red-haze"></small>
diff --git a/Contratos/RepContratosObraAvancesDetalle.aspx b/Contratos/RepContratosObraAvancesDetalle.aspx
index 88c16a484..dcbf5b694 100644
--- a/Contratos/RepContratosObraAvancesDetalle.aspx
+++ b/Contratos/RepContratosObraAvancesDetalle.aspx
@@ -29,7 +29,7 @@
                                                 <div class="number" style="display: none!important">
                                                     <small>Numero Estimaciones</small>
                                                     <h3 class="font-purple-soft">
-                                                        <span>
+                                                        <span style="font-size: large" >
                                                             <asp:Literal Text="0" ID="LtlGrafNumeroEstimaciones2" runat="server" /></span>
                                                     </h3>
 
@@ -38,7 +38,7 @@
                                                 <div class="number">
                                                     <small>Numero Estimaciones</small>
                                                     <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>
                                                 </div>
 
@@ -63,7 +63,7 @@
                                     <td>
                                         <small>Avance</small>
                                         <h3 class="font-green-sharp">
-                                        <span>
+                                        <span style="font-size: large">
                                                 <asp:Literal Text="0" ID="LtlAvanceImporte" runat="server" />
                                         </span>
                                         <small class="font-green-sharp"></small>
@@ -73,7 +73,7 @@
                                     <td>
                                         <small>Porcentaje</small>
                                         <h3 class="font-green-sharp">
-                                        <span>
+                                        <span style="font-size: large" >
                                             <asp:Literal Text="0" ID="LtlAvanceImporteProcentaje1" runat="server" />
                                         </span>
                                         <small class="font-green-sharp"></small>
@@ -115,7 +115,7 @@
                                     <td>
                                         <small>Fecha Fin</small>
                                         <h3 class="font-red-haze">
-                                        <span>
+                                        <span style="font-size: large">
                                                 <asp:Literal Text="0" ID="LtlFechaFin" runat="server" />
                                         </span>
                                         <small class="font-red-haze"></small>
@@ -125,7 +125,7 @@
                                     <td>
                                         <small>Dias Restantes</small>
                                         <h3 class="font-red-haze">
-                                        <span>
+                                        <span style="font-size: large">
                                             <asp:Literal Text="0" ID="LtlDiasRestantes" runat="server" />
                                         </span>
                                         <small class="font-red-haze"></small>
diff --git a/Contratos/RepContratosObraAvancesDetalle.aspx.vb b/Contratos/RepContratosObraAvancesDetalle.aspx.vb
index 384ff2da2..1c1ede262 100644
--- a/Contratos/RepContratosObraAvancesDetalle.aspx.vb
+++ b/Contratos/RepContratosObraAvancesDetalle.aspx.vb
@@ -87,7 +87,7 @@ Partial Class RepContratosObraAvancesDetalle
 
 
         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
         If TotalContratos > 0 Then
@@ -100,6 +100,8 @@ Partial Class RepContratosObraAvancesDetalle
         Dim FechaFinal As Date = DTDatos(0)("FechaFinal").ToString.ToDate
         Dim Dias As Integer = (FechaFinal - Now).Days
 
+
+
         Dias = If(Dias < 0, 0, Dias)
 
         LtlAvanceImporte.Text = $"$ {AvanceImporte.ToString("###,###,###.00")}"
@@ -109,7 +111,7 @@ Partial Class RepContratosObraAvancesDetalle
         SPAvance1.Attributes.Add("style", $"width:{TotalAvancePorcentaje.ToString.ToEntero}%")
 
         LtlFechaFin.Text = FechaFinal.ToString("dd/MM/yyyy")
-        LtlDiasRestantes.Text = Dias.ToString("###,###")
+        LtlDiasRestantes.Text = If(Dias <= 0, "0", Dias.ToString("###,###"))
 
         UpGrafica.Update()