AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2019-12-03 13:39:34 -07:00
parent 8a30794d8b 868c5fe231
commit 11611d6bc5
7 changed files with 105 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AC/RepEstadoActividades.aspx.vb
View File

@@ -332,6 +332,9 @@ Partial Class AC_RepEstadoActividades
If (UsuarioActual.CveEmpresa = 48 And ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("Lic. Damian A. Benitez Alcantar{0}Director Administrativo", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("Ing. Soraida Mesinas Reyes{0}Director General", vbCrLf)))
ElseIf (UsuarioActual.CveEmpresa = 120 And ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("C.P.NEFTALI PEÑA MIRANDA{0}Subdirector de Contabilidad", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("Dra. María Antonieta Laso López{0}Director General", vbCrLf)))
ElseIf (ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("C.P. Izelda Angulo Peraza{0} Subdirector de Contabilidad", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("ING. Soraida Mesinas Reyes{0} Director General", vbCrLf)))

3
AC/RepSituacionFinanciera.aspx.vb
View File

@@ -642,6 +642,9 @@ Partial Class AC_SituacionFinanciera
If (UsuarioActual.CveEmpresa = 48 And ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("Lic. Damian A. Benitez Alcantar{0}Director Administrativo", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("Ing. Soraida Mesinas Reyes{0}Director General", vbCrLf)))
ElseIf (UsuarioActual.CveEmpresa = 120 And ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("C.P.NEFTALI PEÑA MIRANDA{0}Subdirector de Contabilidad", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("Dra. María Antonieta Laso López{0}Director General", vbCrLf)))
ElseIf (ChkFirma.Checked) Then
params.Add(New ReportParameter("pFirma1", String.Format("C.P. Izelda Angulo Peraza{0} Subdirector de Contabilidad", vbCrLf)))
params.Add(New ReportParameter("pFirma2", String.Format("ING. Soraida Mesinas Reyes{0} Director General", vbCrLf)))

46
AC/Reportes/RepEstadoActividades.rdlc
View File

@@ -998,7 +998,7 @@
</Style>
</PageHeader>
<PageFooter>
<Height>4.50688cm</Height>
<Height>2.76063cm</Height>
<PrintOnFirstPage>true</PrintOnFirstPage>
<PrintOnLastPage>true</PrintOnLastPage>
<ReportItems>
@@ -1019,8 +1019,8 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>3.36021cm</Top>
<Left>6.16434cm</Left>
<Top>0.49389cm</Top>
<Left>10.80759cm</Left>
<Height>0.9616cm</Height>
<Width>8.02269cm</Width>
<Visibility>
@@ -1097,7 +1097,7 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Top>3.85438cm</Top>
<Top>1.92292cm</Top>
<Left>0.62818cm</Left>
<Height>0.6cm</Height>
<Width>18.2021cm</Width>
@@ -1112,44 +1112,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox38">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Director administrativo</Value>
<Style />
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.49389cm</Top>
<Left>9.9076cm</Left>
<Height>0.99688cm</Height>
<Width>8.02269cm</Width>
<ZIndex>3</ZIndex>
<Visibility>
<Hidden>=Microsoft.VisualBasic.Interaction.Iif((Globals!PageNumber = Globals!TotalPages) And (Parameters!pFirma1.Value &lt;&gt; ""), False, True)</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
</Border>
<TopBorder>
<Style>Solid</Style>
</TopBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Style>
<Border>

47
AC/Reportes/RepSituacionFinanciera.rdlc
View File

@@ -2859,7 +2859,7 @@
</Style>
</PageHeader>
<PageFooter>
<Height>3.73062cm</Height>
<Height>2.27541cm</Height>
<PrintOnFirstPage>true</PrintOnFirstPage>
<PrintOnLastPage>true</PrintOnLastPage>
<ReportItems>
@@ -2883,7 +2883,7 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox3</rd:DefaultName>
<Top>3.13062cm</Top>
<Top>1.41083cm</Top>
<Left>16.37931cm</Left>
<Height>0.6cm</Height>
<Width>3.95896cm</Width>
@@ -2952,8 +2952,8 @@
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>2.73374cm</Top>
<Left>6.03938cm</Left>
<Top>0.07056cm</Top>
<Left>10.88047cm</Left>
<Height>0.99688cm</Height>
<Width>8.02269cm</Width>
<ZIndex>2</ZIndex>
@@ -2973,45 +2973,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox38">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value xml:space="preserve">
</Value>
<Style />
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox2</rd:DefaultName>
<Top>0.10582cm</Top>
<Left>10.37435cm</Left>
<Height>0.99688cm</Height>
<Width>8.02269cm</Width>
<ZIndex>3</ZIndex>
<Visibility>
<Hidden>=Microsoft.VisualBasic.Interaction.Iif((Globals!PageNumber = Globals!TotalPages) And (Parameters!pFirma1.Value &lt;&gt; ""), False, True)</Hidden>
</Visibility>
<Style>
<Border>
<Style>None</Style>
</Border>
<TopBorder>
<Style>Solid</Style>
</TopBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Style>
<Border>

