diff --git a/.gitignore b/.gitignore index 7462e83a5..609c288bd 100644 --- a/.gitignore +++ b/.gitignore @@ -273,3 +273,4 @@ __pycache__/ /Default.aspx.cs /App_WebReferences/WSRDLC /wwwSIGGIT.rar +/Front diff --git a/App_Code/WsSigfox.vb b/App_Code/WsSigfox.vb index 767dcf9e4..225d6c984 100644 --- a/App_Code/WsSigfox.vb +++ b/App_Code/WsSigfox.vb @@ -27,8 +27,8 @@ Namespace Sigfox 'respuesta.Datos = Datos Dim DevID As String = params.device - Dim Lat As Double = params.lat.ToDouble() - Dim Lng As Double = params.lng.ToDouble() + Dim Lat As Double = 90 'params.lat.ToDouble() + Dim Lng As Double = 90 'params.lng.ToDouble() Dim Fecha As DateTime = params.time.ToDouble().ConvertFromUnixTimestamp() Dim Velocidad As Double = 0 Dim MessageType As Integer = 0 @@ -68,12 +68,16 @@ Namespace Sigfox End Try Dim response As HttpResponseMessage - If datos.Length > 0 Then - Dim jsonString As String = $"{{""{params.device}"":{{""downlinkData"":""{datos}""}}}}" - response = Me.Request.CreateResponse(HttpStatusCode.OK) - response.Content = New StringContent(jsonString, Encoding.UTF8, "application/json") + If respuesta.Correcto Then + If datos.Length > 0 Then + response = Me.Request.CreateResponse(HttpStatusCode.OK) + response.Content = New StringContent($"{{""{params.device}"":{{""downlinkData"":""{datos}""}}}}", Encoding.UTF8, "application/json") + Else + response = Request.CreateResponse(HttpStatusCode.NoContent, "") + End If Else - response = Request.CreateResponse(HttpStatusCode.NoContent, "") + response = Me.Request.CreateResponse(HttpStatusCode.OK) + response.Content = New StringContent($"{{""Fail"":{{""Msg"":""Ocurrió un error al agregar la trama""}}}}", Encoding.UTF8, "application/json") End If Return response End Function diff --git a/Bin/Microsoft.Owin.Security.OAuth.dll b/Bin/Microsoft.Owin.Security.OAuth.dll index 8f95e3053..650eb379b 100644 Binary files a/Bin/Microsoft.Owin.Security.OAuth.dll and b/Bin/Microsoft.Owin.Security.OAuth.dll differ diff --git a/Bin/Microsoft.Owin.Security.dll b/Bin/Microsoft.Owin.Security.dll index 54901f282..44d45c92c 100644 Binary files a/Bin/Microsoft.Owin.Security.dll and b/Bin/Microsoft.Owin.Security.dll differ diff --git a/Bin/Microsoft.Owin.dll b/Bin/Microsoft.Owin.dll index 37dc69b0e..713f03dd2 100644 Binary files a/Bin/Microsoft.Owin.dll and b/Bin/Microsoft.Owin.dll differ diff --git a/RH/Personal.aspx b/RH/Personal.aspx index b9c257e6c..ca03ca3c4 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -1313,30 +1313,30 @@
- + - + <%----%>
- + <%----%>
- + <%----%> diff --git a/Site.master.vb b/Site.master.vb index c8b8f0dfd..42789c4a8 100644 --- a/Site.master.vb +++ b/Site.master.vb @@ -455,7 +455,7 @@ Partial Class Site If objgen.DtResultados.Rows.Count > 0 Then For Each dtrow As DataRow In objgen.DtResultados.Rows If dtrow("Contador").ToString().ToEntero() > 0 Then - Notificaciones.Append(ItemNotificaciones(String.Format("Se registro una solicitud de descarga del sat con {0} XML del SAT", dtrow("Contador")), Ico:="fa fa-tags", Tipo:="info", Link:=String.Format("javascript:$('#{0}').val({1});$('#{2}').click();", TxtCveNotisat.ClientID, dtrow("CveSolicitudSat").ToString().ToEntero(), btnoknotisat.ClientID), tonewpage:=False)) ' + Notificaciones.Append(ItemNotificaciones(String.Format("Se registro una solicitud de descarga del SAT con {0} XML", dtrow("Contador")), Ico:="fa fa-tags", Tipo:="info", Link:=String.Format("javascript:$('#{0}').val({1});$('#{2}').click();", TxtCveNotisat.ClientID, dtrow("CveSolicitudSat").ToString().ToEntero(), btnoknotisat.ClientID), tonewpage:=False)) ' countNotificaciones = countNotificaciones + 1 End If diff --git a/packages.config b/packages.config index 40443914d..1853710ba 100644 --- a/packages.config +++ b/packages.config @@ -17,9 +17,14 @@ - + + + + - + + + @@ -28,8 +33,10 @@ + + \ No newline at end of file diff --git a/vwd.webinfo b/vwd.webinfo index 65b4102ee..6a84ef014 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -80,6 +80,8 @@ + +