From c249625f010cc93e8140e638d979af3ab951f102 Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Tue, 10 Sep 2019 12:46:33 -0500 Subject: [PATCH] limpiando codigo en CatEstatusOrdenServicio --- OS/CatEstatusOrdenServicio.aspx | 66 +----------------------------- OS/CatEstatusOrdenServicio.aspx.vb | 52 ++++------------------- 2 files changed, 10 insertions(+), 108 deletions(-) diff --git a/OS/CatEstatusOrdenServicio.aspx b/OS/CatEstatusOrdenServicio.aspx index c02fb712d..650836c10 100644 --- a/OS/CatEstatusOrdenServicio.aspx +++ b/OS/CatEstatusOrdenServicio.aspx @@ -119,7 +119,7 @@ - + @@ -302,70 +302,6 @@ - <%-- - - - - - - - - - - - - - --%> - diff --git a/OS/CatEstatusOrdenServicio.aspx.vb b/OS/CatEstatusOrdenServicio.aspx.vb index fbe55c2c3..2c6c42f99 100644 --- a/OS/CatEstatusOrdenServicio.aspx.vb +++ b/OS/CatEstatusOrdenServicio.aspx.vb @@ -46,8 +46,6 @@ Partial Class OS_CatEstatusOrdenServicio CveEstatuOS = -1 - CargaUsuarios() - End If End Sub @@ -168,72 +166,40 @@ Partial Class OS_CatEstatusOrdenServicio #End Region #Region "Configuracion" - Protected Sub ibOpciones1_Click(sender As Object, e As ImageClickEventArgs) - Dim imgBtn As ImageButton = DirectCast(sender, System.Web.UI.WebControls.ImageButton) - - ddlSuperior.Items.Clear() - - If imgBtn.CommandArgument <> "" Then - 'chkMostrarLimites.Visible = If(GlobalDTOCEstatus.FiltraParametros("CveEstatusSiguiente = " + imgBtn.CommandArgument)(0)("TipoTermino").ToString.ToEntero = 3, False, True) - chkMostrarLimites.Style("display") = If(GlobalDTOCEstatus(UsuarioActual.CveEmpresa).FiltraParametros("CveEstatusSiguiente = " + imgBtn.CommandArgument)(0)("TipoTermino").ToString.ToEntero = 3, "none", "inline") - - - 'ddlSuperior.DataSource = DTEstatusUsuarios.FiltraParametros(String.Format("CveEstatus = {0}", imgBtn.CommandArgument), "Nombre DESC") - ddlSuperior.DataBind() - ddlSuperior.Items.Insert(0, New ListItem("Todos los Superiores", "-1")) - Try - ddlSuperior.SelectedValue = hdnCveSuperior.Value - Catch ex As Exception - - End Try - tblSuperior.Visible = True - Else - tblSuperior.Visible = False - End If - - UPSuperior.Update() - UPPEmp.Update() - RegistraScript("$('#DivSuperior').show(1000); PosicionaObjeto('" + imgBtn.ClientID + "','DivSuperior'); chkMostrarLimitesCambio();") - End Sub Private Sub CreaGrid(Tipo As String) Dim i As Integer = 1 For Each Row As DataRow In GlobalDTEstatusOrdenServicios(UsuarioActual.CveEmpresa).Rows - GvEstatusUsuariosREQ.Columns(i).HeaderText = Row("EstatusOrdenServicio").ToString.ToUpper - GvEstatusUsuariosREQ.Columns(i).FooterText = Row("CveEstatusOrdenServicio").ToString + GvEstatusUsuarios.Columns(i).HeaderText = Row("EstatusOrdenServicio").ToString.ToUpper + GvEstatusUsuarios.Columns(i).FooterText = Row("CveEstatusOrdenServicio").ToString i += 1 Next While i <= 10 - GvEstatusUsuariosREQ.Columns(i).Visible = False + GvEstatusUsuarios.Columns(i).Visible = False i += 1 End While End Sub Protected Sub CargaGridEstatusUsuarios() - GvEstatusUsuariosREQ.DataSource = GlobalDTUsuarios(CveEmpresa:=UsuarioActual.CveEmpresa) - GvEstatusUsuariosREQ.DataBind() + GvEstatusUsuarios.DataSource = GlobalDTUsuarios(CveEmpresa:=UsuarioActual.CveEmpresa) + GvEstatusUsuarios.DataBind() UPPEmp.Update() End Sub - Public Sub CargaUsuarios() - ddlSuperior.DataSource = GlobalDTUsuarios(-1, UsuarioActual.CveEmpresa) - ddlSuperior.DataBind() - End Sub - Protected Sub btnGuardarEstatusUsuariosREQ_Click(sender As Object, e As EventArgs) Handles btnGuardarEstatusUsuariosREQ.Click Dim objEstatusOC As New ClsOS objEstatusOC.IniciaTransacSQL() Dim HuboErrores As Boolean = False Dim CveSubProyecto = 59 - For Each Row As GridViewRow In GvEstatusUsuariosREQ.Rows + For Each Row As GridViewRow In GvEstatusUsuarios.Rows Dim r As Integer = 1 For i = 0 To Row.Cells.Count - 1 - Dim CveEstatus As Integer = If(IsNumeric(GvEstatusUsuariosREQ.Columns(i).FooterText), GvEstatusUsuariosREQ.Columns(i).FooterText.ToEntero, 0) + Dim CveEstatus As Integer = If(IsNumeric(GvEstatusUsuarios.Columns(i).FooterText), GvEstatusUsuarios.Columns(i).FooterText.ToEntero, 0) If CveEstatus > 0 Then @@ -288,12 +254,12 @@ Partial Class OS_CatEstatusOrdenServicio CargaGridEstatusUsuarios() End Sub - Protected Sub GvEstatusUsuariosREQ_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvEstatusUsuariosREQ.RowDataBound + Protected Sub GvEstatusUsuarios_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvEstatusUsuarios.RowDataBound If e.Row.RowType = DataControlRowType.DataRow Then Dim PermisosDeUsuario As DataTable = DTEstatusUsuarios.FiltraParametros(String.Format("CveUsuario = {0}", e.Row.DBCampo("CveUsuario").ToString)) Dim CveUsuario As String = e.Row.DBCampo("CveUsuario").ToString For i As Integer = 1 To 10 - Dim CveEstatus As Integer = GvEstatusUsuariosREQ.Columns(i).FooterText.ToEntero + Dim CveEstatus As Integer = GvEstatusUsuarios.Columns(i).FooterText.ToEntero If CveEstatus > 0 Then Dim auxiliarBandera As DataRow = PermisosDeUsuario.FiltroPrimero(String.Format("CveEstatusOrdenServicio = {0}", CveEstatus.ToString)) If auxiliarBandera IsNot Nothing Then