Skip to content

(Lab 260) Mejoras Turnos y Grafico de Estadisticas #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrimada merged 25 commits into from
Jun 9, 2026
Merged

(Lab 260) Mejoras Turnos y Grafico de Estadisticas #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a9dff99
feature: nuevo chart. se implementa en microbiologia
vrimada Nov 25, 2025
61935b6
feature: nuevo chart. se implementa en microbiologia
vrimada Nov 25, 2025
fd29ea2
Merge branch 'LAB-186' of https://github.com/andes/SIL2 into LAB-186
vrimada Apr 8, 2026
26de162
feature: nuevo chart. se implementa en microbiologia
vrimada Nov 25, 2025
341f0b7
Merge branch 'LAB-186' of https://github.com/andes/SIL2 into LAB-186
vrimada Apr 17, 2026
e530ceb
feature: nuevo chart. se implementa en microbiologia
vrimada Nov 25, 2025
2962267
Merge branch 'LAB-186' of https://github.com/andes/SIL2 into LAB-186
vrimada Apr 22, 2026
b5aeaf4
feature: nuevo chart. se implementa en microbiologia
vrimada Nov 25, 2025
a45db53
Merge branch 'LAB-186' of https://github.com/andes/SIL2 into LAB-186
vrimada May 4, 2026
f0029a6
correcion sesiones y cantidad de turnos
vrimada May 4, 2026
7439930
se detalla efector en planillas de turnos
vrimada May 4, 2026
d3e9d70
en proceso efector solicitante
vrimada May 7, 2026
7397cc9
en proceso estadisticas de turnos en centro de salud
vrimada May 5, 2026
60c26db
estadisticas de turnos
vrimada May 7, 2026
6a64ef6
feature turnos
vrimada May 13, 2026
f66f4ec
correcion para administrador externo
vrimada May 13, 2026
facb06d
header en excel estadisticas turnos
vrimada May 26, 2026
5d9fcb5
Merge branch 'LAB-186' into LAB-260
vrimada May 27, 2026
98c7667
grafico: correcion de grafico de mecanismos de resistencia.
vrimada May 27, 2026
6510abf
libreria que ya no esta en el poyecto
vrimada May 27, 2026
831a459
Modificacion de limite de turnos.
vrimada May 29, 2026
1bc2759
cambios de limite en AMB analisis, y en alta de turnos
vrimada May 29, 2026
3b06aa0
dar turnos segun nueva logica de limite de turnos
vrimada Jun 1, 2026
f930280
correcion VerificarLimiteTurnosPorPracticas cuando el usuario es admin
vrimada Jun 4, 2026
6de42ae
correcion dni en filtro
vrimada Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Business/Data/Laboratorio/Item.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public sealed class Item : Business.BaseDataAccess
private bool m_disponible;
private bool m_codificahiv;
private int m_multiplicador;
private int m_limiteturnosdia;
private bool m_etiquetaadicional;
private bool m_informable;
private bool m_requierecaracter;
Expand Down Expand Up @@ -93,7 +92,6 @@ public Item()
m_codificahiv = false;
m_disponible = true;
m_multiplicador = 1;
m_limiteturnosdia = 0;
m_etiquetaadicional = false;
m_informable = true;
m_requierecaracter = false;
Expand Down Expand Up @@ -462,16 +460,7 @@ public int IdItemReferencia

}

public int LimiteTurnosDia
{
get { return m_limiteturnosdia; }
set
{
m_isChanged |= (m_limiteturnosdia != value);
m_limiteturnosdia = value;
}

}



/// <summary>
Expand Down
1 change: 0 additions & 1 deletion Business/Data/Laboratorio/Item.hbm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@


<property column="codigoNomenclador" type="String" name="CodigoNomenclador" not-null="true" length="255" />
<property column="limiteTurnosDia" type="Int32" name="LimiteTurnosDia" not-null="true" />

