AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- contratos. acomodo de columnas y en clase cambio de tipo de dato entero a decimal

Browse Source
This commit is contained in:
rrene
2021-08-03 19:32:07 -07:00
parent 5eaf92aeed
commit fc203ec106
5 changed files with 296 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App_Code/ClsContratos.vb
View File

@@ -1345,7 +1345,7 @@ Public Class ClsContratos
With SqlAdapter.SelectCommand.Parameters With SqlAdapter.SelectCommand.Parameters
.Add("@CveContrato", SqlDbType.Int).Value = CveContrato .Add("@CveContrato", SqlDbType.Int).Value = CveContrato
.Add("@CveContratoDetalle", SqlDbType.Int).Value = CveContratoDetalle .Add("@CveContratoDetalle", SqlDbType.Int).Value = CveContratoDetalle
.Add("@Cantidad", SqlDbType.Int).Value = Cantidad .Add("@Cantidad", SqlDbType.Decimal).Value = Cantidad
.Add("@Fecha", SqlDbType.Date).Value = Fecha .Add("@Fecha", SqlDbType.Date).Value = Fecha
.Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario
.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa

84
Contratos/ContratoAvance.aspx
View File

@@ -4,28 +4,7 @@
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server">
<style> <style>
table.GVEstimacion{
width:100%;
}
.txtimporte{
/*background: transparent;*/
/*border: none;*/
}
.txtcant,.txtimporte,
table.GVEstimacion > tbody > tr > td,
table.GVEstimacion > tbody > tr > th{
text-align:right;
}
table.GVEstimacion > tbody > tr > th,
table.GVEstimacion > tbody > tr > td{
width:100px;
}
table.GVEstimacion > tbody > tr > th:nth-child(1),
table.GVEstimacion > tbody > tr > td:nth-child(1){
width:300px;
text-align:left;
}
.ddls { .ddls {
max-width:220px; max-width:220px;
} }
@@ -85,8 +64,8 @@
Fecha: Fecha:
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 120px !important; padding: 0px;"> <div class="input-group input-sm input-small date date-picker " data-date-format="dd/mm/yyyy" style="width: 90px !important; padding: 0px;">
<asp:TextBox ID="TxtFecha" runat="server" CssClass="form-control" CausesValidation="true" Style="width: 118px" MaxLength="10"></asp:TextBox> <asp:TextBox ID="TxtFecha" runat="server" CssClass="form-control" CausesValidation="true" Style="width: 88px" MaxLength="10"></asp:TextBox>
<span class="input-group-btn "> <span class="input-group-btn ">
<asp:LinkButton ID="ImgFecha" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton> <asp:LinkButton ID="ImgFecha" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
</span> </span>
@@ -113,18 +92,18 @@
<table class="table table-striped Widthall"> <table class="table table-striped Widthall">
<tr> <tr>
<th style="width: 400px;"></th> <th style=""></th>
<th style="width: 100px;"></th>
<th style="width: 100px;"></th>
<th style="width: 100px;"></th>
<th style="width: 100px;"></th>
<th style="width: 100px;"></th>
<th style="width: 100px;"></th> <th style="width: 100px;"></th>
<th style="width: 100px;"></th> <th style="width: 100px;"></th>
<th style="width: 100px;"></th> <th style="width: 100px;"></th>
<th style="width: 120px;"></th>
<th style="width: 120px;"></th>
<th style="width: 120px;"></th>
<th style="width: 50px;"></th>
<th style="width: 50px;"></th>
</tr> </tr>
<tr> <tr>
<th>Producto / Servicio</th> <th>Concepto</th>
<th colspan="2">Avance</th> <th colspan="2">Avance</th>
<th colspan="2">Ultimo Avance</th> <th colspan="2">Ultimo Avance</th>
<th colspan="2">Levantamiento</th> <th colspan="2">Levantamiento</th>
@@ -138,7 +117,7 @@
<asp:GridView ID="Gv" runat="server" AutoGenerateColumns="false" EmptyDataText="No se encontraron partidas para levantar avance" <asp:GridView ID="Gv" runat="server" AutoGenerateColumns="false" EmptyDataText="No se encontraron partidas para levantar avance"
DataKeyNames="CveFamilias,CveSubFamilias,CveContratoDetalle,PS,Cantidad,Importe,Cantidad_Ultima,Importe_Ultima,PU,CantidadMax,Avance" DataKeyNames="CveFamilias,CveSubFamilias,CveContratoDetalle,PS,Cantidad,Importe,Cantidad_Ultima,Importe_Ultima,PU,CantidadMax,Avance"
CssClass="table GVEstimacion table-advance table-hover mysmallbtn" GridLines="None"> CssClass="table table-advance table-hover mysmallbtn" GridLines="None">
<Columns> <Columns>
<asp:TemplateField HeaderText=""> <asp:TemplateField HeaderText="">
<ItemTemplate> <ItemTemplate>
@@ -147,58 +126,53 @@
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad Total"> <asp:TemplateField HeaderText="Cant. Total" ItemStyle-Width="80px" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate >
<span><%# Eval("CantidadTotal", "{0:N2}")%></span> <span><%# Eval("CantidadTotal", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="UM"> <asp:TemplateField HeaderText="UM" ItemStyle-Width="60px">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Abreviatura")%></span> <span><%# Eval("Abreviatura")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="80px" ItemStyle-HorizontalAlign="Right">
<asp:TemplateField HeaderText="Cantidad">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Cantidad", "{0:N2}")%></span> <span><%# Eval("Cantidad", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe"> <asp:TemplateField HeaderText="Importe" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Importe", "{0:N2}")%></span> <span><%# Eval("Importe", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad"> <asp:TemplateField HeaderText="Cantidad" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Cantidad_Ultima", "{0:N2}")%></span> <span><%# Eval("Cantidad_Ultima", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe"> <asp:TemplateField HeaderText="Importe" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Importe_Ultima", "{0:N2}")%></span> <span><%# Eval("Importe_Ultima", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad"> <asp:TemplateField HeaderText="Cantidad" ItemStyle-Width="70px" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtCantidad" Text="" CssClass="txtcant" type="number" step="any" data-cantidad='<%# Eval("CantidadMax")%>' data-pu='<%# Eval("PU")%>' data-cve='<%# Eval("CveContratoDetalle") %>' Width="90" runat="server"></asp:TextBox> <asp:TextBox ID="TxtCantidad" Text="" CssClass="txtcant" type="number" step="any" data-cantidad='<%# Eval("CantidadMax")%>' data-pu='<%# Eval("PU")%>' data-cve='<%# Eval("CveContratoDetalle") %>' Width="70" runat="server"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe"> <asp:TemplateField HeaderText="Importe" ItemStyle-Width="90px" ItemStyle-HorizontalAlign="Right">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtImporte" Text="" CssClass="txtimporte" data-cve='<%# Eval("CveContratoDetalle") %>' type="number" step="any" Width="90" runat="server"></asp:TextBox> <asp:TextBox ID="TxtImporte" Text="" CssClass="txtimporte" data-cve='<%# Eval("CveContratoDetalle") %>' type="number" step="any" Width="90" runat="server"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Porcentaje" ItemStyle-Width="50px">
<asp:TemplateField HeaderText="Porcentaje">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtPorcentaje" Text="" CssClass="txtporcentaje" data-cve='<%# Eval("CveContratoDetalle") %>' type="number" step="any" Width="90" runat="server"></asp:TextBox> <asp:TextBox ID="TxtPorcentaje" Text="" CssClass="txtporcentaje" data-cve='<%# Eval("CveContratoDetalle") %>' type="number" step="any" Width="70" runat="server"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText=" "> <asp:TemplateField HeaderText=" ">
<ItemTemplate> <ItemTemplate>
@@ -231,15 +205,11 @@
</div> </div>
</div> </div>
</div> </div>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText=" ">
<asp:TemplateField HeaderText="">
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="LnkGuardarAvance" Text="Guardar" CssClass="btn btn-primary" runat="server" OnClick="LnkGuardarAvance_Click" Visible="false" Height="30px" ValidationGroup="GrpGuardar"></asp:LinkButton> <asp:LinkButton ID="LnkGuardarAvance" Text="" CssClass="btn btn-primary btn-sm" runat="server" OnClick="LnkGuardarAvance_Click" Visible="false" ValidationGroup="GrpGuardar" ToolTip="Guardar"><i class='fa fa-save'></i></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
@@ -260,12 +230,6 @@
</asp:UpdatePanel> </asp:UpdatePanel>
<div class="modal fade " id="dropmodal"> <div class="modal fade " id="dropmodal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content "> <div class="modal-content ">

