api-payroll/public/html/editEmployee.php

@@ -0,0 +1,111 @@
+<script src="../js/getBaseUrl.js"></script>
+<script src="../js/editEmployee.js"></script>
+
+<form class="form-horizontal" id="editEmployee">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">Edit employee</h3>
+            </div>
+            <div class="panel-body">
+                <div class="row">
+                    <div class="form-group">
+                        <label class="col-md-4 control-label" for="editEmploySearch">Employee</label>
+                        <div class="col-md-5">
+                            <input id="editEmploySearch" name="editEmploySearch" type="text" class="form-control input-md">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeFirstName">First name</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeFirstName" name="editEmployeeFirstName" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeMiddleName">Middle name</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeMiddleName" name="editEmployeeMiddleName" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeLastName">Last name</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeLastName" name="editEmployeeLastName" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeBirthDate">Birth date</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeBirthDate" name="editEmployeeBirthDate" type="text" class="form-control input-md datepicker">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" id="hidenEmployeeCode">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeCode">Code</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeCode" name="editEmployeeCode" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeEmail">Email</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeeEmail" name="editEmployeeEmail" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeePhone">Phone</label>
+                            <div class="col-md-5">
+                                <input id="editEmployeePhone" name="editEmployeePhone" type="text" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeType">Rol</label>
+                            <div class="col-md-5">
+                                <select class="form-control input-md" name="editEmployeeType" id="editEmployeeType">
+                                    <option>Employee type</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="editEmployeeContractType">Contract type</label>
+                            <div class="col-md-5">
+                                <select class="form-control input-md" name="editEmployeeContractType" id="editEmployeeContractType">
+                                    <option>Contract type</option>
+                                    <option value="INTERNO">interno</option>
+                                    <option value="EXTERNO">Externo</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row col-md-offset-6">
+                    <div class="form-group">
+                        <a href="#" class="btn btn-lg btn-success " onclick="updateEmployee();">Update</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

api-payroll/public/html/landing.php

