From b339887f6546ef210deddfa17ad703dc6ca82236 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Thu, 30 Apr 2020 14:52:54 -0700 Subject: [PATCH] --- App_Code/ClsOIEventos.vb | 717 +++++++++++++++++++++++++++++++++++- App_Code/ClsPaginas.vb | 2 + App_Code/ClsSisMail.vb | 4 +- App_Code/Notificaciones.vb | 12 +- Bin/APP_Code_CSharp.dll | Bin 297472 -> 297472 bytes Bin/APP_Code_CSharp.pdb | Bin 595456 -> 595456 bytes LogIn.aspx | 17 +- LogIn.aspx.vb | 31 +- OI/CircularDetalleB.aspx.cs | 5 +- OI/MinutaDetalle.aspx | 266 +++++++++++++ OI/MinutaDetalle.aspx.cs | 40 ++ OI/RepTareas2.aspx | 438 ++++------------------ OI/RepTareas2.aspx.cs | 7 - OI/RepTareas3.aspx | 384 +++++++++++++++++++ OI/RepTareas3.aspx.cs | 22 ++ OI/TareaDetalle.aspx | 75 ++-- OI/TareaDetalle.aspx.cs | 545 +++++++++++++++++++++------ Scripts/Notificaciones.js | 136 ++++--- Scripts/custom.js | 6 +- 19 files changed, 2122 insertions(+), 585 deletions(-) create mode 100644 OI/MinutaDetalle.aspx create mode 100644 OI/MinutaDetalle.aspx.cs create mode 100644 OI/RepTareas3.aspx create mode 100644 OI/RepTareas3.aspx.cs diff --git a/App_Code/ClsOIEventos.vb b/App_Code/ClsOIEventos.vb index adbc2cd08..d717980dc 100644 --- a/App_Code/ClsOIEventos.vb +++ b/App_Code/ClsOIEventos.vb @@ -180,10 +180,377 @@ Public Class ClsOIEventos Public Sub Commit() SqlTransacc.Commit() End Sub +#Region "Correo" + Private Function GetDominio() As String + Return HttpContext.Current.Request.Url.ToString().Replace(HttpContext.Current.Request.Url.PathAndQuery, "") + End Function + Private Function MailgetBodyNuevatarea(Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" NUEVA TAREA ASIGNADA") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyActualizartarea(Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" TAREA ACTUALIZADA") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyActualizararchivo(Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" TAREA ACTUALIZADA(Nuevo Archivo)") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyActualizarAvance(Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" TAREA ACTUALIZADA(Avance)") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyTareaComentario(Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" NUEVO COMENTARIO EN TAREA") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyTareaCheckList(Actividad As String, Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" TAREA (@Actividad@)") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Actividad@", Actividad).Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + + Private Function MailgetBodyActualizarEstado(Estatus As String, Folio As Integer, Link As String, Asunto As String, Descripcion As String, Fechai As String, Fechaf As String, Prioridad As String, Tema As String) As String + + Dim strSQL As New StringBuilder + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("

