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

[mod] Updated html and css references

Browse Source
This commit is contained in:
Jose Pabl Domingo Aramburo Sanchez 2018-08-12 16:59:46 -06:00
parent 1b2484fbf2
commit 79059fb91b
4 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-payroll/public/css/landing.css
View File

@ -54,15 +54,12 @@ body {
background: #C6E97C;
}
#modal_header_error{
.modalHeaderError{
background-color: #d9534f;
}
#modal_header_respuesa_servidor_error{
background-color: #d9534f;
}
#modal_header_respuesa_servidor_success{
.modalHeaderSuccess{
background-color: #5bc0de;
}

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

@ -64,11 +64,11 @@ if(!isset($_SESSION['userName'])){
=================================================================================
-->
<div id="modal_error_internet" class="modal fade" role="dialog">
<div id="modalErrorInternetConnection" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
@ -83,11 +83,11 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_error_404" class="modal fade" role="dialog">
<div id="modalError404" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
@ -102,16 +102,16 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_error_500" class="modal fade" role="dialog">
<div id="modalError500" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
<div class="modal-body">
<p id="internal-server-error-message"">The server has encountered an internal error, please try again later.</p>
<p>The server has encountered an internal error, please try again later.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -121,11 +121,11 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_error_parsererror" class="modal fade" role="dialog">
<div id="modalErrorParsererror" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
@ -140,11 +140,11 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_error_timeout" class="modal fade" role="dialog">
<div id="modalErrorTimeout" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
@ -159,11 +159,11 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_error_other" class="modal fade" role="dialog">
<div id="modalErrorOther" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
@ -184,16 +184,16 @@ if(!isset($_SESSION['userName'])){
=================================================================================
-->
<div id="modal_server_response_error" class="modal fade" role="dialog">
<div id="modalServerResponseError" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_error">
<div class="modal-header modalHeaderError">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">An error has occurred</h4>
</div>
<div class="modal-body">
<p id="server_response_error"></p>
<p id="modalResponseError"></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -203,16 +203,16 @@ if(!isset($_SESSION['userName'])){
</div>
</div>
<div id="modal_server_response_success" class="modal fade" role="dialog">
<div id="modalServerResponseSuccess" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="modal_header_server_response_success">
<div class="modal-header modalHeaderSuccess" id="modalHeaderServerResponseSuccess">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Success</h4>
</div>
<div class="modal-body">
<p id="server_response_success"></p>
<p id="serverResponseSuccess"></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
@ -228,4 +228,4 @@ if(!isset($_SESSION['userName'])){
<script src="../js/bootstrap-datepicker.min.js"></script>
<link href="../css/bootstrap-datepicker.min.css" rel="stylesheet">
<link href="../css/landing.css" rel="stylesheet">
<link href="../css/landing.css" rel="stylesheet">

32
api-payroll/public/js/NewEmployee.js
View File

@ -32,18 +32,18 @@ function loadEmployeeTypes(){
let responseText = $.parseJSON(x["responseText"]);
if (x.status==0) {
$('#modal_error_internet').modal('show');
$('#modalErrorInternetConnection').modal('show');
} else if(x.status==404) {
$('#modal_error_404').modal('show');
$('#modalError404').modal('show');
} else if(x.status==500) {
$('#modal_server_response_error').modal('show');
document.getElementById('server_response_error').innerHTML = responseText['message'];
$('#modalServerResponseError').modal('show');
document.getElementById('modalResponseError').innerHTML = responseText['message'];
} else if(e=='parsererror') {
$('#modal_error_parsererror').modal('show');
$('#modalErrorParsererror').modal('show');
} else if(e=='timeout'){
$('#modal_error_timeout').modal('show');
$('#modalErrorTimeout').modal('show');
} else {
$('#modal_error_other').modal('show');
$('#modalErrorOther').modal('show');
}
},
});
@ -69,25 +69,25 @@ function saveNewEmployee(){
dataType: 'json',
data: parameters,
success:function(data){
$('#modal_server_response_success').modal('show');
document.getElementById('server_response_success').innerHTML = 'The employee ' + data['fullName'] + ' has been created with the code ' + data['employeeCode'];
$('#modalServerResponseSuccess').modal('show');
document.getElementById('serverResponseSuccess').innerHTML = 'The employee ' + data['fullName'] + ' has been created with the code ' + data['employeeCode'];
},
error:function(x,e) {
let responseText = $.parseJSON(x["responseText"]);
if (x.status==0) {
$('#modal_error_internet').modal('show');
$('#modalErrorInternetConnection').modal('show');
} else if(x.status==404) {
$('#modal_error_404').modal('show');
$('#modalError404').modal('show');
} else if(x.status==500) {
$('#modal_server_response_error').modal('show');
document.getElementById('server_response_error').innerHTML = responseText['message'];
$('#modalServerResponseError').modal('show');
document.getElementById('modalResponseError').innerHTML = responseText['message'];
} else if(e=='parsererror') {
$('#modal_error_parsererror').modal('show');
$('#modalErrorParsererror').modal('show');
} else if(e=='timeout'){
$('#modal_error_timeout').modal('show');
$('#modalErrorTimeout').modal('show');
} else {
$('#modal_error_other').modal('show');
$('#modalErrorOther').modal('show');
}
},
});

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

@ -14,15 +14,15 @@ function logout() {
},
error:function(x,e) {
if (x.status==0) {
$('#modal_error_internet').modal('show');
$('#modalErrorInternetConnection').modal('show');
} else if(x.status==404) {
$('#modal_error_404').modal('show');
$('#modalError404').modal('show');
} else if(x.status==500) {
$('#modal_error_500').modal('show');
$('#modalError500').modal('show');
} else if(e=='parsererror') {
$('#modal_error_parsererror').modal('show');
$('#modalErrorParsererror').modal('show');
} else if(e=='timeout'){
$('#modal_error_timeout').modal('show');
$('#modalErrorTimeout').modal('show');
} else {
$('#modal_error_otro').modal('show');
}
@ -60,15 +60,15 @@ function loadView(requestedView){
},
error:function(x,e) {
if (x.status==0) {
$('#modal_error_internet').modal('show');
$('#modalErrorInternetConnection').modal('show');
} else if(x.status==404) {
$('#modal_error_404').modal('show');
$('#modalError404').modal('show');
} else if(x.status==500) {
$('#modal_error_500').modal('show');
$('#modalError500').modal('show');
} else if(e=='parsererror') {
$('#modal_error_parsererror').modal('show');
$('#modalErrorParsererror').modal('show');
} else if(e=='timeout'){
$('#modal_error_timeout').modal('show');
$('#modalErrorTimeout').modal('show');
} else {
$('#modal_error_otro').modal('show');
}