<property column="etiquetaAdicional" type="Boolean" name="EtiquetaAdicional" not-null="true" />
<property column="informable" type="Boolean" name="Informable" not-null="true" />
Expand Down
18 changes: 13 additions & 5 deletions Business/Data/Laboratorio/ItemEfector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public sealed class ItemEfector : Business.BaseDataAccess
private int m_idpresentacion;
private String m_resultadoDefecto;

private int m_limiteturnosdia;

#endregion

Expand All @@ -44,8 +45,9 @@ public ItemEfector()
{
m_iditemEfector = 0;
m_iditem = new Item();
m_idefector = new Efector();

m_idefector = new Efector();
m_limiteturnosdia = 0;

m_idefectorderivacion = new Efector();

m_disponible = true;
Expand Down Expand Up @@ -249,10 +251,16 @@ public int IdPresentacionDefecto

}

/// <summary>
///
/// </summary>
public int LimiteTurnosDia
{
get { return m_limiteturnosdia; }
set
{
m_isChanged |= (m_limiteturnosdia != value);
m_limiteturnosdia = value;
}

}

/// <summary>
/// Returns whether or not the object has changed it's values.
Expand Down
1 change: 1 addition & 0 deletions Business/Data/Laboratorio/ItemEfector.hbm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<property column="sininsumo" type="Boolean" name="SinInsumo" not-null="true" />
<property column="idPresentacionDefecto" type="Int32" name="IdPresentacionDefecto" not-null="true" />
<property column="resultadoDefecto" type="String" name="ResultadoDefecto" not-null="true" length="200" />
<property column="limiteTurnosDia" type="Int32" name="LimiteTurnosDia" not-null="true" />