") + strSQL.AppendLine(" TAREA NUEVO ESTADO (@Estatus@)") + strSQL.AppendLine("
Folio : @Folio@
") + strSQL.AppendLine("
") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine(" ") + strSQL.AppendLine("
Asunto
@Asunto@
Descripción
@Descripcion@
Fecha Inicio
@Fechai@
Fecha Fin
@Fechaf@
Prioridad
@Prioridad@
Tema
@Tema@
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + strSQL.AppendLine("
SIG Notificaciones
") + strSQL.AppendLine("
") + strSQL.AppendLine("
") + Return strSQL.ToString().Replace("@Estatus@", Estatus).Replace("@Folio@", Folio.ToString()).Replace("@Link@", Link).Replace("@Asunto@", Asunto).Replace("@Descripcion@", Descripcion).Replace("@Fechai@", Fechai).Replace("@Fechaf@", Fechaf).Replace("@Prioridad@", Prioridad).Replace("@Tema@", Tema) + End Function + +#End Region + + Public Sub EnviarCorreo(ByVal ObjEmpresa As Empresa, Asunto As String, body As String, Para As String, ArrayCC As String) + + Dim a As String = String.Format("{0} -- {1} --- {2}", Asunto, Para, ArrayCC) + a.GuardaLog() + + Dim Mail As New ClsSisMail() + Dim LSRutasMail As New List(Of ClsSisMail.ArchivoMail) + Dim itemMail As New ClsSisMail.ArchivoMail + + 'With itemMail + ' itemMail.ArchivoBinario = ArchivoBinario + ' itemMail.NombreArchivo = NombreArchivo + + 'End With + + 'LSRutasMail.Add(itemMail) + + + Mail.SendMail(ClsPaginas.EmpresaNotificaciones, Para, Asunto, body, ArrayCC, LSRutasMail) + Mail = Nothing + End Sub #Region "oieventos2.0" + Public Function GetEventosUsuario2(CveEvento As Integer, CveEmpresa As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("PA_OI_EventosUsuarios2Get") + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEvento", SqlDbType.Int).Value = CveEvento + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + 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 + Return Retorno + End Function + + Public Function UpUsuarioseventosVisto(CveEvento As Integer, CveUsuario As Integer) As Boolean + Dim Retorno As Boolean = False + DataAdapter("UPDATE OI_EventosUsuarios SET Visto=1 WHERE CveEvento =@CveEvento AND CveUsuario=@CveUsuario", CommandType.Text) + + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEvento", SqlDbType.Int).Value = CveEvento + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + End With + 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 + Return Retorno + End Function Public Function GetEventos2(cveEvento As Int32, CveEmpresa As Integer) As Boolean Dim retorno As Boolean = False DataAdapter("PA_OI_Eventos2Get", CommandType.StoredProcedure) @@ -201,10 +568,28 @@ Public Class ClsOIEventos End Function - Public Function AddOI_Eventos2(cveTipoEvento As OITipoEventos, asunto As String, descripcion As String, prioridad As Int32, cveUsuarioDe As Int32, cveUsuarioPara As Int32, - fechaInicio As String, fechaFin As String, cveRevision As Int32, archivo As String, cveUsuarioIng As Int32, cveEmpresa As Int32) As Boolean + fechaInicio As String, fechaFin As String, cveRevision As Int32, archivo As String, Lmiembros As List(Of Integer), chkList As List(Of String), + cveUsuarioIng As Int32, cveEmpresa As Int32, oempresa As Empresa, Optional CveEventoPadre As Integer = -1) As Boolean Dim retorno As Boolean = False + + Dim xmlMiembros As System.Xml.Linq.XDocument = Nothing + 'xmlMiembros = New System.Xml.Linq.XDocument(New System.Xml.Linq.XElement("CCPara", Lmiembros.Select(x >= New System.Xml.Linq.XElement("CveUsuario", x))) + If Lmiembros IsNot Nothing AndAlso Lmiembros.Count > 0 Then + If Not cveUsuarioPara.Contiene(Lmiembros.ToArray()) Then + Lmiembros.Add(cveUsuarioPara) + End If + If Not cveUsuarioDe.Contiene(Lmiembros.ToArray()) Then + Lmiembros.Add(cveUsuarioDe) + End If + xmlMiembros = New System.Xml.Linq.XDocument(New System.Xml.Linq.XElement("CCPara", Lmiembros.[Select](Function(x) New System.Xml.Linq.XElement("CveUsuario", x)))) + End If + Dim xmlChkList As System.Xml.Linq.XDocument = Nothing + If chkList IsNot Nothing AndAlso chkList.Count > 0 Then + xmlChkList = New System.Xml.Linq.XDocument(New System.Xml.Linq.XElement("CheckList", chkList.[Select](Function(x) New System.Xml.Linq.XElement("Actividad", x)))) + End If + + DataAdapter("PA_OI_Eventos2Add", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters .Add("@CveEvento", SqlDbType.Int).Direction = ParameterDirection.Output @@ -220,39 +605,163 @@ Public Class ClsOIEventos .Add("@cveRevision", SqlDbType.Int).Value = cveRevision .Add("@archivo", SqlDbType.VarChar).Value = archivo .Add("@cveUsuarioIng", SqlDbType.Int).Value = cveUsuarioIng + .Add("@xmlMiembros", SqlDbType.Xml).Value = If(xmlMiembros Is Nothing, DBNull.Value, DirectCast(xmlMiembros.ToString(), Object)) + .Add("@xmlChkList", SqlDbType.Xml).Value = If(xmlChkList Is Nothing, DBNull.Value, DirectCast(xmlChkList.ToString(), Object)) .Add("@cveEmpresa", SqlDbType.Int).Value = cveEmpresa + .Add("@CveEventoPadre", SqlDbType.Int).Value = CveEventoPadre + '.Add("@mailPara", SqlDbType.VarChar).Direction = ParameterDirection.Output + '.Add("@mailBody", SqlDbType.Xml).Direction = ParameterDirection.Output End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing Try - SqlAdapter.Fill(Data) + + SqlAdapter.Fill(ds) + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + CveEvento = SqlAdapter.SelectCommand.Parameters("@CveEvento").Value.ToString().ToEntero() Folio = SqlAdapter.SelectCommand.Parameters("@Folio").Value.ToString().ToEntero() + 'mailbody = SqlAdapter.SelectCommand.Parameters("@mailBody").Value.ToString() + 'mailPara = SqlAdapter.SelectCommand.Parameters("@mailPara").Value.ToString() + + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If retorno = True Catch ex As Exception - OnError("Ocurrió un error al obtener el Catálogo de Eventos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + OnError("Ocurrió un error al agregar el Evento.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Try + If retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), Folio, CveEvento), lPara, "NUEVA TAREA ASIGNADA") + mailbody = MailgetBodyNuevatarea(Folio, String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), asunto, descripcion, String.Format("{0:dd/MM/yyyy HH:mm}", fechaInicio.ToDateTime()), String.Format("{0:dd/MM/yyyy HH:mm}", fechaFin.ToDateTime()), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Nueva Tarea asignada" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If + Catch ex As Exception + End Try Return retorno End Function - Public Function UpdateEstatusEvento2(CveEventoEstatus As Integer, CveComentario As Integer, CveEvento As Integer, CveUsuario As Integer) As Boolean + Public Function UP_Eventos2(CveEvento As Integer, asunto As String, descripcion As String, prioridad As Int32, fechaInicio As String, fechaFin As String, + cveRevision As Int32, cveUsuarioIng As Int32, cveEmpresa As Int32, oempresa As Empresa) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_OI_Eventos2Up", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEvento", SqlDbType.Int).Value = CveEvento + .Add("@asunto", SqlDbType.VarChar).Value = asunto + .Add("@descripcion", SqlDbType.VarChar).Value = descripcion + .Add("@prioridad", SqlDbType.Int).Value = prioridad + .Add("@fechaInicio", SqlDbType.VarChar).Value = fechaInicio + .Add("@fechaFin", SqlDbType.VarChar).Value = fechaFin + .Add("@cveRevision", SqlDbType.Int).Value = cveRevision + .Add("@cveUsuarioIng", SqlDbType.Int).Value = cveUsuarioIng + .Add("@cveEmpresa", SqlDbType.Int).Value = cveEmpresa + End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing + Dim CveUsuarioPara As Integer = 0 + Try + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al actualizar el Catálogo de Eventos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + + If retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), Folio, CveEvento), lPara, "TAREA ACTUALIZADA") + mailbody = MailgetBodyActualizartarea(Folio, String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), asunto, descripcion, String.Format("{0:dd/MM/yyyy HH:mm}", fechaInicio.ToDateTime()), String.Format("{0:dd/MM/yyyy HH:mm}", fechaFin.ToDateTime()), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Tarea Actualizada" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If + Return retorno + End Function + + + Public Function UpdateEstatusEvento2(CveEventoEstatus As Integer, CveComentario As Integer, CveEvento As Integer, CveUsuario As Integer, cveEmpresa As Int32, oempresa As Empresa) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_OI_EventosEstatusUpdate2") + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing With SqlAdapter.SelectCommand.Parameters .Add("@pCveEventoEstatus", SqlDbType.Int).Value = CveEventoEstatus .Add("@pCveComentario", SqlDbType.Int).Value = CveComentario .Add("@pCveEvento", SqlDbType.Int).Value = CveEvento .Add("@pCveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = cveEmpresa End With Try - SqlAdapter.Fill(Data) + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If Retorno = True Catch ex As Exception OnError("Ocurrió un error al actualizar el estatus en el Evento.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try + If Retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), drow("Folio").ToString().ToEntero(), CveEvento), lPara, String.Format("CAMBIÓ ESTADO EN TAREA A '{0}'", drow("Estatus"))) + mailbody = MailgetBodyActualizarEstado(drow("Estatus").ToString(), drow("Folio").ToString().ToEntero(), String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), drow("Asunto").ToString(), drow("Descripcion").ToString(), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaInicio")), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaFin")), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Tarea Cambio de estatus" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If Return Retorno End Function @@ -289,7 +798,7 @@ Public Class ClsOIEventos End Try Return retorno End Function - Public Function Upcheklist(cveEventoCheckList As Int32, cveEvento As Int32, eventoComentario As String, estatus As Boolean, cveUsuario As Int32) As Boolean + Public Function Upcheklist(cveEventoCheckList As Int32, cveEvento As Int32, eventoComentario As String, estatus As Boolean, cveUsuario As Int32, CveEmpresa As Int32, oempresa As Empresa) As Boolean Dim retorno As Boolean = False DataAdapter("PA_OI_cheklistUp", CommandType.StoredProcedure) With SqlAdapter.SelectCommand.Parameters @@ -298,13 +807,46 @@ Public Class ClsOIEventos .Add("@eventoComentario", SqlDbType.VarChar).Value = eventoComentario .Add("@estatus", SqlDbType.Bit).Value = estatus .Add("@cveUsuario", SqlDbType.Int).Value = cveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing Try - SqlAdapter.Fill(Data) + + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If retorno = True Catch ex As Exception OnError("Ocurrió un error al actualizar el checklist.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try + + + + If retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), drow("Folio").ToString().ToEntero(), cveEvento), lPara, "TAREA ACTUALIZADA(Nuevo Archivo)") + mailbody = MailgetBodyTareaCheckList(String.Format("Actividad {0}", If(estatus, "Terminada", "Pendiente")), drow("Folio").ToString().ToEntero(), String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), cveEvento), drow("Asunto").ToString(), drow("Descripcion").ToString(), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaInicio")), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaFin")), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = String.Format("Actividad {0}", If(estatus, "Terminada", "Pendiente")) + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If Return retorno End Function Public Function Removecheklist(cveEventoCheckList As Int32, cveEvento As Int32, cveUsuario As Int32) As Boolean @@ -325,46 +867,164 @@ Public Class ClsOIEventos End Function #End Region - Public Function AddUPEventoArchivo(CveEvento As Integer, Archivo As String, CveUsuario As Integer) As Boolean + Public Function AddUPEventoArchivo(CveEvento As Integer, Archivo As String, CveUsuario As Integer, cveEmpresa As Int32, oempresa As Empresa) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_OI_EventosArchivoAddUP") With SqlAdapter.SelectCommand.Parameters .Add("@CveEvento", SqlDbType.Int).Value = CveEvento .Add("@Archivo", SqlDbType.VarChar).Value = Archivo .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = cveEmpresa End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing Try - SqlAdapter.Fill(Data) + + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If Retorno = True Catch Ex1 As SqlException Retorno = False - Me.OnError("Ocurrió un error al Guardar el comentario del evento.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Me.OnError("Ocurrió un error al Guardar el archivo del evento.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) Catch ex As Exception Retorno = False - OnError("Ocurrió un error al Guardar el Evento Comentario", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + OnError("Ocurrió un error al Guardar el archivo Comentario", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try + If Retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), drow("Folio").ToString().ToEntero(), CveEvento), lPara, "TAREA ACTUALIZADA(Nuevo Archivo)") + mailbody = MailgetBodyActualizararchivo(drow("Folio").ToString().ToEntero(), String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), drow("Asunto").ToString(), drow("Descripcion").ToString(), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaInicio")), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaFin")), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Tarea Archivo actualizado" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If Return Retorno End Function - Public Function UPEventoAAvance(CveEvento As Integer, Avance As Decimal, CveUsuario As Integer) As Boolean + Public Function UPEventoAAvance(CveEvento As Integer, Avance As Decimal, CveUsuario As Integer, cveEmpresa As Int32, oempresa As Empresa) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_OI_EventosAvanceUP") With SqlAdapter.SelectCommand.Parameters .Add("@CveEvento", SqlDbType.Int).Value = CveEvento .Add("@Avance", SqlDbType.Decimal).Value = Avance .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEmpresa", SqlDbType.Int).Value = cveEmpresa End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing Try - SqlAdapter.Fill(Data) + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 1 Then + Data = ds.Tables(1) + End If + If ds.Tables.Count > 2 AndAlso ds.Tables(2).Rows.Count > 0 Then + drow = ds.Tables(2).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If Retorno = True Catch Ex1 As SqlException Retorno = False - Me.OnError("Ocurrió un error al Guardar el comentario del evento.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + Me.OnError("Ocurrió un error al Guardar el Avance del evento.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) Catch ex As Exception Retorno = False + OnError("Ocurrió un error al Guardar el Avance Comentario", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + If Retorno AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), drow("Folio").ToString().ToEntero(), CveEvento), lPara, "TAREA ACTUALIZADA(Nuevo Archivo)") + mailbody = MailgetBodyActualizarAvance(drow("Folio").ToString().ToEntero(), String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), drow("Asunto").ToString(), drow("Descripcion").ToString(), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaInicio")), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaFin")), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Tarea cambio Avance" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If + Return Retorno + End Function + + + Public Function AddEventoComentario2(CveEvento As Integer, Comentario As String, Archivo As String, CveUsuario As Integer, CveEmpresa As Integer, oempresa As Empresa) As Integer + Dim Retorno As Integer = -1 + DataAdapter("PA_OI_EventosComentarios2Add") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEvento", SqlDbType.Int).Value = CveEvento + .Add("@EventoComentario", SqlDbType.VarChar).Value = Comentario + .Add("@Archivo", SqlDbType.VarChar).Value = Archivo + .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveEventoComentario", SqlDbType.Int).Direction = ParameterDirection.Output + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + + Dim separador As String = "" + Dim lPara As New List(Of String) + Dim mailbody As String = "" + Dim mailPara As String = "" + Dim ds As New DataSet() + Dim drow As DataRow = Nothing + Try + SqlAdapter.Fill(Data) + CveEventoComentario = SqlAdapter.SelectCommand.Parameters("@CveEventoComentario").Value.ToString.ToEntero + Retorno = CveEventoComentario + + SqlAdapter.Fill(ds) + + If ds.Tables.Count > 0 Then + Data = ds.Tables(0) + End If + If ds.Tables.Count > 1 AndAlso ds.Tables(1).Rows.Count > 0 Then + drow = ds.Tables(1).Rows(0) + End If + If DtResultados.Rows.Count > 0 Then + For Each item As DataRow In DtResultados.Rows + lPara.Add(item("CveUsuario").ToString()) + mailPara = String.Format("{0}{1}{2}", mailPara, separador, item("Correo").ToString()) + separador = "," + Next + End If + Catch Ex1 As SqlException + Me.OnError("Ocurrió un error al Guardar el comentario del evento.", Ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + + Catch ex As Exception OnError("Ocurrió un error al Guardar el Evento Comentario", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) End Try + If Retorno > 0 AndAlso lPara.Count > 0 AndAlso drow IsNot Nothing Then + Notificaciones.AlertaVentana(String.Format("Folio :{1}", GetDominio(), drow("Folio").ToString().ToEntero(), CveEvento), lPara, "TAREA ACTUALIZADA(Nuevo Archivo)") + mailbody = MailgetBodyTareaComentario(drow("Folio").ToString().ToEntero(), String.Format("{0}OI/TareaDetalle.aspx?CveEvento={1}", GetDominio(), CveEvento), drow("Asunto").ToString(), drow("Descripcion").ToString(), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaInicio")), String.Format("{0:dd/MM/yyyy HH:mm}", drow("FechaFin")), drow("Prioridad").ToString(), drow("Tema").ToString()) + Dim mailAsunto As String = "Nuevo comentario en tarea" ',cveUsuarioPara + Dim mailArrayCC As String = "" + EnviarCorreo(oempresa, mailAsunto, mailbody, mailPara, mailArrayCC) + End If Return Retorno End Function #End Region @@ -850,6 +1510,33 @@ Public Class ClsOIEventos Return Retorno End Function + Public Function UpEventoMiembros(pCveEvento As Integer, CveUsuarioPara As Integer, Lmiembros As List(Of Integer), CveEmpresa As Integer, CveUsuarioEdito As Integer) As Boolean + Dim Retorno As Boolean = False + Dim xmlMiembros As System.Xml.Linq.XDocument = Nothing + 'xmlMiembros = New System.Xml.Linq.XDocument(New System.Xml.Linq.XElement("CCPara", Lmiembros.Select(x >= New System.Xml.Linq.XElement("CveUsuario", x))) + If Lmiembros IsNot Nothing AndAlso Lmiembros.Count > 0 Then + If Not CveUsuarioPara.Contiene(Lmiembros.ToArray()) Then + Lmiembros.Add(CveUsuarioPara) + End If + xmlMiembros = New System.Xml.Linq.XDocument(New System.Xml.Linq.XElement("CCPara", Lmiembros.[Select](Function(x) New System.Xml.Linq.XElement("CveUsuario", x)))) + End If + DataAdapter("PA_OI_EventosMiembrosUp") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEvento", SqlDbType.Int).Value = pCveEvento + .Add("@CveUsuarioPara", SqlDbType.Int).Value = CveUsuarioPara + .Add("@xmlMiembros", SqlDbType.Xml).Value = If(xmlMiembros Is Nothing, DBNull.Value, DirectCast(xmlMiembros.ToString(), Object)) + .Add("@CveUsuarioEdito", SqlDbType.Int).Value = CveUsuarioEdito + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As Exception + OnError("Ocurrió un error al acualizar miembros los miembros del evento", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + + Return Retorno + End Function Public Function AddEventoUsuario(pCveEvento As Integer, CveUsuario As Integer) As Boolean Dim Retorno As Boolean = False diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index f833f851d..cffe62b37 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -4422,11 +4422,13 @@ Public Class ClsPaginas PaginaDict.Add("/OI/Normatividad.aspx".ToUpper(), 669) PaginaDict.Add("/OI/RepNormatividad.aspx".ToUpper(), 669) PaginaDict.Add("/OI/Minutas.aspx".ToUpper(), -1) + PaginaDict.Add("/OI/MinutaDetalle.aspx".ToUpper(), -1) PaginaDict.Add("/OI/RepDocumentos.aspx".ToUpper(), -1) PaginaDict.Add("/OI/EventoComentario.aspx".ToUpper(), -1) PaginaDict.Add("/OI/RepEventos.aspx".ToUpper(), -1) PaginaDict.Add("/OI/RepTareas.aspx".ToUpper(), 293) + PaginaDict.Add("/OI/RepTareas2.aspx".ToUpper(), 293) PaginaDict.Add("/OI/RepMinutas.aspx".ToUpper(), 338) PaginaDict.Add("/OI/PopUpAgenda.aspx".ToUpper(), -1) PaginaDict.Add("/OI/RepSoporteADS.aspx".ToUpper(), 456) diff --git a/App_Code/ClsSisMail.vb b/App_Code/ClsSisMail.vb index c6be325b7..25d14fd9e 100644 --- a/App_Code/ClsSisMail.vb +++ b/App_Code/ClsSisMail.vb @@ -68,8 +68,8 @@ Public Class ClsSisMail Dim Correo As New System.Net.Mail.MailMessage Dim Mensaje As String = String.Empty - Dim ArrayPara() As String = ObjMail.Para.Split(";"c) - Dim ArrayCCP() As String = ObjMail.CCP.Split(";"c) + Dim ArrayPara() As String = ObjMail.Para.Replace(",", ";").Split(";"c) + Dim ArrayCCP() As String = ObjMail.CCP.Replace(",", ";").Split(";"c) '"sgd.facturacion@adsistemas.mx" If ObjMail.De = String.Empty Then diff --git a/App_Code/Notificaciones.vb b/App_Code/Notificaciones.vb index 998dc6149..8efed087d 100644 --- a/App_Code/Notificaciones.vb +++ b/App_Code/Notificaciones.vb @@ -26,9 +26,17 @@ Public Class Notificaciones End Function + + Public Shared Sub AlertaVentana(Message As String, Para As String, Optional Titulo As String = "", Optional timeoutseconds As Integer = 5, Optional Tipo As TipoNotificacion = TipoNotificacion.AlertaVentanaNoOcultar) + Dim lPara As New List(Of String) + lPara.Add(Para) + AlertaVentana(Message, lPara, Titulo, timeoutseconds, Tipo) + End Sub Public Shared Sub AlertaVentana(Message As String, Para As List(Of String), Optional Titulo As String = "", Optional timeoutseconds As Integer = 5, Optional Tipo As TipoNotificacion = TipoNotificacion.AlertaVentanaNoOcultar) - Dim Clients As Hubs.IHubConnectionContext(Of Object) = GlobalHost.ConnectionManager.GetHubContext(Of Notificaciones)().Clients - Clients.Users(Para).AlertaVentana(Titulo, Message, DirectCast(Tipo, Integer), timeoutseconds) + If (Para IsNot Nothing) AndAlso Para.Count > 0 Then + Dim Clients As Hubs.IHubConnectionContext(Of Object) = GlobalHost.ConnectionManager.GetHubContext(Of Notificaciones)().Clients + Clients.Users(Para).AlertaVentana(Titulo, Message, DirectCast(Tipo, Integer), timeoutseconds) + End If End Sub 'Public Shared Sub AlertaVentana(Message As String, Para As List(Of String), Optional Titulo As String = "", Optional timeoutseconds As Integer = 5, Optional Tipo As TipoNotificacion = TipoNotificacion.AlertaVentanaNoOcultar) diff --git a/Bin/APP_Code_CSharp.dll b/Bin/APP_Code_CSharp.dll index 1f82d6c78f46dcfdc76c8b1df4d481c409b0d8e1..1f90366717c14fc2099de9e19aab06338a35627a 100644 GIT binary patch delta 102 zcmZpeBGfQNXhH|`Y4_EQ-L2h>t=&wm-OO9NS^mZggvToLE=XeWognz`tk1fmdfR6t zu+%8%0F}lu009#a%P=x9=*(wf&}n302nu!yX1cZ_f7{}A=M7T=Uzl8U(cJFP$Z~)K E0FGcJO#lD@ delta 102 zcmZpeBGfQNXhH`wU;5m}?$&O`)^4WOZsx7sEPvw#e3JUC-~Bk{*)T!%!@lV?mD^_| zu+%8%0F}lu009#a%P=x9=*(wf&}n302nu!yzI}IDkcAk#OXJ#KzE^zIE^l{eWI4bA E0L!E$EC2ui diff --git a/Bin/APP_Code_CSharp.pdb b/Bin/APP_Code_CSharp.pdb index 69feb9bde8cf3cc1a16b7804ebe08ae1324b9598..3698a8127008038e74ceba9b935d09d7b99009da 100644 GIT binary patch delta 29685 zcmaK#3s_af7RUDigp;C?53b@t@R13TqN(}7LbL2aiCSi5hGu1jMrCFt9m>)kRQQN( zMuuf(N=4Zf^HPy^%ZwXnW#%QrGPTl#GV>bBU9

