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

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-01-26 03:07:15 -07:00
parent f8dddfd5a1
commit d6d3bebcb5
15 changed files with 10129 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
App_Code/ClsNominas.vb
View File

@@ -540,6 +540,33 @@ Public Class ClsNominas
Return Retorno Return Retorno
End Function End Function
Public Function PA_Nom_NominasAutorizarUP(cvePersonal As Int32, cvePeriodo As Int32, salarioDiario As Decimal, sBC As Decimal, sDI As Decimal, horasDobles As Int16, horasTriples As Int16, total As Double, subTotal As Double, diasPagados As Double, diasFaltados As Int32, diasVacaciones As Int32, diasIncapacidad As Int32) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_Nom_NominasAutorizarUP", CommandType.StoredProcedure)
With SqlAdapter.SelectCommand.Parameters
.Add("@CvePersonal", SqlDbType.Int).Value = cvePersonal
.Add("@CvePeriodo", SqlDbType.Int).Value = cvePeriodo
.Add("@SalarioDiario", SqlDbType.SmallMoney).Value = salarioDiario
.Add("@SBC", SqlDbType.SmallMoney).Value = sBC
.Add("@SDI", SqlDbType.SmallMoney).Value = sDI
.Add("@HorasDobles", SqlDbType.SmallInt).Value = horasDobles
.Add("@HorasTriples", SqlDbType.SmallInt).Value = horasTriples
.Add("@Total", SqlDbType.Float).Value = total
.Add("@SubTotal", SqlDbType.Float).Value = subTotal
.Add("@DiasPagados", SqlDbType.Float).Value = diasPagados
.Add("@DiasFaltados", SqlDbType.Int).Value = diasFaltados
.Add("@DiasVacaciones", SqlDbType.Int).Value = diasVacaciones
.Add("@DiasIncapacidad", SqlDbType.Int).Value = diasIncapacidad
End With
Try
SqlAdapter.Fill(Data)
Retorno = True
Catch ex As Exception
OnError("Ocurrió un error al autorizar la nomina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
Return retorno
End Function
Public Function AddNom_Nominas(FolioNom As Integer, CveNominaTipo As Integer, CvePersonal As Integer, CvePeriodo As Integer, SubTotal As Double, Descuento As Double, RetISR As Double, Total As Double, Public Function AddNom_Nominas(FolioNom As Integer, CveNominaTipo As Integer, CvePersonal As Integer, CvePeriodo As Integer, SubTotal As Double, Descuento As Double, RetISR As Double, Total As Double,
CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, Fecha As Date, MotivoDescuento As String, Observaciones As String, CveMoneda As Integer, TipoCambio As Double, CveMetodoPago As Integer, Fecha As Date, MotivoDescuento As String, Observaciones As String,
Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double, Alfa1 As String, Alfa2 As String, Alfa3 As String, Num1 As Double, Num2 As Double, Num3 As Double,

36
App_Code/TimbradoB.vb Normal file
View File

@@ -0,0 +1,36 @@
Imports Microsoft.VisualBasic
Public Class TimbradoB
'Public Function TimbrarFactura(UsuarioActual As Usuario, Ventas As Modelos.Factura, Optional CvePACEspecial As Integer = -1) As Boolean
' Dim Retorno As Boolean = False
' Dim tCvePAC As Integer = UsuarioActual.Empresa.CvePAC
' If CvePACEspecial <> -1 Then tCvePAC = CvePACEspecial
' Dim objs As ADSTimbrado.TimbradoEmpresa
' Dim result = ADSTimbrado.Timbrado.TimbrarFactura(Ventas, objs, ADSTimbrado.PacTimbrado.PADEv)
' Retorno = result.isOK
' If result.isOK Then
' Else
' End If
' Return Retorno
'End Function
End Class
'Public Class TimbradoEmpresa
' Inherits ADSTimbradoLibrary.TimbradoEmpresa
' Public Overrides Function UpdateEstatusFactura(FolioFiscal As String, ObjCFDITimbre As ADSTimbradoLibrary.CFDITimbre, facturaCFDI As ADSTimbradoLibrary.Factura, CvePAC As Integer) As String
' Throw New NotImplementedException()
' End Function
' Public Overrides Function Timbre() As String
' Throw New NotImplementedException()
' End Function
'End Class

111
Empresas/Grales/Formatos/RHGafete.rdlc
View File

@@ -4,20 +4,6 @@
<ReportItems> <ReportItems>
<Rectangle Name="Rectangle1"> <Rectangle Name="Rectangle1">
<ReportItems> <ReportItems>
<Image Name="Image1">
<Source>Embedded</Source>
<Value>Logo</Value>
<Sizing>FitProportional</Sizing>
<Top>0.41929cm</Top>
<Left>1.2827cm</Left>
<Height>3.23567cm</Height>
<Width>4.49779cm</Width>
<Style>
<Border>
<Style>None</Style>
</Border>
</Style>
</Image>
<Textbox Name="Textbox1"> <Textbox Name="Textbox1">
<CanGrow>true</CanGrow> <CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether> <KeepTogether>true</KeepTogether>
@@ -41,7 +27,6 @@
<Left>0.381cm</Left> <Left>0.381cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>1.74625cm</Width> <Width>1.74625cm</Width>
<ZIndex>1</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -60,7 +45,7 @@
<Left>4.21416cm</Left> <Left>4.21416cm</Left>
<Height>2.78048cm</Height> <Height>2.78048cm</Height>
<Width>2.21979cm</Width> <Width>2.21979cm</Width>
<ZIndex>2</ZIndex> <ZIndex>1</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -91,7 +76,7 @@
<Left>0.28575cm</Left> <Left>0.28575cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>3.2225cm</Width> <Width>3.2225cm</Width>
<ZIndex>3</ZIndex> <ZIndex>2</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -107,7 +92,7 @@
<Left>0.28575cm</Left> <Left>0.28575cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>3.2225cm</Width> <Width>3.2225cm</Width>
<ZIndex>4</ZIndex> <ZIndex>3</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -140,7 +125,7 @@
<Left>0.28575cm</Left> <Left>0.28575cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>3.09903cm</Width> <Width>3.09903cm</Width>
<ZIndex>5</ZIndex> <ZIndex>4</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -156,7 +141,7 @@
<Left>0.28575cm</Left> <Left>0.28575cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>3.10079cm</Width> <Width>3.10079cm</Width>
<ZIndex>6</ZIndex> <ZIndex>5</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -189,7 +174,7 @@
<Left>4.11891cm</Left> <Left>4.11891cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>1.90229cm</Width> <Width>1.90229cm</Width>
<ZIndex>7</ZIndex> <ZIndex>6</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -205,7 +190,7 @@
<Left>3.61103cm</Left> <Left>3.61103cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>2.82292cm</Width> <Width>2.82292cm</Width>
<ZIndex>8</ZIndex> <ZIndex>7</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -236,7 +221,7 @@
<Left>0.0635cm</Left> <Left>0.0635cm</Left>
<Height>0.6cm</Height> <Height>0.6cm</Height>
<Width>6.67724cm</Width> <Width>6.67724cm</Width>
<ZIndex>9</ZIndex> <ZIndex>8</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -270,7 +255,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.41303cm</Height> <Height>0.41303cm</Height>
<Width>1.04599cm</Width> <Width>1.04599cm</Width>
<ZIndex>10</ZIndex> <ZIndex>9</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -303,7 +288,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.41628cm</Height> <Height>0.41628cm</Height>
<Width>1.08479cm</Width> <Width>1.08479cm</Width>
<ZIndex>11</ZIndex> <ZIndex>10</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -336,7 +321,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.43596cm</Height> <Height>0.43596cm</Height>
<Width>3.37312cm</Width> <Width>3.37312cm</Width>
<ZIndex>12</ZIndex> <ZIndex>11</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -369,7 +354,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.39892cm</Height> <Height>0.39892cm</Height>
<Width>1.55985cm</Width> <Width>1.55985cm</Width>
<ZIndex>13</ZIndex> <ZIndex>12</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -402,7 +387,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.3901cm</Height> <Height>0.3901cm</Height>
<Width>2.36625cm</Width> <Width>2.36625cm</Width>
<ZIndex>14</ZIndex> <ZIndex>13</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -435,7 +420,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.40421cm</Height> <Height>0.40421cm</Height>
<Width>1.58424cm</Width> <Width>1.58424cm</Width>
<ZIndex>15</ZIndex> <ZIndex>14</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -468,7 +453,7 @@
<Left>6.95537cm</Left> <Left>6.95537cm</Left>
<Height>0.43118cm</Height> <Height>0.43118cm</Height>
<Width>3.37312cm</Width> <Width>3.37312cm</Width>
<ZIndex>16</ZIndex> <ZIndex>15</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -501,7 +486,7 @@
<Left>6.95537cm</Left> <Left>6.95537cm</Left>
<Height>0.37069cm</Height> <Height>0.37069cm</Height>
<Width>1.07037cm</Width> <Width>1.07037cm</Width>
<ZIndex>17</ZIndex> <ZIndex>16</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -534,7 +519,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.4601cm</Height> <Height>0.4601cm</Height>
<Width>2.10312cm</Width> <Width>2.10312cm</Width>
<ZIndex>18</ZIndex> <ZIndex>17</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -567,7 +552,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.42008cm</Height> <Height>0.42008cm</Height>
<Width>1.04599cm</Width> <Width>1.04599cm</Width>
<ZIndex>19</ZIndex> <ZIndex>18</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -600,7 +585,7 @@
<Left>6.95537cm</Left> <Left>6.95537cm</Left>
<Height>0.44125cm</Height> <Height>0.44125cm</Height>
<Width>1.96378cm</Width> <Width>1.96378cm</Width>
<ZIndex>20</ZIndex> <ZIndex>19</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -616,7 +601,7 @@
<Left>8.06455cm</Left> <Left>8.06455cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.59245cm</Width> <Width>5.59245cm</Width>
<ZIndex>21</ZIndex> <ZIndex>20</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -629,7 +614,7 @@
<Left>7.87726cm</Left> <Left>7.87726cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.77973cm</Width> <Width>5.77973cm</Width>
<ZIndex>22</ZIndex> <ZIndex>21</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -642,7 +627,7 @@
<Left>10.22883cm</Left> <Left>10.22883cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>3.42816cm</Width> <Width>3.42816cm</Width>
<ZIndex>23</ZIndex> <ZIndex>22</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -655,7 +640,7 @@
<Left>8.46349cm</Left> <Left>8.46349cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.16176cm</Width> <Width>5.16176cm</Width>
<ZIndex>24</ZIndex> <ZIndex>23</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -668,7 +653,7 @@
<Left>9.28251cm</Left> <Left>9.28251cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>4.37449cm</Width> <Width>4.37449cm</Width>
<ZIndex>25</ZIndex> <ZIndex>24</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -681,7 +666,7 @@
<Left>8.36824cm</Left> <Left>8.36824cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.28876cm</Width> <Width>5.28876cm</Width>
<ZIndex>26</ZIndex> <ZIndex>25</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -694,7 +679,7 @@
<Left>10.10183cm</Left> <Left>10.10183cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>3.55516cm</Width> <Width>3.55516cm</Width>
<ZIndex>27</ZIndex> <ZIndex>26</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -707,7 +692,7 @@
<Left>7.65501cm</Left> <Left>7.65501cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>6.00198cm</Width> <Width>6.00198cm</Width>
<ZIndex>28</ZIndex> <ZIndex>27</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -720,7 +705,7 @@
<Left>9.01601cm</Left> <Left>9.01601cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>4.64099cm</Width> <Width>4.64099cm</Width>
<ZIndex>29</ZIndex> <ZIndex>28</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -733,7 +718,7 @@
<Left>7.82113cm</Left> <Left>7.82113cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.83587cm</Width> <Width>5.83587cm</Width>
<ZIndex>30</ZIndex> <ZIndex>29</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -746,7 +731,7 @@
<Left>8.79713cm</Left> <Left>8.79713cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>4.85987cm</Width> <Width>4.85987cm</Width>
<ZIndex>31</ZIndex> <ZIndex>30</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -788,7 +773,7 @@
<Left>6.95537cm</Left> <Left>6.95537cm</Left>
<Height>1.79104cm</Height> <Height>1.79104cm</Height>
<Width>6.70163cm</Width> <Width>6.70163cm</Width>
<ZIndex>32</ZIndex> <ZIndex>31</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -837,7 +822,7 @@
<Left>6.97976cm</Left> <Left>6.97976cm</Left>
<Height>0.89104cm</Height> <Height>0.89104cm</Height>
<Width>6.67724cm</Width> <Width>6.67724cm</Width>
<ZIndex>33</ZIndex> <ZIndex>32</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -870,7 +855,7 @@
<Left>8.04338cm</Left> <Left>8.04338cm</Left>
<Height>0.34247cm</Height> <Height>0.34247cm</Height>
<Width>5.61362cm</Width> <Width>5.61362cm</Width>
<ZIndex>34</ZIndex> <ZIndex>33</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -902,7 +887,7 @@
<Left>8.06455cm</Left> <Left>8.06455cm</Left>
<Height>0.33894cm</Height> <Height>0.33894cm</Height>
<Width>5.59245cm</Width> <Width>5.59245cm</Width>
<ZIndex>35</ZIndex> <ZIndex>34</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -934,7 +919,7 @@
<Left>10.38816cm</Left> <Left>10.38816cm</Left>
<Height>0.34776cm</Height> <Height>0.34776cm</Height>
<Width>3.26884cm</Width> <Width>3.26884cm</Width>
<ZIndex>36</ZIndex> <ZIndex>35</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -966,7 +951,7 @@
<Left>8.63838cm</Left> <Left>8.63838cm</Left>
<Height>0.2384cm</Height> <Height>0.2384cm</Height>
<Width>5.01862cm</Width> <Width>5.01862cm</Width>
<ZIndex>37</ZIndex> <ZIndex>36</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -998,7 +983,7 @@
<Left>9.34601cm</Left> <Left>9.34601cm</Left>
<Height>0.30719cm</Height> <Height>0.30719cm</Height>
<Width>4.31099cm</Width> <Width>4.31099cm</Width>
<ZIndex>38</ZIndex> <ZIndex>37</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1030,7 +1015,7 @@
<Left>8.46874cm</Left> <Left>8.46874cm</Left>
<Height>0.27544cm</Height> <Height>0.27544cm</Height>
<Width>5.16176cm</Width> <Width>5.16176cm</Width>
<ZIndex>39</ZIndex> <ZIndex>38</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1062,7 +1047,7 @@
<Left>10.39905cm</Left> <Left>10.39905cm</Left>
<Height>0.32535cm</Height> <Height>0.32535cm</Height>
<Width>3.25795cm</Width> <Width>3.25795cm</Width>
<ZIndex>40</ZIndex> <ZIndex>39</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1094,7 +1079,7 @@
<Left>8.06455cm</Left> <Left>8.06455cm</Left>
<Height>0.32131cm</Height> <Height>0.32131cm</Height>
<Width>5.59245cm</Width> <Width>5.59245cm</Width>
<ZIndex>41</ZIndex> <ZIndex>40</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1126,7 +1111,7 @@
<Left>9.15344cm</Left> <Left>9.15344cm</Left>
<Height>0.30543cm</Height> <Height>0.30543cm</Height>
<Width>4.50356cm</Width> <Width>4.50356cm</Width>
<ZIndex>42</ZIndex> <ZIndex>41</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1166,7 +1151,7 @@
<Left>0.381cm</Left> <Left>0.381cm</Left>
<Height>1.4631cm</Height> <Height>1.4631cm</Height>
<Width>6.05295cm</Width> <Width>6.05295cm</Width>
<ZIndex>43</ZIndex> <ZIndex>42</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1200,7 +1185,7 @@
<Left>3.61103cm</Left> <Left>3.61103cm</Left>
<Height>0.41382cm</Height> <Height>0.41382cm</Height>
<Width>2.82292cm</Width> <Width>2.82292cm</Width>
<ZIndex>44</ZIndex> <ZIndex>43</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1232,7 +1217,7 @@
<Left>8.0963cm</Left> <Left>8.0963cm</Left>
<Height>0.38481cm</Height> <Height>0.38481cm</Height>
<Width>5.5607cm</Width> <Width>5.5607cm</Width>
<ZIndex>45</ZIndex> <ZIndex>44</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1264,7 +1249,7 @@
<Left>9.01439cm</Left> <Left>9.01439cm</Left>
<Height>0.33189cm</Height> <Height>0.33189cm</Height>
<Width>4.6426cm</Width> <Width>4.6426cm</Width>
<ZIndex>46</ZIndex> <ZIndex>45</ZIndex>
<Style> <Style>
<Border> <Border>
<Style>None</Style> <Style>None</Style>
@@ -1280,7 +1265,7 @@
<Left>2.02882cm</Left> <Left>2.02882cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>4.40513cm</Width> <Width>4.40513cm</Width>
<ZIndex>47</ZIndex> <ZIndex>46</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -1293,7 +1278,7 @@
<Left>0.43512cm</Left> <Left>0.43512cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.99883cm</Width> <Width>5.99883cm</Width>
<ZIndex>48</ZIndex> <ZIndex>47</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>
@@ -1306,7 +1291,7 @@
<Left>0.43512cm</Left> <Left>0.43512cm</Left>
<Height>0cm</Height> <Height>0cm</Height>
<Width>5.99883cm</Width> <Width>5.99883cm</Width>
<ZIndex>49</ZIndex> <ZIndex>48</ZIndex>
<Style> <Style>
<Border> <Border>
<Color>#073a79</Color> <Color>#073a79</Color>

22
Empresas/Grales/Formatos/SobreRecibo.rdlc
View File

@@ -2896,7 +2896,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>$</Value> <Value>=IIf(not IsNothing(Fields!ConceptoP.Value) ORELSE Fields!ImporteP.Value &gt;0,"$",Nothing)</Value>
<Style /> <Style />
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -2927,7 +2927,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>=Fields!ImporteP.Value</Value> <Value>=IIf(not IsNothing(Fields!ConceptoP.Value) ORELSE Fields!ImporteP.Value &gt;0,Fields!ImporteP.Value,nothing)</Value>
<Style> <Style>
<Format>#,0.00;(#,0.00)</Format> <Format>#,0.00;(#,0.00)</Format>
</Style> </Style>
@@ -3025,7 +3025,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>$</Value> <Value>=IIf(not IsNothing(Fields!ConceptoD.Value) ORELSE Fields!ImporteD.Value &gt;0,"$"," ")</Value>
<Style /> <Style />
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -3056,7 +3056,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>=Fields!ImporteD.Value</Value> <Value>=IIf(not IsNothing(Fields!ConceptoD.Value) ORELSE Fields!ImporteD.Value &gt;0,Fields!ImporteD.Value,nothing)</Value>
<Style> <Style>
<Format>#,0.00;(#,0.00)</Format> <Format>#,0.00;(#,0.00)</Format>
</Style> </Style>
@@ -4194,7 +4194,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value> Percepciones y deducciones que en el aparecen a la fecha COMPUPROVEEDORES SA DE CV no me adeuda</Value> <Value> Percepciones y deducciones que en el aparecen a la fecha [@Empresa] no me adeuda</Value>
<Style /> <Style />
</TextRun> </TextRun>
</TextRuns> </TextRuns>
@@ -5130,6 +5130,18 @@
<AllowBlank>true</AllowBlank> <AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt> <Prompt>ReportParameter1</Prompt>
</ReportParameter> </ReportParameter>
<ReportParameter Name="Empresa">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
<ReportParameter Name="SubProyecto">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters> </ReportParameters>
<rd:ReportUnitType>Cm</rd:ReportUnitType> <rd:ReportUnitType>Cm</rd:ReportUnitType>
<rd:ReportID>40c94aad-a12a-44fb-ab0d-ea36a9656792</rd:ReportID> <rd:ReportID>40c94aad-a12a-44fb-ab0d-ea36a9656792</rd:ReportID>

1
Nomina/FiniquitoOld.aspx.cs
View File

@@ -262,6 +262,7 @@ partial class Nomina_Finiquito : ClsPaginas
ChkesLiquidacion.Checked = esLiquidacion; ChkesLiquidacion.Checked = esLiquidacion;
} }
} }
Timbrado tr;
if (DdlMotivoBaja.SelectedValue.ToEntero() > 0) if (DdlMotivoBaja.SelectedValue.ToEntero() > 0)
LblMotivoBaja.Text = DdlMotivoBaja.SelectedItem.Text; LblMotivoBaja.Text = DdlMotivoBaja.SelectedItem.Text;
else else