8
Contratos/ContratoAvance.aspx.vb
View File

@@ -194,8 +194,6 @@ Partial Class Contratos_ContratoAvance
e.Row.FCTextBox("TxtPorcentaje").Visible = False e.Row.FCTextBox("TxtPorcentaje").Visible = False
'txtimporte 'txtimporte
e.Row.FCLinkButton("LnkAnexo").Visible = False e.Row.FCLinkButton("LnkAnexo").Visible = False
@@ -241,13 +239,7 @@ Partial Class Contratos_ContratoAvance
LnkGuardarAvance.Visible = False LnkGuardarAvance.Visible = False
End If End If
End If End If
End If End If
End Sub End Sub
Protected Sub GetAnexos(sender As Object, e As System.EventArgs) Protected Sub GetAnexos(sender As Object, e As System.EventArgs)

2
Contratos/ContratoObra.aspx
View File

@@ -309,7 +309,7 @@
<ContentTemplate> <ContentTemplate>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="portlet smmallpadding light bordered"> <div class="portlet smallpadding light bordered">
<div class="portlet-title"> <div class="portlet-title">
<div class="tools"> <div class="tools">
<a href="javascript;" data-idchekbox="C_chkexpand" class=" collapse" data-original-title="" title=""></a><span class="hidden"> <a href="javascript;" data-idchekbox="C_chkexpand" class=" collapse" data-original-title="" title=""></a><span class="hidden">