68
Nomina/Nomina2.aspx
View File

@@ -513,6 +513,74 @@
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}">
<ItemStyle Width="80px" HorizontalAlign="Right" />
</asp:BoundField>
<asp:TemplateField>
<ItemTemplate>
<div style="width: 70px; text-align: right;">

29
Nomina/Nomina2.aspx.cs
View File

@@ -226,10 +226,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
{
if (objnom.GetNominaEmpleado(CveProyecto, CveSubProyecto, CveTurno, CvePeriodo, CveEmpresa, Agrupador) && objnom.DTSetResultados.Tables.Count > 1)
{
dtempleados = objnom.DTSetResultados.Tables[0];
dtConceptos = objnom.DTSetResultados.Tables[1];
dtPeriodo = objnom.DTSetResultados.Tables[2];
dtasistencia = objnom.DTSetResultados.Tables[3];
dtempleados = objnom.DTSetResultados.Tables[3];
dtConceptos = objnom.DTSetResultados.Tables[0];
dtPeriodo = objnom.DTSetResultados.Tables[1];
dtasistencia = objnom.DTSetResultados.Tables[2];
CvePeriodoSeleccionado = CvePeriodo;
continuar = true;
}
@@ -258,7 +258,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
bf.HeaderText = Concepto;
CurrentColumn++;
if (GvNominas.Columns[CurrentColumn].Visible)
{
CurrentColumn++;
}
}
if (true)
{
@@ -279,8 +282,11 @@ public partial class Nomina_Nomina2 : ClsPaginas
GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
bf.HeaderText = Concepto;
CurrentColumn++;
bf.HeaderText = Concepto;
if (GvNominas.Columns[CurrentColumn].Visible)
{
CurrentColumn++;
}
}
if (true)
@@ -308,7 +314,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
GvNominas.Columns[CurrentColumn].Visible = (dtempleados.SUM(string.Format("[V_{0}]", CveConcepto)) > 0);
bf = (BoundField)GvNominas.Columns[CurrentColumn];
bf.DataField = string.Format("V_{0}", CveConcepto);
CurrentColumn++;
bf.HeaderText = Concepto;
if (GvNominas.Columns[CurrentColumn].Visible)
{
CurrentColumn++;
}
}
if (true)
{
@@ -1349,7 +1360,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
using (ClsNominas objnom = new ClsNominas())
{
if (objnom.GetTablasNomina (UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
{
GVFactorDesctInfonavit.DataSource = objnom.DTSetResultados.Tables[0];
GVSalariosMinimos.DataSource = objnom.DTSetResultados.Tables[1];

5
Scripts/custom.js
View File

@@ -1211,11 +1211,12 @@ function AdsTabWizard() {
});
}, 10)
}
function MoveFixedDiv() {
var downMove = null;
var x;
var y;
$(".modal-content .modal-header").mousedown(function (e) {
$("body").on('mousedown', '.modal-content >.modal-header', function (e) {
e.preventDefault();
downMove = $(this).parent().parent();
x = e.pageX;
@@ -1768,6 +1769,7 @@ jQuery(document).ready(function () {
loadsortadscroll();
QuickSidebar.init();
MoveFixedDiv();
setswitch();
function ocultarbtnmaster() { if ($('#btnmaster_actionssidebar + ul').text().trim() == "") { $('#btnmaster_actionssidebar').css('display', 'none'); } else { $('#btnmaster_actionssidebar').css('display', 'block'); } }
@@ -1778,7 +1780,6 @@ jQuery(document).ready(function () {
loadwebservice();
ocultarbtnmaster();
movepanel();
MoveFixedDiv();
loadADSortable();
loadadscroll();
CargaPickers();