PootisPenserHere/payroll_manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[add] Logout uses generic error messages

Browse Source 
Refactored some messages from the generic modals
This commit is contained in:
Jose Pabl Domingo Aramburo Sanchez 2018-08-12 10:39:44 -06:00
parent 1605b1cea3
commit 0ec20a4c67
2 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
api-payroll/public/html/landing.php
View File

@ -55,26 +55,25 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12" id="cuerpo"></div>
<div class="col-md-12" id="newViewBody"></div>
<!-- <!--
================================================================================= =================================================================================
Errores en query de AJAX Modals for errors encountered by ajax
================================================================================= =================================================================================
--> -->
<!-- Fallo en la conexion de internet -->
<div id="modal_error_internet" class="modal fade" role="dialog"> <div id="modal_error_internet" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Por favor revise su conexión a internet.</p> <p>Please verify your internet connection and try again.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -84,18 +83,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- El recurso solicitado no existe -->
<div id="modal_error_404" class="modal fade" role="dialog"> <div id="modal_error_404" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>El URL del formulario no pudo ser encontrado en el servidor.</p> <p>Unable to find the requested url in the sever.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -105,18 +102,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- Error interno del servidor donde no es posible detectar la causa especifica -->
<div id="modal_error_500" class="modal fade" role="dialog"> <div id="modal_error_500" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Error interno del servidor.</p> <p>The server has encountered an internal error, please try again later.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -126,18 +121,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- El servidor respone con un string que no esta en formato JSON o contiene caracteres adicionales al JSON -->
<div id="modal_error_parsererror" class="modal fade" role="dialog"> <div id="modal_error_parsererror" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Fallo al procesar el JSON enviado por el servidor.</p> <p>The response from the sever wasn't a proper JSON format</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -147,18 +140,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- El servidortardo demasiado en responder -->
<div id="modal_error_timeout" class="modal fade" role="dialog"> <div id="modal_error_timeout" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>La petición excedió el limite de tiempo.</p> <p>The request timeout, please try again or verify your connection.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -168,18 +159,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- Si el request AJAX falla por alguna razon no listada -->
<div id="modal_error_otro" class="modal fade" role="dialog"> <div id="modal_error_otro" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_error"> <div class="modal-header" id="modal_header_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Ha ocurrido un error desconocido.</p> <p>An unknown error occurred.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -191,22 +180,20 @@ if(!isset($_SESSION['userName'])){
<!-- <!--
================================================================================= =================================================================================
Respuesta del servidor Generic response modals
================================================================================= =================================================================================
--> -->
<!-- Si el request AJAX falla por alguna razon no listada --> <div id="modal_server_response_error" class="modal fade" role="dialog">
<div id="modal_respuesa_servidor_error" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_respuesa_servidor_error"> <div class="modal-header" id="modal_header_server_response_error">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>Ha ocurrido un error</center></h4> <h4 class="modal-title">An error has occurred</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p id="respuesa_servidor_error"></p> <p id="server_response_error"></p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -216,18 +203,16 @@ if(!isset($_SESSION['userName'])){
</div> </div>
</div> </div>
<!-- Si el request AJAX recibe un success en la variable pasasa por el servidor --> <div id="modal_server_response_success" class="modal fade" role="dialog">
<div id="modal_respuesa_servidor_success" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" id="modal_header_respuesa_servidor_success"> <div class="modal-header" id="modal_header_server_response_success">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"><center>El almacenado ha sido exitoso</center></h4> <h4 class="modal-title">Success</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p id="respuesa_servidor_success"></p> <p id="server_response_success"></p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button> <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>

21
api-payroll/public/js/landing.js
View File

@ -1,3 +1,7 @@
/**
* Destorys the session for the current user and redirects
* back to the login form
*/
function logout() { function logout() {
var baseUrl = getbaseUrl(); var baseUrl = getbaseUrl();
@ -8,10 +12,19 @@ function logout() {
success:function(data){ success:function(data){
window.location.replace(baseUrl + '/html/login.php'); window.location.replace(baseUrl + '/html/login.php');
}, },
error:function(x) { error:function(x,e) {
if (x.status==500){ if (x.status==0) {
$('#modalLoginError').modal('show'); $('#modal_error_internet').modal('show');
document.getElementById('modalLoginErrorBody').innerHTML = "The user or password didnt match, please try again"; } else if(x.status==404) {
$('#modal_error_404').modal('show');
} else if(x.status==500) {
$('#modal_error_500').modal('show');
} else if(e=='parsererror') {
$('#modal_error_parsererror').modal('show');
} else if(e=='timeout'){
$('#modal_error_timeout').modal('show');
} else {
$('#modal_error_otro').modal('show');
} }
}, },
}); });