13
Nomina/Nomina2.aspx
View File

@@ -274,6 +274,15 @@
<asp:ListItem Text="Todos" Value="3"></asp:ListItem> <asp:ListItem Text="Todos" Value="3"></asp:ListItem>
</asp:DropDownList> </asp:DropDownList>
</div> </div>
<label class="col-md-1 " style="line-height: 1;">Agrupador:</label>
<div class="col-md-1">
<asp:DropDownList ID="DdlAgrupadorB" runat="server" Style="width: 100% !important;" CssClass="select2me">
<asp:ListItem Text="Sin Agrupación" Value="-1" Selected ="True"></asp:ListItem>
<asp:ListItem Text="Centro de costos" Value="1"></asp:ListItem>
<asp:ListItem Text="Departamento" Value="2"></asp:ListItem>
</asp:DropDownList>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -307,7 +316,7 @@
</div> </div>
</div> </div>
<div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom "> <div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
<asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePeriodo,CvePersonal,CveNomina,SeTimbro,SerieFolio,Nombre,Correo,Codigo,Turno,SubProyecto,NomAutorizado" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound" <asp:GridView ID="GvNominas" runat="server" DataKeyNames="CvePeriodo,CvePersonal,CveNomina,SeTimbro,SerieFolio,Nombre,Correo,Codigo,Turno,Departamento,SubProyecto,NomAutorizado" AutoGenerateColumns="False" OnRowDataBound="GvNominas_RowDataBound"
CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="2" data-rows="2" data-heighterror="360"> CssClass="table table-striped table-advance table-hover mysmallbtn ScrollAD Widthall GvNominas" Style="text-align: center;" GridLines="None" data-cols="2" data-rows="2" data-heighterror="360">
<Columns> <Columns>
@@ -323,7 +332,7 @@
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlNombre" runat="server"></asp:Literal> <asp:Literal ID="LtlNombre" runat="server"></asp:Literal>
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="350px" HorizontalAlign="Left" /> <ItemStyle Width="300px" HorizontalAlign="Left" />
</asp:TemplateField> </asp:TemplateField>
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" /> <asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />
<asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" /> <asp:BoundField Visible="false" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" HeaderStyle-Width="80px" />