@@ -31,8 +31,8 @@ if(!isset($_SESSION['userName'])){
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-user"></span> Employees<span class="caret"></span></a>
                                 <ul class="dropdown-menu">
-                                    <li><a href="#" data-nav_accion="NewEmployee.php"> New employee</a></li>
+                                    <li><a href="#" data-nav_accion="newEmployee.php"> New employee</a></li>
-                                    <li><a href="#" data-nav_accion="EditEmployee.php"> Modify employee</a></li>
+                                    <li><a href="#" data-nav_accion="editEmployee.php"> Modify employee</a></li>
                                 </ul>
                             </li>
 
@@ -226,6 +226,7 @@ if(!isset($_SESSION['userName'])){
 <script src="../js/getBaseUrl.js"></script>
 <script src="../js/landing.js"></script>
 <script src="../js/bootstrap-datepicker.min.js"></script>
+<script src="../js/typeahead.bundle.js"></script>
 
 <link href="../css/bootstrap-datepicker.min.css" rel="stylesheet">
 <link href="../css/landing.css" rel="stylesheet">

api-payroll/public/html/newEmployee.php

@@ -1,4 +1,4 @@
-<script src="../js/NewEmployee.js"></script>
+<script src="../js/newEmployee.js"></script>
 <script src="../js/getBaseUrl.js"></script>
 
 <form class="form-horizontal" id="newEmployeeForm">

api-payroll/public/js/editEmployee.js

@@ -0,0 +1,180 @@
+/**
+ * Bootstrapping the starting actions for the module
+ */
+$(document).ready(function(){
+    let baseUrl = getbaseUrl();
+
+    loadEmployeeTypes();
+
+    $('.datepicker').datepicker({
+        format: "yyyy/mm/dd",
+        autoclose: true
+    });
+
+    // Not to be edited
+    $("#hidenEmployeeCode").hide();
+
+    // Setting up bloodhound typeahead
+    let employeesList = new Bloodhound({
+        datumTokenizer: Bloodhound.tokenizers.obj.whitespace("name"),
+        queryTokenizer: Bloodhound.tokenizers.whitespace,
+        remote: {
+            'cache': false,
+            url: baseUrl + '/api/employee/find',
+
+            replace: function(url, uriEncodedQuery) {
+
+                return url + '/' + uriEncodedQuery
+
+            },
+            wildcard: '%QUERY',
+            filter: function (data) {
+                return data;
+            }
+        }
+    });
+
+    employeesList.initialize();
+
+    $("#editEmploySearch").typeahead({
+            hint: true,
+            highlight: true,
+            minLength: 3
+        },
+        {
+            name: "result",
+            displayKey: "fullName",
+            source: employeesList.ttAdapter()
+        }).bind("typeahead:selected", function(obj, datum, name) {
+        $(this).data("id", datum.code);
+        loadEmployeeData(datum.code);
+    });
+});
+
+/**
+ * Loads the the enmployee types into their select option
+ */
+function loadEmployeeTypes(){
+    let baseUrl = getbaseUrl();
+
+    $.ajax({
+        url: baseUrl + '/api/employee/types',
+        type: 'GET',
+        dataType: 'json',
+        success:function(data){
+            $(data).each(function(i,v){
+                $('#editEmployeeType').append(
+                    '<option value="' + v.id + '">'+ v.name + '</option>'
+                );
+            });
+        },
+        error:function(x,e) {
+            let responseText = $.parseJSON(x["responseText"]);
+
+            if (x.status==0) {
+                $('#modalErrorInternetConnection').modal('show');
+            } else if(x.status==404) {
+                $('#modalError404').modal('show');
+            } else if(x.status==500) {
+                $('#modalServerResponseError').modal('show');
+                document.getElementById('modalResponseError').innerHTML = responseText['message'];
+            } else if(e=='parsererror') {
+                $('#modalErrorParsererror').modal('show');
+            } else if(e=='timeout'){
+                $('#modalErrorTimeout').modal('show');
+            } else {
+                $('#modalErrorOther').modal('show');
+            }
+        },
+    });
+}
+
+/**
+ * Searches the employee data by its employee code and loads it
+ * into the form to be edited and updated
+ *
+ * @param code string
+ */
+function loadEmployeeData(code){
+    let baseUrl = getbaseUrl();
+
+    $.ajax({
+        url: baseUrl + '/api/employee/code/' + code,
+        type: 'GET',
+        dataType: 'json',
+        success:function(data){
+            $('#editEmployeeFirstName').val(data['firstName']);
+            $('#editEmployeeMiddleName').val(data['middleName']);
+            $('#editEmployeeLastName').val(data['lastName']);
+            $('#editEmployeeBirthDate').val(data['birthDate']);
+            $('#editEmployeeCode').val(data['code']);
+            $('#editEmployeeEmail').val(data['email']);
+            $('#editEmployeePhone').val(data['phone']);
+            $('#editEmployeeType').val(data['idEmployeeType']);
+            $('#editEmployeeContractType').val(data['contractType']);
+        },
+        error:function(x,e) {
+            let responseText = $.parseJSON(x["responseText"]);
+
+            if (x.status==0) {
+                $('#modalErrorInternetConnection').modal('show');
+            } else if(x.status==404) {
+                $('#modalError404').modal('show');
+            } else if(x.status==500) {
+                $('#modalServerResponseError').modal('show');
+                document.getElementById('modalResponseError').innerHTML = responseText['message'];
+            } else if(e=='parsererror') {
+                $('#modalErrorParsererror').modal('show');
+            } else if(e=='timeout'){
+                $('#modalErrorTimeout').modal('show');
+            } else {
+                $('#modalErrorOther').modal('show');
+            }
+        },
+    });
+}
+
+function updateEmployee(){
+    let baseUrl = getbaseUrl();
+
+    let parameters = {
+        "firstName":$('#editEmployeeFirstName').val(),
+        "middleName":$('#editEmployeeMiddleName').val(),
+        "lastName":$('#editEmployeeLastName').val(),
+        "birthDate":$('#editEmployeeBirthDate').val(),
+        "code":$('#editEmployeeCode').val(),
+        "email":$('#editEmployeeEmail').val(),
+        "phone":$('#editEmployeePhone').val(),
+        "idEmployeeType":$('#editEmployeeType').val(),
+        "contractType":$('#editEmployeeContractType').val()
+    };
+
+    $.ajax({
+        url: baseUrl + '/api/employee',
+        type: 'PUT',
+        dataType: 'json',
+        data: parameters,
+        success:function(data){
+            $('#modalServerResponseSuccess').modal('show');
+            document.getElementById('serverResponseSuccess').innerHTML = 'The employee ' + data['fullName'] + ' has been updated.';
+        },
+        error:function(x,e) {
+            let responseText = $.parseJSON(x["responseText"]);
+
+            if (x.status==0) {
+                $('#modalErrorInternetConnection').modal('show');
+            } else if(x.status==404) {
+                $('#modalError404').modal('show');
+            } else if(x.status==500) {
+                $('#modalServerResponseError').modal('show');
+                document.getElementById('modalResponseError').innerHTML = responseText['message'];
+            } else if(e=='parsererror') {
+                $('#modalErrorParsererror').modal('show');
+            } else if(e=='timeout'){
+                $('#modalErrorTimeout').modal('show');
+            } else {
+                $('#modalErrorOther').modal('show');
+            }
+        },
+    });
+}

api-payroll/src/application/EmployeeApplication.php

@@ -145,7 +145,11 @@ class EmployeeApplication{
         $this->asserts->betweenLength($phone, 10, 10, "The phone number must be 10 digits without special characters.");
 
         $idEmployeeType = $requestData{'idEmployeeType'};
+        $this->asserts->higherThanZero($idEmployeeType, 'idEmployeeType must be higher than zero.');
+
         $contractType = $requestData{'contractType'};
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
+        $this->asserts->existInArray($contractType, $this->settings['contractTypes'], 'The contract type is not a valid one.');
 
         // Encrypting the sensitive data
         $securedFirstName = $this->cryptographyService->encryptString($firstName);
@@ -229,6 +233,33 @@ class EmployeeApplication{
         return $results[0]['id'];
     }
 
+    /**
+     * @param $code string
+     * @return integer
+     */
+    function getIdEmployeeByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
+        $stmt = $this->pdo->prepare("SELECT 
+                                    COALESCE((SELECT 
+                                                    id
+                                                FROM
+                                                    employees
+                                                WHERE
+                                                    code = :code),
+                                            0) AS id;
+                                    ");
+
+        $stmt->execute(array(':code' => $code));
+        $results = $stmt->fetchAll();
+        if(!$results){
+            exit($this->databaseSelectQueryErrorMessage);
+        }
+        $stmt = null;
+
+        return $results[0]['id'];
+    }
+
     /**
      * Gets the data associated with the employee
      *
@@ -239,13 +270,16 @@ class EmployeeApplication{
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
 
         $stmt = $this->pdo->prepare("SELECT 
+                                        e.id AS idEmployee,
                                         p.id AS idPerson,
                                         p.firstName,
                                         p.middleName,
                                         IFNULL(p.lastName, '') AS lastName,
+                                        p.birthDate,
                                         p.email,
                                         p.phone,
                                         e.code,
+                                        e.idEmployeeType,
                                         e.contractType
                                     FROM
                                         employees e
@@ -277,6 +311,7 @@ class EmployeeApplication{
         $employeeData = $this->getEmployeeDataById($idEmployee);
 
         $response = array(
+            "idEmployee" => (int)$employeeData['idEmployee'],
             "idPerson" => (int)$employeeData['idPerson'],
             "firstName" => $this->cryptographyService->decryptString($employeeData['firstName']),
             "middleName" => $this->cryptographyService->decryptString($employeeData['middleName']),
@@ -285,9 +320,11 @@ class EmployeeApplication{
                 ? $this->cryptographyService->decryptString($employeeData['lastName'])
                 : '',
 
+            "birthDate" => $employeeData['birthDate'],
             "email" => $this->cryptographyService->decryptString($employeeData['email']),
             "phone" => $employeeData['phone'],
             "code" => $employeeData['code'],
+            "idEmployeeType" => $employeeData['idEmployeeType'],
             "contractType" => $employeeData['contractType']
 
         );
@@ -302,7 +339,7 @@ class EmployeeApplication{
     function getEmployeeDataByCode($code){
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
-        $idEmployee = $this->getIdEmployeeTypeByCode($code);
+        $idEmployee = $this->getIdEmployeeByCode($code);
 
         return $this->proxyGetEmployeeDataById($idEmployee);
     }
@@ -383,15 +420,12 @@ class EmployeeApplication{
      */
     function updateEmployeeData($requestData){
         // Getting and validating the data
-        $idEmployee = $requestData['idEmployee'];
-        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
-
-        $idPerson = $this->getIdPersonByIdEmployee($idEmployee);
-        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
-
         $code = $requestData['code'];
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
+        $idEmployee = $this->getIdEmployeeByCode($code);
+        $idPerson = $this->getIdPersonByIdEmployee($idEmployee);
+
         $firstName = $requestData['firstName'];
         $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
         $this->asserts->isString($firstName, "The first name must be a string.");
@@ -421,6 +455,7 @@ class EmployeeApplication{
 
         $contractType = $requestData{'contractType'};
         $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
+        $this->asserts->existInArray($contractType, $this->settings['contractTypes'], 'The contract type is not a valid one.');
 
         // Encrypting the sensitive data
         $securedFirstName = $this->cryptographyService->encryptString($firstName);
@@ -500,6 +535,9 @@ class EmployeeApplication{
     }
 
     /**
+     * Uses an already existing method to create and array containing the details of
+     * all currently active employees
+     *
      * @return array
      */
     function listAllActiveEmployees(){
@@ -508,10 +546,36 @@ class EmployeeApplication{
         $result = array();
 
         foreach($ids as $row){
-            $result[] = $this->proxyGetEmployeeDataById($row['id']);
+            $currentEmployee = $this->proxyGetEmployeeDataById($row['id']);
+
+            $result[] = array(
+                'fullName' => $currentEmployee['firstName']." ".
+                    $currentEmployee['middleName']." ".
+                    $currentEmployee['lastName'],
+                'code' => $currentEmployee['code']
+            );
         }
 
         return $result;
     }
+
+    /**
+     * Takes an array of all active employees and filters them by a string, returning
+     * all sub arrays that contain such string
+     *
+     * @param $partialName string
+     * @return array
+     */
+    function findEmployeeByFullName($partialName){
+        $fullList = $this->listAllActiveEmployees();
+
+        $pattern = '/'.$partialName.'/';
+
+        $matches = array_filter($fullList, function($a) use($pattern)  {
+            return preg_grep($pattern, $a);
+        });
+
+        return $matches;
+    }
 }
 ?>

api-payroll/src/routes.php

@@ -41,10 +41,12 @@ $app->get('/api/employee/types', function (Request $request, Response $response,
         ->write(json_encode($this->employeeApplication->listEmployeeTypes()));
 });
 
-$app->get('/api/employee/all', function (Request $request, Response $response, array $args) {
+$app->get('/api/employee/find/{partialName}', function (Request $request, Response $response, array $args) {
+    $partialName = $args['partialName'];
+
     return $response->withStatus(200)
         ->withHeader('Content-Type', 'application/json')
-        ->write(json_encode($this->employeeApplication->listAllActiveEmployees()));
+        ->write(json_encode($this->employeeApplication->findEmployeeByFullName($partialName)));
 });
 
 $app->post('/api/employee', function ($request, $response) {

api-payroll/src/service/Asserts.php

@@ -69,5 +69,17 @@ class Asserts{
             throw new Exception($errorMessage);
         }
     }
+
+    /**
+     * @param $string string
+     * @param $array array
+     * @param $errorMessage string
+     * @throws Exception
+     */
+    function existInArray($string, $array, $errorMessage){
+        if(!in_array($string, $array)){
+            throw new Exception($errorMessage);
+        }
+    }
 }
 ?>

api-payroll/src/settings.php

@@ -45,6 +45,7 @@ return [
         // Employee settings
         'employee' => [
             'codeLength' => '3',
+            'contractTypes' => array('INTERNO', 'EXTERNO'),
         ],
     ],
 ];