diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb
index f5ce3f4ae..4a863130d 100644
--- a/RH/Personal.aspx.vb
+++ b/RH/Personal.aspx.vb
@@ -1001,10 +1001,9 @@ Partial Class RH_Personal
End Sub
Private Sub CargaTiposContrato()
- Dim dt As DataTable = GlobalDTTiposContrato
- 'dt.Columns.Add("txtoddl", GetType(String), "CodigoTipoContrato + ' ' + TipoContrato")
- 'DdlTipoContrato.DataSource = dt
- 'DdlTipoContrato.DataBind()
+ Dim dt As DataTable = GlobalDTTiposContrato
+ DdlTipoContrato.DataSource = dt
+ DdlTipoContrato.DataBind()
End Sub
Private Sub CargaTurno()
@@ -6208,7 +6207,12 @@ Partial Class RH_Personal
Alert("Se actualizo el calculo de fonacot")
End If
End Sub
- Protected Sub LnkCalcularFactor_Click(sender As Object, e As EventArgs)
+ Protected Sub LnkCalcularFactor_Click(sender As Object, e As EventArgs)
+ getdatosFI()
+ RegistraScript("$('#DmodalFactordeIntegraccion').modal()")
+ End Sub
+ Private Sub getdatosFI()
+
If TxtFIAguinaldo.Text = "0" Or TxtFIAguinaldo.Text = "" Or TxtFIAguinaldo.Text = "-1" Then
TxtFIAguinaldo.Text = "15"
End If
@@ -6237,10 +6241,8 @@ Partial Class RH_Personal
End If
End If
End Using
- End If
-
- RegistraScript("$('#DmodalFactordeIntegraccion').modal()")
- UpFactordeintegracion.Update()
+ End If
+ UpFactordeintegracion.Update()
End Sub
Private Sub calcularSDI()
Dim SD As Decimal = TxtFISalariodiario.Text.ToDecimal()
@@ -6282,15 +6284,25 @@ Partial Class RH_Personal
End If
End Using
End Sub
- Protected Sub LnkModificarSalarioGuardar_Click(sender As Object, e As EventArgs)
-
+ Protected Sub LnkModificarSalarioGuardar_Click(sender As Object, e As EventArgs)
+
+ getdatosFI()
+
+ TxtFISalariodiario.Text = TxtSalarioDiarioM.Text
+ calcularSDI()
+ TxtSalarioDiarioImSS.Text = TxtFISalarioDiarioIntegrado.Text
+ TxtSalarioDiarioIntegrado.Text = TxtFISalarioDiarioIntegrado.Text
Using ObjPersonal As ClsRH = New ClsRH()
- If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveEmpresa, TxtSalarioDiarioM.Text.ToDecimal(), TxtSalarioDiarioIntegrado.Text.ToDecimal(), TxtSalarioDiarioImSS.Text.ToDecimal(), TxtSalarioDiarioPago.Text.ToDecimal()) Then
+ If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveEmpresa, TxtSalarioDiarioM.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtSalarioDiarioM.Text.ToDecimal()) Then
+
+
TxtSalarioDiario.Text = TxtSalarioDiarioM.Text
TxtFISalariodiario.Text = TxtSalarioDiarioM.Text
TxtSalarioCotizado.Text = TxtSalarioDiarioImSS.Text
TxtSDI.Text = TxtSalarioDiarioIntegrado.Text
- TxtFISalarioDiarioIntegrado.Text = TxtSalarioDiarioIntegrado.Text
+ TxtFISalarioDiarioIntegrado.Text = TxtSalarioDiarioIntegrado.Text
+
+ UpModSalario.Update()
UpDatos.Update()
Alert("Se ha actualizado el salario", TipoMensaje.ToastInformacion)
End If
diff --git a/SiteGPS.master b/SiteGPS.master
index 047142bd6..6d7ce01e1 100644
--- a/SiteGPS.master
+++ b/SiteGPS.master
@@ -869,15 +869,20 @@
//
function ShowToast(text, header, type, footer, sound,persistencia,coords) {
var snd = new Audio("/Sonidos/" + sound);
+ let playPromise;
snd.onended=function(){
if (persistencia) {
snd.play();
+
+ playPromise = snd.play();
+
+
snd.currentTime = 0;
}
};
toastr.options = {
"closeButton": true,
- "onHidden": function(){ persistencia = false; snd.pause(); snd.currentTime = 0; },
+ "onHidden": function () { persistencia = false; if (playPromise !== undefined) { playPromise.then(_ => { snd.pause(); }).catch(error => { }); } snd.currentTime = 0; },
"debug": false,
"newestOnTop": true,
"progressBar": false,
@@ -914,6 +919,9 @@
snd.play();
snd.currentTime = 0;
}
+
+ var Cves= <%= If(UsuarioActual IsNot Nothing, UsuarioActual.CveUsuario, -1) %>;
+
function UpdateNotificacion(CveNotificacionBitacora) {
var request = {
Metodo: "UpdateNotificacion",
@@ -965,7 +973,7 @@
var notificationHub = $.connection.myGPSHub;
- notificationHub.client.addLatestNotification = function (data, user, header, tipo, options, sound, Cve,Persistencia,Coords) {
+ notificationHub.client.addLatestNotification = function (data, user, header, tipo, options, sound, Cve, Persistencia, Coords) {
var tipoNotificacion = "success";
switch (tipo) {
case 0:
@@ -980,8 +988,12 @@
default:
tipoNotificacion = "success";
}
- notificationHub.server.disparaNotificacionUsuario(user, data, header, tipoNotificacion, options, sound, $.connection.hub.id, Cve,Persistencia,Coords);
+ //notificationHub.server.disparaNotificacionUsuario(user, data, header, tipoNotificacion, options, sound, $.connection.hub.id, Cve,Persistencia,Coords);
console.log("change1");
+ if (Cves == user) {
+ ShowToast(data, header, tipoNotificacion, options, sound, Persistencia, Coords);
+
+ }
}
notificationHub.client.mostrarNotificacion = function (data, header, type, options, sound, Cve,Persistencia,coords) {
diff --git a/vwd.webinfo b/vwd.webinfo
index 3de4958f8..f962c21d4 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -154,6 +154,10 @@
+
+
+
+