1006
Nomina/Nomina2.aspx.cs
View File

File diff suppressed because it is too large Load Diff

48
Nomina/PreNomina.aspx
View File

@@ -1,33 +1,23 @@
<%@ Page Title="Nómina - Pre Nómina" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PreNomina.aspx.vb" Inherits="Nomina_PreNomina" %> <%@ Page Title="Nómina - Pre nómina" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="PreNomina.aspx.vb" Inherits="Nomina_PreNomina" %>
<asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server"> <asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server"> <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
<asp:UpdatePanel ID="UpnTools" runat="server" UpdateMode="Conditional"> <asp:UpdatePanel ID="UpnTools" runat="server" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<li> <li>
<%-- <asp:LinkButton ID="ImgExcel" runat="server"><i class="fa fa-ad-excel"></i> Imprimir EXCEL</asp:LinkButton>--%> <asp:LinkButton ID="ImgExcel" Target="_blank" runat="server"> <i class="fa fa-ad-excel"></i> Imprimir</asp:LinkButton>
<asp:ImageButton ID="ImgExcel" runat="server" ImageUrl="/Imagenes/IconoExcel.gif" Width="17px" Height="17px" />
</li> </li>
<li> <li>
<asp:HyperLink ID="HLImgImprimir" Target="_blank" runat="server" NavigateUrl="#"> <i class="fa fa-ad-pdf"></i> Imprimir</asp:HyperLink> <asp:HyperLink ID="HLImgImprimir" Target="_blank" runat="server" NavigateUrl="#"> <i class="fa fa-ad-pdf"></i> Imprimir</asp:HyperLink>
<%--<a id="HLImgImprimir" runat="server" href="#" class="Texto">
<img alt="Imprimir" src="/Imagenes/btnImprimir.gif"/>
</a>--%>
</li> </li>
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
</asp:Content> </asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="E" runat="Server"> <asp:Content ID="Content4" ContentPlaceHolderID="E" runat="Server">
Pre Nómina Pre nómina
</asp:Content> </asp:Content>
<asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server"> <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
</asp:Content> </asp:Content>
@@ -57,10 +47,10 @@
</div> </div>
<div class="tools"> <div class="tools">
<asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-primary" /> <asp:Button ID="BtnConsultar" runat="server" Text="Consultar" class="btn btn-primary" />
<a href="javascript:;" class="expand"></a>
<a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a>
<asp:Button ID="BtnGuardarBono" runat="server" Text="Guardar Bonos" class="btn btn-primary" /> <asp:Button ID="BtnGuardarBono" runat="server" Text="Guardar Bonos" class="btn btn-primary" />
<asp:Button ID="BtnImpresion" runat="server" Text="Cerrar Nómina" class="btn btn-primary" /> <asp:Button ID="BtnImpresion" runat="server" Text="Cerrar Nómina" class="btn btn-primary" />
<a href="javascript:;" class="expand"></a>
<a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a>
</div> </div>
</div> </div>
<div class="portlet-body" style="display: none;"> <div class="portlet-body" style="display: none;">
@@ -79,7 +69,12 @@
</div> </div>
</div> </div>
<table id="TblHeader" runat="server" class="table table-striped table-advance table-hover" width="1385px"> </ContentTemplate>
</asp:UpdatePanel>
<br />
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<table id="TblHeader" runat="server" class="table table-striped table-advance table-hover Widthall TblHeader" >
<thead> <thead>
<tr class="Titulos"> <tr class="Titulos">
<th rowspan="2" width="250px">Nombre</th> <th rowspan="2" width="250px">Nombre</th>
@@ -99,7 +94,6 @@
<th id="TDBono" runat="server" rowspan="2" style="width: 60px;">Bono</th> <th id="TDBono" runat="server" rowspan="2" style="width: 60px;">Bono</th>
<th id="TDPagoAdicional" runat="server" rowspan="2" style="width: 60px;">Pago Adi</th> <th id="TDPagoAdicional" runat="server" rowspan="2" style="width: 60px;">Pago Adi</th>
<th id="TDDescuento" runat="server" rowspan="2" style="width: 60px;">Desc Adi</th>--%> <th id="TDDescuento" runat="server" rowspan="2" style="width: 60px;">Desc Adi</th>--%>
<th rowspan="2">&nbsp;</th>
</tr> </tr>
<tr class="Titulos"> <tr class="Titulos">
<th width="35px">Tipo</th> <th width="35px">Tipo</th>
@@ -133,12 +127,8 @@
</tr> </tr>
</thead> </thead>
</table> </table>
</ContentTemplate> <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal" EmptyDataText="No se encontraron Ventas con los filtros especificados" data-tableheader=".TblHeader"
</asp:UpdatePanel> ToolTip="Pre Nómina" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" Style=" text-align: center;" GridLines="None" data-scrollwidthrow=".scrollwidthrow">
<br />
<asp:UpdatePanel ID="UPDatos" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal" EmptyDataText="No se encontraron Ventas con los filtros especificados" ToolTip="Pre Nómina" Width="1385px" CssClass="table table-striped table-advance table-hover" Style="margin-top: -10px; text-align: center;" GridLines="None">
<Columns> <Columns>
<asp:TemplateField> <asp:TemplateField>
<ItemTemplate> <ItemTemplate>
@@ -345,37 +335,37 @@
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="60px" /> <ItemStyle Width="60px" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:TemplateField Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:CheckBox ID="ChkAplica" runat="server" Visible="false" Checked='<%# Eval("AplicaBono") %>' /> <asp:CheckBox ID="ChkAplica" runat="server" Visible="false" Checked='<%# Eval("AplicaBono") %>' />
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="70px" /> <ItemStyle Width="70px" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:TemplateField Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtBono" runat="server" Visible="false" Text='<%# Eval("Importe", "{0:N0}") %>' Width="44px"></asp:TextBox> <asp:TextBox ID="TxtBono" runat="server" Visible="false" Text='<%# Eval("Importe", "{0:N0}") %>' Width="44px"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="60px" /> <ItemStyle Width="60px" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:TemplateField Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtPagoAdicional" Visible="false" runat="server" Text='<%# Eval("PagoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox> <asp:TextBox ID="TxtPagoAdicional" Visible="false" runat="server" Text='<%# Eval("PagoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="60px" /> <ItemStyle Width="60px" />
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField> <asp:TemplateField Visible="false">
<ItemTemplate> <ItemTemplate>
<asp:TextBox ID="TxtDescuentoAdicional" Visible="false" runat="server" Text='<%# Eval("DescuentoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox> <asp:TextBox ID="TxtDescuentoAdicional" Visible="false" runat="server" Text='<%# Eval("DescuentoAdicional", "{0:N0}") %>' Width="44px"></asp:TextBox>
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="60px" /> <ItemStyle Width="60px" />
</asp:TemplateField> </asp:TemplateField>
<%--<asp:TemplateField> <%--<asp:TemplateField>
<ItemTemplate> <ItemTemplate>
<asp:Literal ID="LtlHorasTriples" runat="server" Text='<%# Eval("HorasTriples") %>'></asp:Literal> <asp:Literal ID="LtlHorasTriples" runat="server" Text='<%# Eval("HorasTriples") %>'></asp:Literal>
</ItemTemplate> </ItemTemplate>
<ItemStyle Width="65px" /> <ItemStyle Width="65px" />
</asp:TemplateField>--%> </asp:TemplateField>--%>
<asp:TemplateField> <asp:TemplateField Visible="false">
<ItemTemplate> <ItemTemplate>
&nbsp; &nbsp;
</ItemTemplate> </ItemTemplate>

