This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2020-05-07 10:10:36 -07:00
parent 53899ba025
commit 6c854da991
2 changed files with 10 additions and 2 deletions

View File

@@ -4133,7 +4133,11 @@
<asp:HyperLink ID="HlEvento" CssClass="thickbox caption-subject bold" runat="server" Visible="false" Style="cursor: pointer; text-decoration: none;" ToolTip="Agendar"><i class='fa fa-calendar-plus-o font-green' style='font-weight: 700 !important;' ></i> <span class="caption-subject bold font-green">Agendar</span></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>
@@ -4142,6 +4146,7 @@
<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>
@@ -4165,7 +4170,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 ItemStyle-Width="50px">

View File

@@ -16869,7 +16869,7 @@ Partial Class Ventas
Dim ObjEventoBitacora As New ClsOIEventos()
If ObjEventoBitacora.GetAgendaBitacora(UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveVenta:=CveVenta) 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
@@ -25423,4 +25423,7 @@ Partial Class Ventas
Public EsPUModificado As Boolean = False
End Class
Protected Sub btnupEventoBitacora_Click(sender As Object, e As EventArgs)
CargaEventoBitacora()
End Sub
End Class