73
Contratos/ContratoObraAutorizacion.aspx
View File

@@ -1,54 +1,56 @@
<%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="ContratoObraAutorizacion.aspx.vb" Inherits="Contratos_ContratoObraAutorizacion" %> <%@ Page Title="" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="ContratoObraAutorizacion.aspx.vb" Inherits="Contratos_ContratoObraAutorizacion" %>
<asp:Content ID="Content1" ContentPlaceHolderID="CP" Runat="Server"> <asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" Runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
<style> <style>
table.GVEstimacion{ table.GVEstimacion {
width:100%; width: 100%;
} }
.txtimporte{
.txtimporte {
background: transparent; background: transparent;
border: none; border: none;
} }
.txtcant,.txtimporte, .txtcant, .txtimporte,
table.GVEstimacion > tbody > tr > td, table.GVEstimacion > tbody > tr > td,
table.GVEstimacion > tbody > tr > th{ table.GVEstimacion > tbody > tr > th {
text-align:right; text-align: right;
} }
table.GVEstimacion > tbody > tr > th, table.GVEstimacion > tbody > tr > th,
table.GVEstimacion > tbody > tr > td{ table.GVEstimacion > tbody > tr > td {
width:100px; width: 100px;
} }
table.GVEstimacion > tbody > tr > th:nth-child(1), table.GVEstimacion > tbody > tr > th:nth-child(1),
table.GVEstimacion > tbody > tr > td:nth-child(1){ table.GVEstimacion > tbody > tr > td:nth-child(1) {
width:300px; width: 300px;
text-align:left; text-align: left;
} }
.ddls { .ddls {
max-width:220px; max-width: 220px;
} }
.linkfile input{
display:none .linkfile input {
display: none
} }
</style> </style>
<link href="/Metronic/assets/global/plugins/dropzone/css/dropzone.css" rel="stylesheet"/> <link href="/Metronic/assets/global/plugins/dropzone/css/dropzone.css" rel="stylesheet" />
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="E" Runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="E" runat="Server">
Autorización de Avance Autorización de Avance
</asp:Content> </asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="HB" Runat="Server"> <asp:Content ID="Content4" ContentPlaceHolderID="HB" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="H" Runat="Server"> <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content6" ContentPlaceHolderID="C" runat="Server"> <asp:Content ID="Content6" ContentPlaceHolderID="C" runat="Server">
<asp:UpdatePanel runat="server" ID="UpEstimaciones" UpdateMode="Conditional"> <asp:UpdatePanel runat="server" ID="UpEstimaciones" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
@@ -81,12 +83,11 @@
<div class="row"> <div class="row">
<div class="col-md-6" style="text-align: right!important"> <div class="col-md-6" style="text-align: right!important">
</div> </div>
<div class="col-md-6" style="text-align:right!important"> <div class="col-md-6" style="text-align: right!important">
<div style="display: inline-block"> <div style="display: inline-block">
<input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvEstimaciones.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px; height: 25px; border-color: #89C4F4;" /> <input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvEstimaciones.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px; height: 25px; border-color: #89C4F4;" />
<a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvEstimaciones.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a> <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvEstimaciones.ClientID) %>" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
@@ -121,12 +122,12 @@
<span><%# Eval("Importe", "{0:N2}")%></span> <span><%# Eval("Importe", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Cantidad"> <asp:TemplateField HeaderText="Ult. Cantidad">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Cantidad_Ultima", "{0:N2}")%></span> <span><%# Eval("Cantidad_Ultima", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField HeaderText="Importe"> <asp:TemplateField HeaderText="Ult. Importe">
<ItemTemplate> <ItemTemplate>
<span><%# Eval("Importe_Ultima", "{0:N2}")%></span> <span><%# Eval("Importe_Ultima", "{0:N2}")%></span>
</ItemTemplate> </ItemTemplate>
@@ -134,26 +135,20 @@
<asp:TemplateField HeaderText="Acciones"> <asp:TemplateField HeaderText="Acciones">
<ItemTemplate> <ItemTemplate>
<table style="width: 90px!important">
<table style="width: 120px!important">
<tr> <tr>
<td> <td>
<asp:LinkButton ID="LnkAnexo" runat="server" OnClick="GetAnexos" AlternateText="Agregar Anexo" CssClass="btn btn-circle btn-sm btn-success anexo" Text="<i class='fa fa-folder'></i>" Visible="false" /> <asp:LinkButton ID="LnkAnexo" runat="server" OnClick="GetAnexos" AlternateText="Agregar Anexo" CssClass="btn btn-circle btn-sm btn-success anexo" Text="<i class='fa fa-folder'></i>" Visible="false" />
</td> </td>
<td> <td>
<asp:LinkButton ID="LnkEliminarAvance" runat="server" OnClick="LnkEliminarAvance_Click" AlternateText="Agregar Anexo" Visible="false" <asp:LinkButton ID="LnkEliminarAvance" runat="server" OnClick="LnkEliminarAvance_Click" AlternateText="Agregar Anexo" Visible="false"
CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Confimra la elimiancion del avance?" data-btn-ok-label="si" /> CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Confirma la eliminación del avance?" data-btn-ok-label="si" />
</td> </td>
</tr> </tr>
</table> </table>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
</Columns> </Columns>
</asp:GridView> </asp:GridView>
@@ -199,7 +194,7 @@
</div> </div>
<div class="tools"> <div class="tools">
<a href="javascript:;" class="collapse"></a> <a href="javascript:;" class="collapse"></a>
<a href="javascript:$('#dropmodal').modal('hide');" style="color:gray;" ><i class="fa fa-remove"></i></a> <a href="javascript:$('#dropmodal').modal('hide');" style="color: gray;"><i class="fa fa-remove"></i></a>
</div> </div>
</div> </div>
<div class="portlet-body "> <div class="portlet-body ">
@@ -237,9 +232,9 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-md-12" style="text-align:center!important;text-align:center!important" > <div class="col-md-12" style="text-align: center!important; text-align: center!important">
<asp:GridView ID="GvAnexos" AutoGenerateColumns="false" runat="server" ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron archivos" Width="250px" <asp:GridView ID="GvAnexos" AutoGenerateColumns="false" runat="server" ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron archivos" Width="250px"
DataKeyNames="Archivo" CssClass="table GVEstimacion table-advance table-hover" GridLines ="None"> DataKeyNames="Archivo" CssClass="table GVEstimacion table-advance table-hover" GridLines="None">
<Columns> <Columns>
<asp:TemplateField HeaderText="Anexos"> <asp:TemplateField HeaderText="Anexos">
<ItemTemplate> <ItemTemplate>
@@ -275,7 +270,7 @@
<%--<script src="../Scripts/dropzone/dropzone.min.js"></script>--%> <%--<script src="../Scripts/dropzone/dropzone.min.js"></script>--%>
</asp:Content> </asp:Content>
<asp:Content ID="Content7" ContentPlaceHolderID="JS" Runat="Server"> <asp:Content ID="Content7" ContentPlaceHolderID="JS" runat="Server">
<script> <script>