!`^Go{LlCK4SUx7ezVq`*#lco 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 b!LgO$T&s#_>+M^c8vo~^72!kn&i4NYz=N^t diff --git a/LogIn.aspx b/LogIn.aspx index 050d12f69..323ad04cf 100644 --- a/LogIn.aspx +++ b/LogIn.aspx @@ -125,13 +125,20 @@ - - <%: Scripts.Render("~/Metronic/assets/global/scripts/JS") %> + - + <%----%> + + diff --git a/OI/MinutaDetalle.aspx.cs b/OI/MinutaDetalle.aspx.cs new file mode 100644 index 000000000..4ae6f4f81 --- /dev/null +++ b/OI/MinutaDetalle.aspx.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Extensiones; + +public partial class OI_MinutaDetalle : ClsPaginas +{ + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + + DdlRoles.DataSource = get_GlobalDTRoles(UsuarioActual.CveEmpresa); + DdlRoles.DataBind(); + DdlRoles.Items.Insert(0, new ListItem("Todos", "-1")); + DdlSucursales.DataSource = get_GlobalDTSubProyectos(-1, -1, UsuarioActual.CveEmpresa); + DdlSucursales.DataBind(); + DdlSucursales.Items.Insert(0, new ListItem("Todos", "-1")); + GVUsuarios.DataSource = get_GlobalDTUsuarios(CveEmpresa: UsuarioActual.CveEmpresa).FiltraParametros("Estatus =1 ", "Rol ASC"); + GVUsuarios.DataBind(); + } + + } + + protected void GVUsuarios_RowDataBound(object sender, GridViewRowEventArgs e) + { + if (e.Row.RowType == DataControlRowType.DataRow) + { + string CveRol = e.Row.DBCampo("CveRol"); + string CveSubProyecto = e.Row.DBCampo("CveSubProyecto"); + e.Row.CssClass = "items"; + e.Row.Attributes.Add("data-rol", CveRol); + e.Row.Attributes.Add("data-sucursal", CveRol); + } + + } +} \ No newline at end of file diff --git a/OI/RepTareas2.aspx b/OI/RepTareas2.aspx index b49be0b16..212a12e0c 100644 --- a/OI/RepTareas2.aspx +++ b/OI/RepTareas2.aspx @@ -1,384 +1,80 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeFile="RepTareas2.aspx.cs" Inherits="OI_RepTareas2" %> - + - - + - + - + - -

  • - Agregar Tarea -
    • + - + - - - - - -
    +
    Avance: +
    @@ -407,8 +427,8 @@ C. C. Para
    - - + +     @@ -533,22 +553,22 @@ -