3
Nomina/PreNomina.aspx.vb
View File

@@ -205,11 +205,12 @@ Partial Class Nomina_PreNomina
If e.Row.DBCampo("Asistencias").ToDouble = 0 Then e.Row.FCLiteral("LtlAsistencias").Text = "" If e.Row.DBCampo("Asistencias").ToDouble = 0 Then e.Row.FCLiteral("LtlAsistencias").Text = ""
If e.Row.DBCampo("Faltas").ToDouble = 0 Then e.Row.FCLiteral("LtlFaltas").Text = "" If e.Row.DBCampo("Faltas").ToDouble = 0 Then e.Row.FCLiteral("LtlFaltas").Text = ""
If e.Row.DBCampo("HorasDobles").ToDouble = 0 Then e.Row.FCLiteral("LtlHorasExtras").Text = "" If e.Row.DBCampo("HorasDobles").ToDouble = 0 Then e.Row.FCLiteral("LtlHorasExtras").Text = ""
e.Row.CssClass = "scrollwidthrow"
End If End If
End If End If
End Sub End Sub
Protected Sub ImgExcel_Click(sender As Object, e As System.Web.UI.ImageClickEventArgs) Handles ImgExcel.Click Protected Sub ImgExcel_Click(sender As Object, e As EventArgs) Handles ImgExcel.Click
GvDatos.ExportToExcel("PreNomina", TblHeader) GvDatos.ExportToExcel("PreNomina", TblHeader)
End Sub End Sub