</class>
</hibernate-mapping>
34 changes: 26 additions & 8 deletions Business/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ public void CargarRadioButton(RadioButtonList buttons, String strSql, String Cam

#region Excel

public static void ExportDataTableToXlsx(DataTable dataTable, string filename)
public static void ExportDataTableToXlsx(DataTable dataTable, string filename, string header="")
{
//Version final 29/4/26
// ⚠️ Si usas EPPlus v5.x o superior, descomenta esta línea:
Expand All @@ -890,26 +890,43 @@ public static void ExportDataTableToXlsx(DataTable dataTable, string filename)

HttpResponse response = HttpContext.Current.Response;

// Color finalBackColor = ColorTranslator.FromHtml("#2b3e4c"); //azul-neuquen
// Color fontColor = Color.White
// Color finalBackColor = ColorTranslator.FromHtml("#2b3e4c"); //azul-neuquen
// Color fontColor = Color.White
using (ExcelPackage package = new ExcelPackage())
{
// Crear una nueva hoja de trabajo
ExcelWorksheet worksheet = package.Workbook.Worksheets.Add(filename);


int filaInicioTabla = string.IsNullOrWhiteSpace(header) ? 1 : 2;

// Cargar la DataTable en la hoja de trabajo. 'true' incluye los encabezados.
worksheet.Cells["A1"].LoadFromDataTable(dataTable, true);
worksheet.Cells[filaInicioTabla, 1].LoadFromDataTable(dataTable, true);

int colCount = dataTable.Columns.Count;

// Header
if (!string.IsNullOrWhiteSpace(header))
{
worksheet.Cells[1, 1].Value = header;

// combinar columnas
worksheet.Cells[1, 1, 1, colCount+1].Merge = true;

// estilo
worksheet.Cells[1, 1, 1, colCount].Style.Font.Bold = true;
worksheet.Cells[1, 1, 1, colCount].Style.Font.Size = 14;
worksheet.Cells[1, 1, 1, colCount].Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
}

// --- ENCABEZADOS ---
for (int c = 0; c < colCount; c++)
{
worksheet.Cells[1, c + 1].Value = dataTable.Columns[c].ColumnName;
worksheet.Cells[filaInicioTabla, c + 1].Value = dataTable.Columns[c].ColumnName;
}

// --- DATOS ---
int filaExcel = 2;
int filaExcel = filaInicioTabla +1 ;

foreach (DataRow row in dataTable.Rows)
{
Expand Down Expand Up @@ -996,7 +1013,7 @@ out numero
//int colCount = dataTable.Columns.Count;

// Rango del encabezado: Desde A1 hasta el final de la primera fila
using (var range = worksheet.Cells[1, 1, 1, colCount])
using (var range = worksheet.Cells[filaInicioTabla, 1, filaInicioTabla, colCount])
{
ExcelEstilo(range);
}
Expand All @@ -1005,7 +1022,8 @@ out numero
worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();

//Todas las celdas
var range2 = worksheet.Cells[1, 1, rowCount+1, colCount]; //row+1 asi cuenta la fila del encabezado.
int ultimaFila = rowCount + filaInicioTabla;
var range2 = worksheet.Cells[filaInicioTabla, 1, ultimaFila, colCount]; //row+1 asi cuenta la fila del encabezado.
ExcelBordes(range2);
// --- CONFIGURAR RESPUESTA HTTP ---
response.Clear();
Expand Down
46 changes: 44 additions & 2 deletions WebLab/App_Data/dsInformes.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions WebLab/App_Data/dsInformes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
<xs:element name="fechaNacimiento" msprop:Generator_ColumnVarNameInTable="columnfechaNacimiento" msprop:Generator_ColumnPropNameInRow="fechaNacimiento" msprop:Generator_ColumnPropNameInTable="fechaNacimientoColumn" msprop:Generator_UserColumnName="fechaNacimiento" type="xs:string" minOccurs="0" />
<xs:element name="informacionContacto" msprop:Generator_ColumnVarNameInTable="columninformacionContacto" msprop:Generator_ColumnPropNameInRow="informacionContacto" msprop:Generator_ColumnPropNameInTable="informacionContactoColumn" msprop:Generator_UserColumnName="informacionContacto" type="xs:string" minOccurs="0" />
<xs:element name="medicoSolicitante" msprop:Generator_ColumnVarNameInTable="columnmedicoSolicitante" msprop:Generator_ColumnPropNameInRow="medicoSolicitante" msprop:Generator_ColumnPropNameInTable="medicoSolicitanteColumn" msprop:Generator_UserColumnName="medicoSolicitante" type="xs:string" minOccurs="0" />
<xs:element name="efector" msprop:Generator_ColumnVarNameInTable="columnefector" msprop:Generator_ColumnPropNameInRow="efector" msprop:Generator_ColumnPropNameInTable="efectorColumn" msprop:Generator_UserColumnName="efector" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down Expand Up @@ -228,7 +229,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="fusion" msprop:Generator_TableClassName="fusionDataTable" msprop:Generator_TableVarName="tablefusion" msprop:Generator_TablePropName="fusion" msprop:Generator_RowDeletingName="fusionRowDeleting" msprop:Generator_RowChangingName="fusionRowChanging" msprop:Generator_RowEvHandlerName="fusionRowChangeEventHandler" msprop:Generator_RowDeletedName="fusionRowDeleted" msprop:Generator_UserTableName="fusion" msprop:Generator_RowChangedName="fusionRowChanged" msprop:Generator_RowEvArgName="fusionRowChangeEvent" msprop:Generator_RowClassName="fusionRow">
<xs:element name="fusion" msprop:Generator_TableClassName="fusionDataTable" msprop:Generator_TableVarName="tablefusion" msprop:Generator_RowChangedName="fusionRowChanged" msprop:Generator_TablePropName="fusion" msprop:Generator_RowDeletingName="fusionRowDeleting" msprop:Generator_RowChangingName="fusionRowChanging" msprop:Generator_RowEvHandlerName="fusionRowChangeEventHandler" msprop:Generator_RowDeletedName="fusionRowDeleted" msprop:Generator_RowClassName="fusionRow" msprop:Generator_UserTableName="fusion" msprop:Generator_RowEvArgName="fusionRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="tipo" msprop:Generator_ColumnVarNameInTable="columntipo" msprop:Generator_ColumnPropNameInRow="tipo" msprop:Generator_ColumnPropNameInTable="tipoColumn" msprop:Generator_UserColumnName="tipo" type="xs:string" minOccurs="0" />
Expand All @@ -242,7 +243,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="PlacaCovid" msprop:Generator_TableClassName="PlacaCovidDataTable" msprop:Generator_TableVarName="tablePlacaCovid" msprop:Generator_RowChangedName="PlacaCovidRowChanged" msprop:Generator_TablePropName="PlacaCovid" msprop:Generator_RowDeletingName="PlacaCovidRowDeleting" msprop:Generator_RowChangingName="PlacaCovidRowChanging" msprop:Generator_RowEvHandlerName="PlacaCovidRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacaCovidRowDeleted" msprop:Generator_RowClassName="PlacaCovidRow" msprop:Generator_UserTableName="PlacaCovid" msprop:Generator_RowEvArgName="PlacaCovidRowChangeEvent">
<xs:element name="PlacaCovid" msprop:Generator_TableClassName="PlacaCovidDataTable" msprop:Generator_TableVarName="tablePlacaCovid" msprop:Generator_TablePropName="PlacaCovid" msprop:Generator_RowDeletingName="PlacaCovidRowDeleting" msprop:Generator_RowChangingName="PlacaCovidRowChanging" msprop:Generator_RowEvHandlerName="PlacaCovidRowChangeEventHandler" msprop:Generator_RowDeletedName="PlacaCovidRowDeleted" msprop:Generator_UserTableName="PlacaCovid" msprop:Generator_RowChangedName="PlacaCovidRowChanged" msprop:Generator_RowEvArgName="PlacaCovidRowChangeEvent" msprop:Generator_RowClassName="PlacaCovidRow">
<xs:complexType>
<xs:sequence>
<xs:element name="A12" msprop:Generator_ColumnVarNameInTable="columnA12" msprop:Generator_ColumnPropNameInRow="A12" msprop:Generator_ColumnPropNameInTable="A12Column" msprop:Generator_UserColumnName="A12" type="xs:string" minOccurs="0" />
Expand Down Expand Up @@ -425,7 +426,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="derivacion" msprop:Generator_TableClassName="derivacionDataTable" msprop:Generator_TableVarName="tablederivacion" msprop:Generator_TablePropName="derivacion" msprop:Generator_RowDeletingName="derivacionRowDeleting" msprop:Generator_RowChangingName="derivacionRowChanging" msprop:Generator_RowEvHandlerName="derivacionRowChangeEventHandler" msprop:Generator_RowDeletedName="derivacionRowDeleted" msprop:Generator_UserTableName="derivacion" msprop:Generator_RowChangedName="derivacionRowChanged" msprop:Generator_RowEvArgName="derivacionRowChangeEvent" msprop:Generator_RowClassName="derivacionRow">
<xs:element name="derivacion" msprop:Generator_TableClassName="derivacionDataTable" msprop:Generator_TableVarName="tablederivacion" msprop:Generator_RowChangedName="derivacionRowChanged" msprop:Generator_TablePropName="derivacion" msprop:Generator_RowDeletingName="derivacionRowDeleting" msprop:Generator_RowChangingName="derivacionRowChanging" msprop:Generator_RowEvHandlerName="derivacionRowChangeEventHandler" msprop:Generator_RowDeletedName="derivacionRowDeleted" msprop:Generator_RowClassName="derivacionRow" msprop:Generator_UserTableName="derivacion" msprop:Generator_RowEvArgName="derivacionRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="efectorDerivacion" msprop:Generator_ColumnVarNameInTable="columnefectorDerivacion" msprop:Generator_ColumnPropNameInRow="efectorDerivacion" msprop:Generator_ColumnPropNameInTable="efectorDerivacionColumn" msprop:Generator_UserColumnName="efectorDerivacion" type="xs:string" minOccurs="0" />
Expand Down
Loading
Loading