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

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2020-05-07 09:05:08 -07:00
parent b1585f3b22
commit 53899ba025
6 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
App_Code/ClsOIEventos.vb
View File

@@ -221,6 +221,37 @@ Public Class ClsOIEventos
#Region "oieventos2.0"
Public Function UpEventosVinculos(cveEvento As Int32, cveActivoFijo As Int32, cveIE As Int32, cveProspecto As Int32, cveCliente As Int32, cveOS As Int32, cveOC As Int32, cvePersonal As Int32,
cveProveedor As Int32, cveCompra As Int32, cveVenta As Int32, cveContrato As Int32, cveUsuario As Int32, cveSubProyecto As Int32, cveMovimientoAlmacen As Int32,
cveEmpresaCRM As Int32) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_OI_EventosVinculosUp", CommandType.StoredProcedure)
With SqlAdapter.SelectCommand.Parameters
.Add("@CveEvento", SqlDbType.Int, cveEvento)
.Add("@CveActivoFijo", SqlDbType.Int, cveActivoFijo)
.Add("@CveIE", SqlDbType.Int, cveIE)
.Add("@CveProspecto", SqlDbType.Int, cveProspecto)
.Add("@CveCliente", SqlDbType.Int, cveCliente)
.Add("@CveOS", SqlDbType.Int, cveOS)
.Add("@CveOC", SqlDbType.Int, cveOC)
.Add("@CvePersonal", SqlDbType.Int, cvePersonal)
.Add("@CveProveedor", SqlDbType.Int, cveProveedor)
.Add("@CveCompra", SqlDbType.Int, cveCompra)
.Add("@CveVenta", SqlDbType.Int, cveVenta)
.Add("@CveContrato", SqlDbType.Int, cveContrato)
.Add("@CveSubProyecto", SqlDbType.Int, cveSubProyecto)
.Add("@CveMovimientoAlmacen", SqlDbType.Int, cveMovimientoAlmacen)
.Add("@CveEmpresaCRM", SqlDbType.Int, cveEmpresaCRM)
Try
SqlAdapter.Fill(Data)
retorno = True
Catch ex As Exception
OnError("Ocurrió un error al obtener el Catálogo de Evento Usuario.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
End Try
End With
Return retorno
End Function
Public Function GetEventosUsuario2(CveEvento As Integer, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OI_EventosUsuarios2Get")

1
OI/MinutaDetalle.aspx.cs
View File

@@ -832,7 +832,6 @@ public partial class OI_MinutaDetalle : ClsPaginas
StringBuilder StrSB = new StringBuilder();
string DireccionURL = "";// GlobalDTParametros(SisParametros.URL).Cadena1;
string Variables = "";
string Tarea;
string De;

4
UserControl/TareaNueva.ascx
View File

@@ -66,7 +66,7 @@
</div>
<asp:Panel runat="server" CssClass="actions">
<div class="btn-group">
<asp:LinkButton ID="LnkAgregarTarea" OnClick="BtnGuardarTarea_Click" CssClass="btn btn-default" runat="server">Agregar</asp:LinkButton>
<asp:LinkButton ID="LnkAgregarTarea" OnClick="BtnGuardarTarea_Click" ValidationGroup="GrpTarea" CssClass="btn btn-default" runat="server">Agregar</asp:LinkButton>
</div>
</asp:Panel>
</div>
@@ -202,7 +202,7 @@
<asp:Button ID="BtnopenmodalConPadre" OnClick="BtnopenmodalConPadre_Click" CssClass="hidden BtnopenmodalConPadre" UseSubmitBehavior="false" runat="server" Text="Button" />
</asp:Panel>
<asp:Panel runat="server" ID="iddivAgregarTareamodalfooter" CssClass="modal-footer">
<asp:LinkButton ID="BtnGuardarTarea" OnClick="BtnGuardarTarea_Click" CssClass="btn btn-primary" runat="server">Guardar</asp:LinkButton>
<asp:LinkButton ID="BtnGuardarTarea" OnClick="BtnGuardarTarea_Click" CssClass="btn btn-primary" ValidationGroup="GrpTarea" runat="server">Guardar</asp:LinkButton>
<button data-dismiss="modal" class="btn btn-danger">Cancelar</button>
</asp:Panel>
</asp:Panel>

9
Ventas/Clientes.aspx
View File

@@ -4441,12 +4441,19 @@
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Text=" <i class='fa fa-calendar-plus-o font-green' style='font-weight: 700 !important;' >Agendar</i>" Visible="false" Style="cursor: pointer;" ToolTip="Agendar"></asp:HyperLink><br />
<asp:Literal ID="LtlTareaNueva" runat="server"></asp:Literal>
<UserControl:TareaNueva runat="server" id="TareaNueva" />
<script> function OnAddedTareaNueva() {
$('.btnupEventoBitacora').click();
}
</script>
</div>
</div>
</div>
<div class="portlet-body">
<asp:UpdatePanel ID="UPEventoBitacora" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<asp:Button ID="btnupEventoBitacora" OnClick="btnupEventoBitacora_Click" UseSubmitBehavior="false" CssClass="hidden btnupEventoBitacora" runat="server" Text="Button" />
<asp:GridView ID="GvEB" runat="server" AutoGenerateColumns="False" EmptyDataText="No se han capturado comentarios o bitácora" CssClass="table table-striped table-advance table-hover Widthall" GridLines="None">
<Columns>
<asp:TemplateField>
@@ -4470,7 +4477,7 @@
<asp:TemplateField>
<HeaderTemplate>Descripción</HeaderTemplate>
<ItemTemplate>
<asp:Literal ID="LtlEventoBitacora" runat="server" Text='<%# Eval("Descripcion") %>'></asp:Literal>
<asp:Literal ID="LtlEventoBitacora" runat="server" Text='<%#If(Eval("CveTipoEvento").ToString() = "1", String.Format("Tarea :<a href=""/OI/TareaDetalle.aspx?CveEvento={0}"">{1}<a>", Eval("CveEvento"), Eval("Asunto")), Eval("Descripcion").ToString()) %>'></asp:Literal>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>

5
Ventas/Clientes.aspx.vb
View File

@@ -3561,7 +3561,7 @@ Partial Class Clientes
Private Sub CargaEventoBitacora()
Dim ObjEventoBitacora As New ClsOIEventos()
If ObjEventoBitacora.GetAgendaBitacora(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveCliente:=CveCliente) Then
GvEB.DataSource = ObjEventoBitacora.DtResultados.FiltraParametros("CveTipoEvento = 6 OR CveTipoEvento = 2")
GvEB.DataSource = ObjEventoBitacora.DtResultados.FiltraParametros("CveTipoEvento IN(6,2,1)")
Else
GvEB.DataSource = Nothing
End If
@@ -10039,5 +10039,8 @@ Partial Class Clientes
End If
End Sub
Protected Sub btnupEventoBitacora_Click(sender As Object, e As EventArgs)
CargaEventoBitacora()
End Sub
End Class

2
vwd.webinfo
View File

@@ -52,6 +52,8 @@