From 3e19692ca403cc6163181d3656eaea4eac9de1e2 Mon Sep 17 00:00:00 2001 From: Vanesa Rimada <80859025+vrimada@users.noreply.github.com> Date: Thu, 25 Jun 2026 10:59:58 -0300 Subject: [PATCH 01/29] =?UTF-8?q?Req.=205.=20Edici=C3=B3n=20de=20determina?= =?UTF-8?q?ci=C3=B3n=20-=20Evitar=20=20salto=20de=20pesta=C3=B1a.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebLab/Items/ItemEdit2.aspx | 12 ++++++------ WebLab/Items/ItemEdit2.aspx.cs | 32 +++++++++++++++++--------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/WebLab/Items/ItemEdit2.aspx b/WebLab/Items/ItemEdit2.aspx index 02a55287..934dcbe3 100644 --- a/WebLab/Items/ItemEdit2.aspx +++ b/WebLab/Items/ItemEdit2.aspx @@ -22,10 +22,10 @@ + @@ -683,7 +683,7 @@ Font-Size="10pt" ForeColor="#333333" GridLines="Horizontal" TabIndex="9" Width="100%" - UpdateAfterCallBack="True" OnRowDataBound="gvMuestraItem_RowDataBound" OnRowCommand="gvMuestraItem_RowCommand"> + UpdateAfterCallBack="True" OnRowDataBound="gvMuestraItem_RowDataBound" OnRowCommand="gvMuestraItem_RowCommand"> diff --git a/WebLab/Items/ItemEdit2.aspx.cs b/WebLab/Items/ItemEdit2.aspx.cs index 19bfb1d4..e04f9a04 100644 --- a/WebLab/Items/ItemEdit2.aspx.cs +++ b/WebLab/Items/ItemEdit2.aspx.cs @@ -31,17 +31,19 @@ public partial class ItemEdit2 : System.Web.UI.Page Configuracion oC = new Configuracion(); Usuario oUser = new Usuario(); // Item oItem = new Item(); - private enum TabIndex - { - DEFAULT = 0, - ONE = 1, - TWO = 2, - THREE = 3, - CUARTO = 4, - QUINTO = 5, - SECTO = 6, - SEPTIMO = 7, OCTAVO = 8 - // you can as many as you want here + private enum TabIndex //Los nombres (ONE, TWO, OCTAVO) no coinciden con la posición real de las tabs porque el HTML las tiene en desorden + { + DatosGenerales = 0, // tab1 + Presentaciones = 1, // tab7 + ValoresReferencia = 2, // tab2 + Diagrama = 3, // tab3 + ResultadosPredefinidos = 4, //tab4 + Recomendaciones = 5, // tab5 + Muestras = 6, //tab8 + MasOpciones = 7, //tab6 + Turnos = 8 ,//tab9 + AutoAnalizadores = 9, // tab10 + ObservacionesResultados = 10 // tab11 } private void SetSelectedTab(TabIndex tabIndex) { @@ -1090,7 +1092,7 @@ protected void gvListaVR_RowCommand1(object sender, GridViewCommandEventArgs e) { EliminarItemVR(int.Parse(e.CommandArgument.ToString())); CargarGrillaVR(); - //SetSelectedTab(TabIndex.TWO); + SetSelectedTab(TabIndex.ValoresReferencia); } } @@ -2094,7 +2096,7 @@ protected void btnGuardarVR_Click(object sender, EventArgs e) CargarGrillaVR_NoPac(); } - SetSelectedTab(TabIndex.TWO); + SetSelectedTab(TabIndex.ValoresReferencia ); } } @@ -3008,7 +3010,7 @@ protected void gvListaVRNP_RowCommand(object sender, GridViewCommandEventArgs e) { EliminarItemVR_NP(int.Parse(e.CommandArgument.ToString())); CargarGrillaVR_NoPac(); - SetSelectedTab(TabIndex.TWO); + SetSelectedTab(TabIndex.ValoresReferencia ); } } @@ -3351,7 +3353,7 @@ protected void gvMuestraItem_RowCommand(object sender, GridViewCommandEventArgs { EliminarItemMuestra(int.Parse(e.CommandArgument.ToString())); CargarGrillaMuestras(); - SetSelectedTab(TabIndex.OCTAVO); + SetSelectedTab(TabIndex.Muestras ); } } From 8f85b22367ab7f53096ed89c3e96cc987850106e Mon Sep 17 00:00:00 2001 From: Vanesa Rimada <80859025+vrimada@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:02:20 -0300 Subject: [PATCH 02/29] =?UTF-8?q?Req.=206:=20Hoja=20de=20trabajo.=20Se=20s?= =?UTF-8?q?acr=20opci=C3=B3n=20de=20seleccionar=20y=20de=20marcar=20en=20l?= =?UTF-8?q?a=20grilla=20y=20la=20ultima=20columna,=20quedaron=20obsoletas?= =?UTF-8?q?=20de=20cuando=20en=20el=20sil1=20se=20pod=C3=ADa=20seleccionar?= =?UTF-8?q?=20para=20imprimir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebLab/Informes/Informe.aspx | 18 +-- WebLab/Informes/Informe.aspx.cs | 96 ++++++++-------- WebLab/Informes/Informe.aspx.designer.cs | 133 +++++++++-------------- 3 files changed, 112 insertions(+), 135 deletions(-) diff --git a/WebLab/Informes/Informe.aspx b/WebLab/Informes/Informe.aspx index a6c55f61..92a7c434 100644 --- a/WebLab/Informes/Informe.aspx +++ b/WebLab/Informes/Informe.aspx @@ -402,8 +402,8 @@
- - + - + --%>
+ <%--
Seleccionar: Todas   Imprimir
@@ -427,12 +427,12 @@ Width="100%" OnSelectedIndexChanged="gvLista_SelectedIndexChanged"> - + <%-- - + --%> @@ -452,22 +452,22 @@ - + <%-- - - + --%> + <%-- - + --%> diff --git a/WebLab/Informes/Informe.aspx.cs b/WebLab/Informes/Informe.aspx.cs index 7d6a2c68..4917eb6a 100644 --- a/WebLab/Informes/Informe.aspx.cs +++ b/WebLab/Informes/Informe.aspx.cs @@ -245,7 +245,7 @@ private void CargarListas() //if (oCon.esMultiEFector()) //{ pnlImpresora.Visible = false; - lnkImprimir.Visible = false; + //lnkImprimir.Visible = false; lnkImprimirAnalisisFueraHT.Visible = false; // ddlImpresora.Visible = false; //lnkImprimir.Visible = false; @@ -490,19 +490,19 @@ protected void gvLista_RowCommand1(object sender, GridViewCommandEventArgs e) } } - - - private void MarcarSeleccionados(bool p) - { - foreach (GridViewRow row in gvLista.Rows) - { - CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))); - if (a.Checked == !p) - ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))).Checked = p; - } - } + //Version del sil1 + //private void MarcarSeleccionados(bool p) + //{ + // foreach (GridViewRow row in gvLista.Rows) + // { + // CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))); + // if (a.Checked == !p) + // ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))).Checked = p; + // } + + //} private void VistaPreeliminar(object p, string accion) { HojaTrabajo oRegistro = new HojaTrabajo(); @@ -1039,26 +1039,27 @@ protected void gvLista_RowDataBound(object sender, GridViewRowEventArgs e) { if (e.Row.RowType == DataControlRowType.DataRow) { - ImageButton CmdPdf = (ImageButton)e.Row.Cells[4].Controls[1]; + ImageButton CmdPdf = (ImageButton)e.Row.Cells[3].Controls[1]; CmdPdf.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString(); CmdPdf.CommandName = "Pdf"; CmdPdf.ToolTip = "Vista Preeliminar"; + //Version del sil1 - ImageButton CmdAdicional = (ImageButton)e.Row.Cells[5].Controls[1]; - CmdAdicional.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString(); - CmdAdicional.CommandName = "Imprimir"; - CmdAdicional.ToolTip = "Imprimir"; + //ImageButton CmdAdicional = (ImageButton)e.Row.Cells[5].Controls[1]; + //CmdAdicional.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString(); + //CmdAdicional.CommandName = "Imprimir"; + //CmdAdicional.ToolTip = "Imprimir"; - ImageButton CmdExcel = (ImageButton)e.Row.Cells[6].Controls[1]; - CmdExcel.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString(); - CmdExcel.CommandName = "Excel"; - CmdExcel.ToolTip = "Excel"; + //ImageButton CmdExcel = (ImageButton)e.Row.Cells[6].Controls[1]; + //CmdExcel.CommandArgument = this.gvLista.DataKeys[e.Row.RowIndex].Value.ToString(); + //CmdExcel.CommandName = "Excel"; + //CmdExcel.ToolTip = "Excel"; - - if (pnlImpresora.Visible == false) - { - CmdAdicional.Visible = false; - } + + //if (pnlImpresora.Visible == false) + //{ + // CmdAdicional.Visible = false; + //} } } @@ -1068,7 +1069,7 @@ private void CargarGrilla() gvLista.DataSource = LeerDatos(); gvLista.DataBind(); - MarcarSeleccionados(false); + //MarcarSeleccionados(false); } private object LeerDatos() @@ -1109,23 +1110,23 @@ protected void lnkPDF_Click(object sender, EventArgs e) } - - protected void lnkImprimir_Click(object sender, EventArgs e) - { + //Version del sil1 + //protected void lnkImprimir_Click(object sender, EventArgs e) + //{ - foreach (GridViewRow row in gvLista.Rows) - { + // foreach (GridViewRow row in gvLista.Rows) + // { - CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))); - if (a.Checked == true) - { - VistaPreeliminar(gvLista.DataKeys[row.RowIndex].Value.ToString(), "Impresora"); - } - } + // CheckBox a = ((CheckBox)(row.Cells[0].FindControl("CheckBox1"))); + // if (a.Checked == true) + // { + // VistaPreeliminar(gvLista.DataKeys[row.RowIndex].Value.ToString(), "Impresora"); + // } + // } - } + //} protected void CustomValidator1_ServerValidate(object source, ServerValidateEventArgs args) { @@ -1146,15 +1147,16 @@ protected void ddlArea_SelectedIndexChanged(object sender, EventArgs e) // gvLista.UpdateAfterCallBack = true; } - protected void lnkMarcar_Click(object sender, EventArgs e) - { - MarcarSeleccionados(true); - } + //Version del sil1 + //protected void lnkMarcar_Click(object sender, EventArgs e) + //{ + // MarcarSeleccionados(true); + //} - protected void lnkDesmarcar_Click(object sender, EventArgs e) - { - MarcarSeleccionados(false); - } + //protected void lnkDesmarcar_Click(object sender, EventArgs e) + //{ + // MarcarSeleccionados(false); + //} protected void lnkImprimirAnalisisFueraHT_Click(object sender, EventArgs e) { diff --git a/WebLab/Informes/Informe.aspx.designer.cs b/WebLab/Informes/Informe.aspx.designer.cs index 4d748888..dfd3586d 100644 --- a/WebLab/Informes/Informe.aspx.designer.cs +++ b/WebLab/Informes/Informe.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace WebLab.Informes { - - - public partial class Informe { - +namespace WebLab.Informes +{ + + + public partial class Informe + { + /// /// pnlTitulo control. /// @@ -20,7 +22,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlTitulo; - + /// /// lblTitulo control. /// @@ -29,7 +31,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblTitulo; - + /// /// ddlSectorServicio control. /// @@ -38,7 +40,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlSectorServicio; - + /// /// ddlServicio control. /// @@ -47,7 +49,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlServicio; - + /// /// lstSector control. /// @@ -56,7 +58,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ListBox lstSector; - + /// /// lnkMarcarSectores control. /// @@ -65,7 +67,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkMarcarSectores; - + /// /// lnkDesmarcarSectores control. /// @@ -74,7 +76,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcarSectores; - + /// /// ddlArea control. /// @@ -83,7 +85,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlArea; - + /// /// txtFechaDesde control. /// @@ -92,7 +94,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaDesde; - + /// /// cvFechas control. /// @@ -101,7 +103,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator cvFechas; - + /// /// txtFechaHasta control. /// @@ -110,7 +112,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaHasta; - + /// /// ddlEfector control. /// @@ -119,7 +121,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlEfector; - + /// /// txtProtocoloDesde control. /// @@ -128,7 +130,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloDesde; - + /// /// txtProtocoloHasta control. /// @@ -137,7 +139,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloHasta; - + /// /// cvNumeroDesde control. /// @@ -146,7 +148,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator cvNumeroDesde; - + /// /// lblLoteDesde control. /// @@ -155,7 +157,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblLoteDesde; - + /// /// txtLoteDesde control. /// @@ -164,7 +166,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtLoteDesde; - + /// /// lblLoteHasta control. /// @@ -173,7 +175,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblLoteHasta; - + /// /// txtLoteHasta control. /// @@ -182,7 +184,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtLoteHasta; - + /// /// chkDesdeUltimoListado control. /// @@ -191,7 +193,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkDesdeUltimoListado; - + /// /// ddlOrigen control. /// @@ -200,7 +202,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlOrigen; - + /// /// ddlPrioridad control. /// @@ -209,7 +211,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlPrioridad; - + /// /// tituloEstado control. /// @@ -218,7 +220,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl tituloEstado; - + /// /// rdbEstadoAnalisis control. /// @@ -227,7 +229,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.RadioButtonList rdbEstadoAnalisis; - + /// /// pnlHojaTrabajoResultado control. /// @@ -236,7 +238,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlHojaTrabajoResultado; - + /// /// rdbHojaConResultados control. /// @@ -245,7 +247,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.RadioButtonList rdbHojaConResultados; - + /// /// lblCaracterCovid control. /// @@ -254,7 +256,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblCaracterCovid; - + /// /// chkCaracterCovid control. /// @@ -263,7 +265,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBoxList chkCaracterCovid; - + /// /// btnSeleccionarTipoMuestra control. /// @@ -272,7 +274,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.LinkButton btnSeleccionarTipoMuestra; - + /// /// lstMuestra control. /// @@ -281,7 +283,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.ListBox lstMuestra; - + /// /// pnlEtiquetaCodigoBarras control. /// @@ -290,7 +292,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlEtiquetaCodigoBarras; - + /// /// ddlEfectorDestino control. /// @@ -299,7 +301,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlEfectorDestino; - + /// /// ddlImpresoraCB control. /// @@ -308,7 +310,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlImpresoraCB; - + /// /// RangeValidator1 control. /// @@ -317,7 +319,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.RangeValidator RangeValidator1; - + /// /// btnImprimirEtiqueta control. /// @@ -326,7 +328,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnImprimirEtiqueta; - + /// /// pnlAnalisisFueraHT control. /// @@ -335,7 +337,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlAnalisisFueraHT; - + /// /// lnkMarcarAnalisis control. /// @@ -344,7 +346,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkMarcarAnalisis; - + /// /// lnkDesmarcarAnalisis control. /// @@ -353,7 +355,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcarAnalisis; - + /// /// rfvAnalisis control. /// @@ -362,7 +364,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvAnalisis; - + /// /// lstAnalisis control. /// @@ -371,7 +373,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ListBox lstAnalisis; - + /// /// lnkPDFAnalisisFueraHT control. /// @@ -380,7 +382,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkPDFAnalisisFueraHT; - + /// /// lnkImprimirAnalisisFueraHT control. /// @@ -389,7 +391,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkImprimirAnalisisFueraHT; - + /// /// pnlHojaTrabajo control. /// @@ -398,34 +400,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlHojaTrabajo; - - /// - /// lnkMarcar control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lnkMarcar; - - /// - /// lnkDesmarcar control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcar; - - /// - /// lnkImprimir control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lnkImprimir; - + /// /// gvLista control. /// @@ -434,7 +409,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView gvLista; - + /// /// lblMensaje control. /// @@ -443,7 +418,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblMensaje; - + /// /// ValidationSummary1 control. /// @@ -452,7 +427,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1; - + /// /// pnlImpresora control. /// @@ -461,7 +436,7 @@ public partial class Informe { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlImpresora; - + /// /// ddlImpresora control. /// From 9f4b26ccb5c03334f8ad2934b2a96b9c0332fc2f Mon Sep 17 00:00:00 2001 From: Vanesa Rimada <80859025+vrimada@users.noreply.github.com> Date: Fri, 26 Jun 2026 11:26:59 -0300 Subject: [PATCH 03/29] Req. 7: Mejorar pantalla de consulta de resultados: Ocultar el panel resaltado --- WebLab/Resultados/ResultadoBusqueda.aspx | 2 +- WebLab/Resultados/ResultadoBusqueda.aspx.cs | 1 + .../ResultadoBusqueda.aspx.designer.cs | 118 +++++++++--------- 3 files changed, 62 insertions(+), 59 deletions(-) diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx b/WebLab/Resultados/ResultadoBusqueda.aspx index 4bb0fd69..ce7ee084 100644 --- a/WebLab/Resultados/ResultadoBusqueda.aspx +++ b/WebLab/Resultados/ResultadoBusqueda.aspx @@ -77,7 +77,7 @@
-
+
diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx.cs b/WebLab/Resultados/ResultadoBusqueda.aspx.cs index 746d3c0a..b520725f 100644 --- a/WebLab/Resultados/ResultadoBusqueda.aspx.cs +++ b/WebLab/Resultados/ResultadoBusqueda.aspx.cs @@ -184,6 +184,7 @@ private void CargarPagina() lblMensaje.Visible = false; IniciarValores(); //IniciarValoresControl(); + pnlCargaResultados.Visible = false; } if (Request["modo"].ToString() == "Urgencia") ddlPrioridad.SelectedValue = "2"; diff --git a/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs b/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs index 392f6088..0ff54720 100644 --- a/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs +++ b/WebLab/Resultados/ResultadoBusqueda.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace WebLab.Resultados { - - - public partial class ResultadoBusqueda { - +namespace WebLab.Resultados +{ + + + public partial class ResultadoBusqueda + { + /// /// pnlTitulo control. /// @@ -20,7 +22,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlTitulo; - + /// /// lblTitulo control. /// @@ -29,7 +31,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblTitulo; - + /// /// imgUrgencia control. /// @@ -38,16 +40,16 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Image imgUrgencia; - + /// - /// Div1 control. + /// pnlCargaResultados control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div1; - + protected global::System.Web.UI.HtmlControls.HtmlGenericControl pnlCargaResultados; + /// /// lblFormaCarga control. /// @@ -56,7 +58,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblFormaCarga; - + /// /// rdbCargaResultados control. /// @@ -65,7 +67,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.RadioButtonList rdbCargaResultados; - + /// /// Div2 control. /// @@ -74,7 +76,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div2; - + /// /// rdbEstado control. /// @@ -83,7 +85,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.RadioButtonList rdbEstado; - + /// /// divValidacion control. /// @@ -92,7 +94,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divValidacion; - + /// /// lblUsuarioValida control. /// @@ -101,7 +103,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblUsuarioValida; - + /// /// hplCambiarContrasenia control. /// @@ -110,7 +112,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hplCambiarContrasenia; - + /// /// lblMensaje control. /// @@ -119,7 +121,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.Label lblMensaje; - + /// /// lblServicio control. /// @@ -128,7 +130,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblServicio; - + /// /// lblModoPreValidacion control. /// @@ -137,7 +139,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblModoPreValidacion; - + /// /// ddlServicio control. /// @@ -146,7 +148,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlServicio; - + /// /// rvArea control. /// @@ -155,7 +157,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.RangeValidator rvArea; - + /// /// ddlArea control. /// @@ -164,7 +166,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlArea; - + /// /// ddlHojaTrabajo control. /// @@ -173,7 +175,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlHojaTrabajo; - + /// /// rvHojaTrabajo control. /// @@ -182,7 +184,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.RangeValidator rvHojaTrabajo; - + /// /// imgAgregarArea control. /// @@ -191,7 +193,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.Image imgAgregarArea; - + /// /// ddlArea2 control. /// @@ -200,7 +202,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlArea2; - + /// /// lblAnalisis control. /// @@ -209,7 +211,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblAnalisis; - + /// /// txtCodigo control. /// @@ -218,7 +220,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.TextBox txtCodigo; - + /// /// ddlAnalisis control. /// @@ -227,7 +229,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlAnalisis; - + /// /// rvAnalisis control. /// @@ -236,7 +238,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.RangeValidator rvAnalisis; - + /// /// txtFechaDesde control. /// @@ -245,7 +247,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaDesde; - + /// /// cvFechas control. /// @@ -254,7 +256,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator cvFechas; - + /// /// txtFechaHasta control. /// @@ -263,7 +265,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtFechaHasta; - + /// /// txtProtocoloDesde control. /// @@ -272,7 +274,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloDesde; - + /// /// cvNumeroDesde control. /// @@ -281,7 +283,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator cvNumeroDesde; - + /// /// txtProtocoloHasta control. /// @@ -290,7 +292,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtProtocoloHasta; - + /// /// cvNumeroHasta control. /// @@ -299,7 +301,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CustomValidator cvNumeroHasta; - + /// /// txtNroOrigen control. /// @@ -308,7 +310,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtNroOrigen; - + /// /// lblPrioridad control. /// @@ -317,7 +319,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblPrioridad; - + /// /// ddlPrioridad control. /// @@ -326,7 +328,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::Anthem.DropDownList ddlPrioridad; - + /// /// ddlEfector control. /// @@ -335,7 +337,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlEfector; - + /// /// lblOrigen control. /// @@ -344,7 +346,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblOrigen; - + /// /// ddlOrigen control. /// @@ -353,7 +355,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlOrigen; - + /// /// lblDniPaciente control. /// @@ -362,7 +364,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblDniPaciente; - + /// /// txtDNI control. /// @@ -371,7 +373,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlInputText txtDNI; - + /// /// cvtxtDNI control. /// @@ -380,7 +382,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CompareValidator cvtxtDNI; - + /// /// chkFactura control. /// @@ -389,7 +391,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkFactura; - + /// /// lblCaracterSisa control. /// @@ -398,7 +400,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl lblCaracterSisa; - + /// /// chkCaracterCovid control. /// @@ -407,7 +409,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBoxList chkCaracterCovid; - + /// /// Div3 control. /// @@ -416,7 +418,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl Div3; - + /// /// lstSector control. /// @@ -425,7 +427,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ListBox lstSector; - + /// /// lnkMarcar control. /// @@ -434,7 +436,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkMarcar; - + /// /// lnkDesmarcar control. /// @@ -443,7 +445,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkDesmarcar; - + /// /// chkRecordarFiltro control. /// @@ -452,7 +454,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkRecordarFiltro; - + /// /// lnkLimpiar control. /// @@ -461,7 +463,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkLimpiar; - + /// /// lnkBuscar control. /// @@ -470,7 +472,7 @@ public partial class ResultadoBusqueda { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkBuscar; - + /// /// ValidationSummary1 control. /// From bb82a689c942f62bd55ff53c7beb2b7cad320db9 Mon Sep 17 00:00:00 2001 From: Vanesa Rimada <80859025+vrimada@users.noreply.github.com> Date: Mon, 29 Jun 2026 13:36:03 -0300 Subject: [PATCH 04/29] =?UTF-8?q?Req.=209:=20=20Mostrar=20pin=20rojo=20en?= =?UTF-8?q?=20la=20solapa=20observaciones=20si=20es=20que=20hay=20datos=20?= =?UTF-8?q?all=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebLab/Resultados/ResultadoEdit2.aspx | 2 +- WebLab/Resultados/ResultadoEdit2.aspx.cs | 6 ++++-- WebLab/Resultados/ResultadoEdit2.aspx.designer.cs | 9 +++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/WebLab/Resultados/ResultadoEdit2.aspx b/WebLab/Resultados/ResultadoEdit2.aspx index 1c217e07..4a1d69c1 100644 --- a/WebLab/Resultados/ResultadoEdit2.aspx +++ b/WebLab/Resultados/ResultadoEdit2.aspx @@ -457,7 +457,7 @@ <%--
  • Incidenciatiene incidencias
    • --%>
  • Aislamientos tiene antibiogramas
  • Antibiogramas tiene antibiogramas
    • -
  • Observaciones
    • +
  • Observaciones tiene observaciones
  • Más opciones
    • diff --git a/WebLab/Resultados/ResultadoEdit2.aspx.cs b/WebLab/Resultados/ResultadoEdit2.aspx.cs index fa68f293..ed30baf4 100644 --- a/WebLab/Resultados/ResultadoEdit2.aspx.cs +++ b/WebLab/Resultados/ResultadoEdit2.aspx.cs @@ -1047,7 +1047,8 @@ private void MuestraDatos(string p) { if (oRegistro.ObservacionResultado != "") { - txtObservacion.Text = oRegistro.ObservacionResultado; + txtObservacion.Text = oRegistro.ObservacionResultado; + obs.Visible = true; } else { @@ -4780,6 +4781,7 @@ protected void btnGuardarObsCodificadaGral_Click(object sender, EventArgs e) oProtocolo.GrabarAuditoriaDetalleProtocolo(Request["Operacion"].ToString(), int.Parse(oUser.IdUsuario.ToString()), "OBSERVACION RESULTADO", txtObservacion.Text); lblObservacionResultado.Text = txtObservacion.Text; + if (txtObservacion.Text != "") obs.Visible = true; else obs.Visible = false; SetSelectedTab(TabIndex.ONE); } else Response.Redirect("../FinSesion.aspx", false); @@ -4792,7 +4794,7 @@ protected void btnBorrarObsCodificadaGral_Click(object sender, EventArgs e) } - + protected void btnAgregarObsCodificadaGral_Click(object sender, EventArgs e) { if (ddlObsCodificadaGeneral.Text != "") diff --git a/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs b/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs index aec54709..12496dec 100644 --- a/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs +++ b/WebLab/Resultados/ResultadoEdit2.aspx.designer.cs @@ -597,6 +597,15 @@ public partial class ResultadoEdit2 { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl tituloObservaciones; + /// + /// obs control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlImage obs; + /// /// tituloAntecedente control. /// From e182b74e377e19bd08b50d0440a78d4a7fc88832 Mon Sep 17 00:00:00 2001 From: Vanesa Rimada <80859025+vrimada@users.noreply.github.com> Date: Tue, 30 Jun 2026 08:55:51 -0300 Subject: [PATCH 05/29] en informe HTrabajoProtocolo1Horizontal.rpt con-sin medico --- .../HTrabajoProtocolo1Horizontal.rpt | Bin 32768 -> 32768 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt b/WebLab/Informes/HojasdeTrabajo/HTrabajoProtocolo1Horizontal.rpt index e4d63f310f287787ec83133297667722ec605f55..3f1383cdf83adee5574bedd46599390cb3a189c7 100644 GIT binary patch delta 12880 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 Date: Tue, 30 Jun 2026 10:48:30 -0300 Subject: [PATCH 06/29] nuevo grafico en Historial por Analisis --- WebLab/Informes/HistoriaClinica.aspx | 7 ++- WebLab/Informes/HistoriaClinica.aspx.cs | 59 +++++++++++++++---- .../Informes/HistoriaClinica.aspx.designer.cs | 38 ++++++------ 3 files changed, 71 insertions(+), 33 deletions(-) diff --git a/WebLab/Informes/HistoriaClinica.aspx b/WebLab/Informes/HistoriaClinica.aspx index 1a4f1389..db4eb60a 100644 --- a/WebLab/Informes/HistoriaClinica.aspx +++ b/WebLab/Informes/HistoriaClinica.aspx @@ -1,9 +1,9 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HistoriaClinica.aspx.cs" Inherits="WebLab.Informes.HistoriaClinica" MasterPageFile="~/Site1.Master" %> + <%@ Register Src="~/Estadisticas/GraficoChart.ascx" TagName="GraficoChart" TagPrefix="uc" %> - - + LABORATORIO