9343
RH/ActualizacionMasiva.aspx.vb
View File

File diff suppressed because it is too large Load Diff

2
RH/Asistencias.aspx
View File

@@ -27,7 +27,7 @@
<a href="javascript:;" class="collapse"></a> <a href="javascript:;" class="collapse"></a>
<a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a> <a onclick="document.getElementById('C_BtnConsultar').click();" class="reload"></a>
</div> </div>
<div class="titlefiltros caption "> <div class="titlefiltros ">
<ul class="list-inline"> <ul class="list-inline">
<li>Cliente: <li>Cliente:
<asp:Button ID="BtnCargarClientes" runat="server" ClientIDMode="Static" Text="CargarClientes" Style="display: none;" /> <asp:Button ID="BtnCargarClientes" runat="server" ClientIDMode="Static" Text="CargarClientes" Style="display: none;" />

11
RH/Personal.aspx
View File

@@ -32,7 +32,11 @@
<asp:LinkButton ID="ImgImprimir" Visible="false" runat="server"> <i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> PDF</asp:LinkButton> <asp:LinkButton ID="ImgImprimir" Visible="false" runat="server"> <i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> PDF</asp:LinkButton>
</li>--%> </li>--%>
<li> <li>
<asp:LinkButton ID="ImgImprimirExpediente" Visible="false" runat="server"> <i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> PDF</asp:LinkButton> <asp:LinkButton ID="ImgImprimirExpediente" Visible="false" runat="server"> <i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> Expediente de personal</asp:LinkButton>
</li>
<li>
<asp:LinkButton ID="LbGafete" runat="server" CssClass="" Text="Gafete" />
</li> </li>
<asp:UpdatePanel ID="UpBuzon" runat="server"> <asp:UpdatePanel ID="UpBuzon" runat="server">
@@ -3221,8 +3225,6 @@
<td style="width: 40px;"></td> <td style="width: 40px;"></td>
<td style="width: 500px; text-align: right!important"></td> <td style="width: 500px; text-align: right!important"></td>
<td style="width: 500px; text-align: right!important"> <td style="width: 500px; text-align: right!important">
<asp:LinkButton ID="LbGafete" runat="server" CssClass="btn btn-circle btn-sm blue" Text="<i class='fa fa-download' title='Descargar Contrato'></i>" />
</td> </td>
<td style="width: 50px!important"></td> <td style="width: 50px!important"></td>
</tr> </tr>
@@ -3295,9 +3297,6 @@
</tr> </tr>
</table> </table>
</ContentTemplate> </ContentTemplate>
<Triggers>
<asp:PostBackTrigger ControlID="LbGafete" />
</Triggers>
</asp:UpdatePanel> </asp:UpdatePanel>
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>

