From 168a6a352ef278c386036aedc2a673202c811353 Mon Sep 17 00:00:00 2001
From: Jose Pabl Domingo Aramburo Sanchez <josepablo.aramburo@gmail.com>
Date: Sun, 12 Aug 2018 16:25:23 -0600
Subject: [PATCH] [add] Displaying data post save

---
 api-payroll/public/html/landing.php  |  6 +++---
 api-payroll/public/js/NewEmployee.js | 22 ++++++++++++----------
 api-payroll/public/js/login.js       |  1 -
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/api-payroll/public/html/landing.php b/api-payroll/public/html/landing.php
index 2db41c3..30a3474 100644
--- a/api-payroll/public/html/landing.php
+++ b/api-payroll/public/html/landing.php
@@ -111,7 +111,7 @@ if(!isset($_SESSION['userName'])){
                     <h4 class="modal-title">An error has occurred</h4>
                 </div>
                 <div class="modal-body">
-                    <p>The server has encountered an internal error, please try again later.</p>
+                    <p id="internal-server-error-message"">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>
@@ -159,7 +159,7 @@ if(!isset($_SESSION['userName'])){
         </div>
     </div>
 
-    <div id="modal_error_otro" class="modal fade" role="dialog">
+    <div id="modal_error_other" class="modal fade" role="dialog">
         <div class="modal-dialog">
 
             <div class="modal-content">
@@ -188,7 +188,7 @@ if(!isset($_SESSION['userName'])){
         <div class="modal-dialog">
 
             <div class="modal-content">
-                <div class="modal-header" id="modal_header_server_response_error">
+                <div class="modal-header" id="modal_header_error">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                     <h4 class="modal-title">An error has occurred</h4>
                 </div>
diff --git a/api-payroll/public/js/NewEmployee.js b/api-payroll/public/js/NewEmployee.js
index 7684afa..9c9b6ad 100644
--- a/api-payroll/public/js/NewEmployee.js
+++ b/api-payroll/public/js/NewEmployee.js
@@ -29,18 +29,21 @@ function loadEmployeeTypes(){
             });
         },
         error:function(x,e) {
+            let responseText = $.parseJSON(x["responseText"]);
+
             if (x.status==0) {
                 $('#modal_error_internet').modal('show');
             } else if(x.status==404) {
                 $('#modal_error_404').modal('show');
             } else if(x.status==500) {
-                $('#modal_error_500').modal('show');
+                $('#modal_server_response_error').modal('show');
+                document.getElementById('server_response_error').innerHTML = responseText['message'];
             } else if(e=='parsererror') {
                 $('#modal_error_parsererror').modal('show');
             } else if(e=='timeout'){
                 $('#modal_error_timeout').modal('show');
             } else {
-                $('#modal_error_otro').modal('show');
+                $('#modal_error_other').modal('show');
             }
         },
     });
@@ -66,26 +69,25 @@ function saveNewEmployee(){
         dataType: 'json',
         data: parameters,
         success:function(data){
-            $(data).each(function(i,v){
-                $('#employeeType').append(
-                    '<option value="' + v.id + '">'+ v.name + '</option>'
-                );
-            });
+            $('#modal_server_response_success').modal('show');
+            document.getElementById('server_response_success').innerHTML = 'The employee ' + data['fullName'] + ' has been created with the code ' + data['employeeCode'];
         },
         error:function(x,e) {
-            console.log(JSON.stringify(x));
+            let responseText = $.parseJSON(x["responseText"]);
+
             if (x.status==0) {
                 $('#modal_error_internet').modal('show');
             } else if(x.status==404) {
                 $('#modal_error_404').modal('show');
             } else if(x.status==500) {
-                $('#modal_error_500').modal('show');
+                $('#modal_server_response_error').modal('show');
+                document.getElementById('server_response_error').innerHTML = responseText['message'];
             } else if(e=='parsererror') {
                 $('#modal_error_parsererror').modal('show');
             } else if(e=='timeout'){
                 $('#modal_error_timeout').modal('show');
             } else {
-                $('#modal_error_otro').modal('show');
+                $('#modal_error_other').modal('show');
             }
         },
     });
diff --git a/api-payroll/public/js/login.js b/api-payroll/public/js/login.js
index fb9b011..3369854 100644
--- a/api-payroll/public/js/login.js
+++ b/api-payroll/public/js/login.js
@@ -29,7 +29,6 @@ function processLogin() {
         dataType: 'json',
         data: parameters,
         success:function(data){
-            console.log(JSON.stringify(data));
             if(data["status"] == "success"){
                 window.location.replace(baseUrl + '/html/landing.php');