2
RH/Personal.aspx.vb
View File

@@ -3437,7 +3437,7 @@ Partial Class RH_Personal
params.Add(New ReportParameter("LogoUri", "")) params.Add(New ReportParameter("LogoUri", ""))
End If End If
ImprimirPDF("Empresas/Grales/Formatos/RHGafete.rdlc", New DataTable, params, "ReportePersonal", "PDF") ImprimirPDF("Empresas/Grales/Formatos/RHGafete.rdlc", New DataTable, params, String.Format("Gafete_{0}", ObjPersonal.CvePersonal), "PDF")
End If End If
End If End If
ObjPersonal.Dispose() ObjPersonal.Dispose()

12
Scripts/custom.js
View File

@@ -823,6 +823,7 @@ ADSScroll = function (tablescroll) {
tablefooter.attr('id', 'ADSF-' + tablescroll.attr('id')); tablefooter.attr('id', 'ADSF-' + tablescroll.attr('id'));
let trWwidth = $('<tr class="trnopadding ADtr SearchADHeader"></tr>'); let trWwidth = $('<tr class="trnopadding ADtr SearchADHeader"></tr>');
let idTheader = tablescroll.data('tableheader'); let idTheader = tablescroll.data('tableheader');
let scrollwidthrow = tablescroll.data('scrollwidthrow') ? tablescroll.data('scrollwidthrow') : "";
let rowVisibles = isNaN(Number(tablescroll.data('rows'))) ? 1 : Number(tablescroll.data('rows')); let rowVisibles = isNaN(Number(tablescroll.data('rows'))) ? 1 : Number(tablescroll.data('rows'));
let rowFooter = isNaN(Number(tablescroll.data('footer'))) ? 0 : Number(tablescroll.data('footer')); let rowFooter = isNaN(Number(tablescroll.data('footer'))) ? 0 : Number(tablescroll.data('footer'));
let heightBody = isNaN(Number(tablescroll.data('height'))) ? 200 : Number(tablescroll.data('height')); let heightBody = isNaN(Number(tablescroll.data('height'))) ? 200 : Number(tablescroll.data('height'));
@@ -861,12 +862,21 @@ ADSScroll = function (tablescroll) {
} }
} }
let firsttr = null; let firsttr = null;
tablescroll.find('> tbody > tr,> thead > tr,> tr').each(function () { tablescroll.find('> tbody > tr' + scrollwidthrow + ',> thead > tr' + scrollwidthrow + ',> tr' + scrollwidthrow +'').each(function () {
var retorno = false; var retorno = false;
firsttr = $(this); firsttr = $(this);
if (firsttr.find(' > td[colspan], > th[colspan]').length) { retorno = true; } if (firsttr.find(' > td[colspan], > th[colspan]').length) { retorno = true; }
return retorno; return retorno;
}); });
if (firsttr == null) {
tablescroll.find('> tbody > tr,> thead > tr,> tr').each(function () {
var retorno = false;
firsttr = $(this);
if (firsttr.find(' > td[colspan], > th[colspan]').length) { retorno = true; }
return retorno;
});
}
tablescroll.before(divcontainer); tablescroll.before(divcontainer);
divcontainer.append(divheader); divcontainer.append(divheader);
divcontainer.append(divbody); divcontainer.append(divbody);

12
vwd.webinfo
View File

@@ -150,6 +150,18 @@