[mod] Del method for employee

Retrievingry salary

api-payroll/public/html/registerWorkDays.php

@@ -10,12 +10,20 @@
             <div class="panel-body">
                 <div class="row">
                     <div class="form-group">
-                        <label class="col-md-4 control-label" for="workDaysSearchEmployee">Employee</label>
+                        <label class="col-md-4 control-label" for="workDaysSearchEmployee">Search employee</label>
                         <div class="col-md-5">
                             <input id="workDaysSearchEmployee" name="workDaysSearchEmployee" 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="workDaysSearchByDate">Search by date</label>
+                        <div class="col-md-2">
+                            <input id="workDaysSearchByDate" name="workDaysSearchByDate" type="text" class="form-control input-md datepicker">
+                        </div>
+                    </div>
+                </div>
             </div>
 
             <div id="registerWorkDaysEmployeeInfo" class="col-md-6">
@@ -79,7 +87,39 @@
             </div>
 
             <div id="registerWorkDaysEmployeeSalary" class="col-md-6">
+                <div class="row">
+                    <div class="form-group">
+                        <label class="col-md-4 control-label" for="workDaysEmployeeSalaryRaw">Raw</label>
+                        <div class="col-md-5">
+                            <input id="workDaysEmployeeSalaryRaw" name="workDaysEmployeeSalaryRaw" type="text" class="form-control input-md" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="form-group">
+                        <label class="col-md-4 control-label" for="workDaysEmployeeSalaryTaxes">Taxes</label>
+                        <div class="col-md-5">
+                            <input id="workDaysEmployeeSalaryTaxes" name="workDaysEmployeeSalaryTaxes" type="text" class="form-control input-md" disabled>
+                        </div>
+                    </div>
+                </div>
 
+                <div class="row">
+                    <div class="form-group">
+                        <label class="col-md-4 control-label" for="workDaysEmployeeSalaryFinal">Final</label>
+                        <div class="col-md-5">
+                            <input id="workDaysEmployeeSalaryFinal" name="workDaysEmployeeSalaryFinal" type="text" class="form-control input-md" disabled>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="form-group">
+                        <label class="col-md-4 control-label" for="workDaysEmployeeSalaryVouchers">Vouchers</label>
+                        <div class="col-md-5">
+                            <input id="workDaysEmployeeSalaryVouchers" name="workDaysEmployeeSalaryVouchers" type="text" class="form-control input-md" disabled>
+                        </div>
+                    </div>
+                </div>
             </div>
 
 
@@ -93,7 +133,7 @@
             </div>
             <div class="row col-md-offset-6">
                 <div class="form-group">
-                    <a href="#" class="btn btn-lg btn-success " onclick="saveNewWorkDay();">Save</a>
+                    <a href="#" class="btn btn-lg btn-success " onclick="processSaveActionWorkDay();">Save</a>
                 </div>
             </div>
         </div>

api-payroll/public/js/registerWorkDays.js

@@ -7,7 +7,7 @@ $(document).ready(function(){
     loadEmployeeTypesForWorkDays();
 
     $('.datepicker').datepicker({
-        format: "yyyy/mm/dd",
+        format: "yyyy-mm-dd",
         autoclose: true
     });
 
@@ -50,6 +50,7 @@ $(document).ready(function(){
 
         loadEmployeeDataForWorkDays(datum.code);
         validateEmployeeCanDoOtherRoles(datum.code);
+        loadSalaryDetails(datum.code);
         $('#hidenEmployeeCodeForWorkDaysCode').val(datum.code); // For future reference
     });
 });
@@ -178,24 +179,18 @@ function validateEmployeeCanDoOtherRoles(code){
     });
 }
 
-function saveNewWorkDay(){
+function loadSalaryDetails(code){
     let baseUrl = getbaseUrl();
 
-    let parameters = {
-        "code":$('#hidenEmployeeCodeForWorkDaysCode').val(),
-        "idEmployeeTypePerformed":$('#workDaysEmployeePerformedRol').val(),
-        "deliveries":$('#workDaysEmployeeDeliveries').val(),
-        "date":$('#workDaysEmployeeWorkedDay').val(),
-    };
-
     $.ajax({
-        url: baseUrl + '/api/employee/workday',
-        type: 'POST',
+        url: baseUrl + '/api/employee/salary/' + code,
+        type: 'GET',
         dataType: 'json',
-        data: parameters,
         success:function(data){
-            $('#modalServerResponseSuccess').modal('show');
-            document.getElementById('serverResponseSuccess').innerHTML = data['message'];
+            $('#workDaysEmployeeSalaryRaw').val(data['raw']);
+            $('#workDaysEmployeeSalaryTaxes').val(data['taxes']);
+            $('#workDaysEmployeeSalaryFinal').val(data['real']);
+            $('#workDaysEmployeeSalaryVouchers').val(data['vouchers']);
         },
         error:function(x,e) {
             let responseText = $.parseJSON(x["responseText"]);
@@ -216,4 +211,149 @@ function saveNewWorkDay(){
             }
         },
     });
-}
+}
+
+/**
+ * Bootstraper for the save action
+ *
+ * If the search by date function has been used it's then assumed that the
+ * desired action is to update else the function will attempt to create a new
+ * record for the worked day
+ */
+function processSaveActionWorkDay(){
+    if($('#workDaysSearchByDate').val() === ''){
+        saveNewWorkDay();
+    }else {
+        updateNewWorkDay();
+    }
+}
+
+function saveNewWorkDay(){
+    let baseUrl = getbaseUrl();
+
+    let parameters = {
+        "code":$('#hidenEmployeeCodeForWorkDaysCode').val(),
+        "idEmployeeTypePerformed":$('#workDaysEmployeePerformedRol').val(),
+        "deliveries":$('#workDaysEmployeeDeliveries').val(),
+        "date":$('#workDaysEmployeeWorkedDay').val(),
+    };
+
+    $.ajax({
+        url: baseUrl + '/api/employee/workday',
+        type: 'POST',
+        dataType: 'json',
+        data: parameters,
+        success:function(data){
+            $('#modalServerResponseSuccess').modal('show');
+            document.getElementById('serverResponseSuccess').innerHTML = data['message'];
+            loadSalaryDetails($('#hidenEmployeeCodeForWorkDaysCode').val());
+        },
+        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 updateNewWorkDay(){
+    let baseUrl = getbaseUrl();
+
+    let parameters = {
+        "code":$('#hidenEmployeeCodeForWorkDaysCode').val(),
+        "idEmployeeTypePerformed":$('#workDaysEmployeePerformedRol').val(),
+        "deliveries":$('#workDaysEmployeeDeliveries').val(),
+        "date":$('#workDaysEmployeeWorkedDay').val(),
+    };
+
+    $.ajax({
+        url: baseUrl + '/api/employee/workday',
+        type: 'PUT',
+        dataType: 'json',
+        data: parameters,
+        success:function(data){
+            $('#modalServerResponseSuccess').modal('show');
+            document.getElementById('serverResponseSuccess').innerHTML = data['message'];
+            loadSalaryDetails($('#hidenEmployeeCodeForWorkDaysCode').val());
+        },
+        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');
+            }
+        },
+    });
+}
+
+/**
+ * If the search by date field is changed from its default empty status it'll
+ * load the data of the given work day and enable the update mode
+ */
+$('#workDaysSearchByDate').on("change", function(data){
+    let baseUrl = getbaseUrl();
+    let date = $(this).val();
+    let code = $('#hidenEmployeeCodeForWorkDaysCode').val();
+
+    // The employee hasn't been picked
+    if (code === ''){
+        $('#modalServerResponseError').modal('show');
+        document.getElementById('modalResponseError').innerHTML = 'Please select an employee in the search form first.';
+        return false; // Exits the function
+    }
+
+    $.ajax({
+        url: baseUrl + '/api/employee/salary/date/' + date + '/code/' + code,
+        type: 'GET',
+        dataType: 'json',
+        success:function(data){
+            $('#workDaysEmployeeRol').val(data['idEmployeeType']);
+            $('#workDaysEmployeeContractType').val(data['contractType']);
+            $('#workDaysEmployeeWorkedDay').val(date);
+            $('#workDaysEmployeeDeliveries').val(data['deliveries']);
+            $('#workDaysEmployeePerformedRol').val(data['idEmployeeTypePerformed']);
+        },
+        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

@@ -16,15 +16,16 @@ class EmployeeApplication{
         $this->cryptographyService = $cryptographyService;
         $this->pdo = $mysql;
         $this->asserts = $asserts;
-
-        $this->databaseSelectQueryErrorMessage = 'There was an error inserting the record.';
     }
 
     /**
+     * A list of the types of employee used in the system
+     *
      * @return array
+     * @throws Exception
      */
     function listEmployeeTypes(){
-        $stmt = $this->pdo->prepare("SELECT 
+        $stmt = $this->pdo->prepare("SELECT
                                         id, name
                                     FROM
                                         employeeType
@@ -35,7 +36,7 @@ class EmployeeApplication{
         $results = $stmt->fetchAll();
 
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("The types of employees could not be found..");
         }
         $stmt = null;
 
@@ -61,11 +62,12 @@ class EmployeeApplication{
         $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
         $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
         $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($birthDate, "The birth date can't be in the future.");
         $this->asserts->isNotEmpty($email, "The email can't be empty.");
         $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
 
         try {
-            $stmt = $this->pdo->prepare("INSERT INTO persons (firstName, middleName, lastName, birthDate, email, phone) 
+            $stmt = $this->pdo->prepare("INSERT INTO persons (firstName, middleName, lastName, birthDate, email, phone)
                                           VALUES (:firstName, :middleName, :lastName, :birthDate, :email, :phone)");
             $this->pdo->beginTransaction();
             $stmt->execute(array(':firstName' => $firstName, ':middleName' => $middleName, ':lastName' => $lastName,
@@ -97,7 +99,7 @@ class EmployeeApplication{
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
         $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
         try {
-            $stmt = $this->pdo->prepare("INSERT INTO employees (idEmployeeType, idPerson, code, contractType) 
+            $stmt = $this->pdo->prepare("INSERT INTO employees (idEmployeeType, idPerson, code, contractType)
                                           VALUES (:idEmployeeType, :idPerson, :code, :contractType)");
             $this->pdo->beginTransaction();
             $stmt->execute(array(':idEmployeeType' => $idEmployeeType, ':idPerson' => $idPerson, ':code' => $code,
@@ -138,6 +140,7 @@ class EmployeeApplication{
 
         $birthDate = $requestData['birthDate'];
         $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($birthDate, "The birth date can't be in the future.");
 
         $email = $requestData['email'];
         $this->asserts->isNotEmpty($email, "The email can't be empty.");
@@ -188,12 +191,13 @@ class EmployeeApplication{
     /**
      * @param $idEmployee
      * @return Integer
+     * @throws Exception
      */
     function getIdPersonByIdEmployee($idEmployee){
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
 
-        $stmt = $this->pdo->prepare("SELECT 
-                                        COALESCE((SELECT 
+        $stmt = $this->pdo->prepare("SELECT
+                                        COALESCE((SELECT
                                                         idPerson
                                                     FROM
                                                         employees
@@ -204,7 +208,7 @@ class EmployeeApplication{
         $stmt->execute(array(':idEmployee' => $idEmployee));
         $results = $stmt->fetchAll();
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("An error occurred while trying to find the person associated with the employee..");
         }
         $stmt = null;
 
@@ -214,11 +218,12 @@ class EmployeeApplication{
     /**
      * @param $code string
      * @return integer
+     * @throws Exception
      */
     function getIdEmployeeTypeByCode($code){
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
-        $stmt = $this->pdo->prepare("SELECT COALESCE((SELECT 
+        $stmt = $this->pdo->prepare("SELECT COALESCE((SELECT
                                         et.id
                                     FROM
                                         employees e
@@ -230,7 +235,7 @@ class EmployeeApplication{
         $stmt->execute(array(':code' => $code));
         $results = $stmt->fetchAll();
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("The employee could not be found.");
         }
         $stmt = null;
 
@@ -240,12 +245,13 @@ class EmployeeApplication{
     /**
      * @param $code string
      * @return integer
+     * @throws Exception
      */
     function getIdEmployeeByCode($code){
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
-        $stmt = $this->pdo->prepare("SELECT 
-                                    COALESCE((SELECT 
+        $stmt = $this->pdo->prepare("SELECT
+                                    COALESCE((SELECT
                                                     id
                                                 FROM
                                                     employees
@@ -257,7 +263,7 @@ class EmployeeApplication{
         $stmt->execute(array(':code' => $code));
         $results = $stmt->fetchAll();
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("The employee could not be found.");
         }
         $stmt = null;
 
@@ -269,11 +275,12 @@ class EmployeeApplication{
      *
      * @param $idEmployee
      * @return array
+     * @throws Exception
      */
     function getEmployeeDataById($idEmployee){
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
 
-        $stmt = $this->pdo->prepare("SELECT 
+        $stmt = $this->pdo->prepare("SELECT
                                         e.id AS idEmployee,
                                         p.id AS idPerson,
                                         p.firstName,
@@ -295,7 +302,7 @@ class EmployeeApplication{
         $stmt->execute(array(':idEmployee' => $idEmployee));
         $results = $stmt->fetchAll();
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("The employee could not be found.");
         }
         $stmt = null;
 
@@ -308,6 +315,7 @@ class EmployeeApplication{
      *
      * @param $idEmployee
      * @return array
+     * @throws Exception
      */
     function proxyGetEmployeeDataById($idEmployee){
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
@@ -339,6 +347,7 @@ class EmployeeApplication{
     /**
      * @param $code string
      * @return array
+     * @throws Exception
      */
     function getEmployeeDataByCode($code){
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
@@ -362,12 +371,13 @@ class EmployeeApplication{
         $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
         $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
         $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($birthDate, "The birth date can't be in the future.");
         $this->asserts->isNotEmpty($email, "The email can't be empty.");
         $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
 
         try {
-            $stmt = $this->pdo->prepare("UPDATE persons 
-                                        SET 
+            $stmt = $this->pdo->prepare("UPDATE persons
+                                        SET
                                             firstName = :firstName,
                                             middleName = :middleName,
                                             lastName = :lastName,
@@ -400,8 +410,8 @@ class EmployeeApplication{
         $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
 
         try {
-            $stmt = $this->pdo->prepare("UPDATE employees 
-                                        SET 
+            $stmt = $this->pdo->prepare("UPDATE employees
+                                        SET
                                             idEmployeeType = :idEmployeeType,
                                             code = :code,
                                             contractType = :contractType
@@ -421,6 +431,7 @@ class EmployeeApplication{
     /**
      * @param $requestData object
      * @return array
+     * @throws Exception
      */
     function updateEmployeeData($requestData){
         // Getting and validating the data
@@ -444,6 +455,7 @@ class EmployeeApplication{
 
         $birthDate = $requestData['birthDate'];
         $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($birthDate, "The birth date can't be in the future.");
 
         $email = $requestData['email'];
         $this->asserts->isNotEmpty($email, "The email can't be empty.");
@@ -492,12 +504,19 @@ class EmployeeApplication{
         return $response;
     }
 
-    function disableEmployeeRecord($idEmployee){
+    /**
+     * @param $code string
+     * @throws Exception
+     */
+    function disableEmployeeRecord($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
+        $idEmployee = $this->getIdEmployeeByCode($code);
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
 
         try {
-            $stmt = $this->pdo->prepare("UPDATE employees 
-                                        SET 
+            $stmt = $this->pdo->prepare("UPDATE employees
+                                        SET
                                             status = 'INACTIVE'
                                         WHERE
                                             id = :idEmployee");
@@ -518,9 +537,10 @@ class EmployeeApplication{
      * currently active in the system
      *
      * @return array
+     * @throws Exception
      */
     function getIdEmployeeFromAllActiveEmployees(){
-        $stmt = $this->pdo->prepare("SELECT 
+        $stmt = $this->pdo->prepare("SELECT
                                         id
                                     FROM
                                         employees
@@ -531,7 +551,7 @@ class EmployeeApplication{
         $results = $stmt->fetchAll();
 
         if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception("The employee could not be found.");
         }
         $stmt = null;
 
@@ -543,6 +563,7 @@ class EmployeeApplication{
      * all currently active employees
      *
      * @return array
+     * @throws Exception
      */
     function listAllActiveEmployees(){
         $ids = $this->getIdEmployeeFromAllActiveEmployees();
@@ -569,6 +590,7 @@ class EmployeeApplication{
      *
      * @param $partialName string
      * @return array
+     * @throws Exception
      */
     function findEmployeeByFullName($partialName){
         $fullList = $this->listAllActiveEmployees();
@@ -582,6 +604,39 @@ class EmployeeApplication{
         return $matches;
     }
 
+    /**
+     * @param $idEmployee integer
+     * @param $date date
+     * @return integer
+     * @throws Exception
+     */
+    function findIdPaymentPerDayByEmployeeAndDate($idEmployee, $date){
+        $this->asserts->isNotEmpty($idEmployee, "The code can't be empty.");
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
+        $this->asserts->isNotEmpty($date, "The code can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
+
+        $stmt = $this->pdo->prepare("SELECT 
+                                    COALESCE((SELECT 
+                                                    id
+                                                FROM
+                                                    paymentsPerEmployeePerDay
+                                                WHERE
+                                                    date = :date AND idEmployee = :idEmployee),
+                                            0) AS id;
+                                    ");
+
+        $stmt->execute(array(':date' => $date, ':idEmployee' => $idEmployee));
+        $results = $stmt->fetchAll();
+        if(!$results){
+            throw new Exception("The registry of the worked day could not be found.");
+        }
+        $stmt = null;
+
+        return $results[0]['id'];
+    }
+
     /**
      * Helper to determine if the date has already been saved as a worked day for
      * an employee, so long as it's currently active in the database
@@ -596,9 +651,10 @@ class EmployeeApplication{
         $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
 
         $this->asserts->isNotEmpty($date, "The code can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
 
-        $stmt = $this->pdo->prepare("SELECT 
-                                    COALESCE((SELECT 
+        $stmt = $this->pdo->prepare("SELECT
+                                    COALESCE((SELECT
                                                     COUNT(*)
                                                 FROM
                                                     paymentsPerEmployeePerDay
@@ -610,7 +666,7 @@ class EmployeeApplication{
         $stmt->execute(array(':date' => $date, ':idEmployee' => $idEmployee));
         $results = $stmt->fetchAll();
         if(!$results){
-            throw new Exception('Unable to determine the usage of date for the worked days.');
+            throw new Exception('Unable to find the date of the worked days.');
         }
         $stmt = null;
 
@@ -631,13 +687,14 @@ class EmployeeApplication{
     function saveWorkedDay($idEmployee, $date, $baseAmount, $bonusTime, $deliveries){
         $this->asserts->isNotEmpty($idEmployee, "The idEmployee can't be empty.");
         $this->asserts->isNotEmpty($date, "The date can't be empty.");
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
         $this->asserts->isNotEmpty($baseAmount, "The base payment per day can't be empty.");
         $this->asserts->isNotEmpty($bonusTime, "The bonus per worked hours can't be empty.");
         $this->asserts->isNotEmpty($deliveries, "The payment for deliveries can't be empty.");
 
         try {
-            $stmt = $this->pdo->prepare("INSERT INTO paymentsPerEmployeePerDay 
-                                          (idEmployee, date, baseAmount, bonusTime, deliveries) 
+            $stmt = $this->pdo->prepare("INSERT INTO paymentsPerEmployeePerDay
+                                          (idEmployee, date, baseAmount, bonusTime, deliveries)
                                           VALUES (:idEmployee, :date, :baseAmount, :bonusTime, :deliveries)");
             $this->pdo->beginTransaction();
             $stmt->execute(array(':idEmployee' => $idEmployee, ':date' => $date, ':baseAmount' => $baseAmount,
@@ -655,14 +712,77 @@ class EmployeeApplication{
     }
 
     /**
-     * Takes the data from the front end for the new worked day for a
-     * employee and saves it
+     * Changes the status in the detail table for the registry of worked days so
+     * that it behaves as if deleted
+     * @param $idEmployee
+     * @param $date
+     */
+    function dissablePaymentPerDayDetailsByEmployeeAndDate($idEmployee, $date){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+        $this->asserts->isNotEmpty($date, "The worked date cannot be empty.");
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
+
+        try {
+            $stmt = $this->pdo->prepare("UPDATE paymentsPerEmployeePerDayDetail a
+                                                INNER JOIN
+                                            paymentsPerEmployeePerDay b ON b.id = a.idPaymentPerEmployeePerDay 
+                                        SET 
+                                            a.status = 'INACTIVE'
+                                        WHERE
+                                            b.date = :date AND b.idEmployee = :idEmployee");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':date' => $date, ':idEmployee' => $idEmployee));
+            $this->pdo->commit();
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+        }
+    }
+
+    /**
+     * @param $id integer - references paymentsPerEmployeePerDay
+     * @param $baseAmount double
+     * @param $bonusTime double
+     * @param $deliveries double
+     */
+    function updateWorkedDayPayments($id, $baseAmount, $bonusTime, $deliveries){
+        $this->asserts->higherThanZero($id, "id payment must be higher than 0");
+        $this->asserts->higherThanZero($baseAmount, "baseAmount must be higher than 0");
+        $this->asserts->higherThanZero($bonusTime, "bonusTime must be higher than 0");
+        $this->asserts->higherThanZero($deliveries, "deliveries must be higher than 0");
+
+        try {
+            $stmt = $this->pdo->prepare("UPDATE paymentsPerEmployeePerDay 
+                                        SET 
+                                            baseAmount = :baseAmount,
+                                            bonusTime = :bonusTime,
+                                            deliveries = :deliveries
+                                        WHERE
+                                            id = :id");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':baseAmount' => $baseAmount, ':bonusTime' => $bonusTime, ':deliveries' => $deliveries,
+                                ':id' => $id));
+            $this->pdo->commit();
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+        }
+    }
+
+    /**
+     * Takes the data from the front end for the work day, this coulld be
+     * for an update or a creation of a new registry
+     *
+     * The function will take the request body, validate it and pass the
+     * processed data back to the wrapper method
      *
      * @param $requestData object
      * @return array
      * @throws Exception
      */
-    function SaveNewWorkDay($requestData){
+    function validateDataForStorageWorkDay($requestData){
         $code = $requestData['code'];
         $this->asserts->isNotEmpty($code, "The code can't be empty.");
 
@@ -681,10 +801,7 @@ class EmployeeApplication{
 
         $date = $requestData['date'];
         $this->asserts->isNotEmpty($date, "The worked date cannot be empty.");
-
-        if($this->checkDateNotUsedWorkDayPerEmployee($idEmployee, $date) > 0){
-            throw new Exception("This date has already been saved as a worked day.");
-        }
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
 
         // The emplpoyee can't take that rol
         if($idEmployeeType != 3 and $idEmployeeType != $idEmployeeTypePerformed){
@@ -712,9 +829,346 @@ class EmployeeApplication{
         $bonusTime = $perHourBonus * $this->settings['hoursPerWorkDay'];
         $bonusDeliveries = $deliveries * $this->settings['bonusPerDelivery'];
 
-        $this->saveWorkedDay($idEmployee, $date, $baseAmountPaid, $bonusTime, $bonusDeliveries);
+        $contractType = $this->getContractTypeByEmployee($idEmployee);
+
+        $result = array(
+            'idEmployee' => (int)$idEmployee,
+            'date' => $date,
+            'baseAmountPaid' => $baseAmountPaid,
+            'bonusTime' => $bonusTime,
+            'bonusDeliveries' => $bonusDeliveries,
+            'contractType' => $contractType,
+            'idEmployeeType' => (int)$idEmployeeType,
+            'idEmployeeTypePerformed' => (int)$idEmployeeTypePerformed,
+            'hoursPerWorkDay' => $this->settings['hoursPerWorkDay'],
+            'paymentPerHour' => $this->settings['paymentPerHour'],
+            'perHourBonus' => $perHourBonus,
+            'deliveries' => $deliveries,
+            'bonusPerDelivery' => $this->settings['bonusPerDelivery']
+        );
+
+        return $result;
+    }
+
+    /**
+     * Wrapper function to store a new day that has been worked by an employee
+     *
+     * @param $requestData object
+     * @return array
+     * @throws Exception
+     */
+    function newWorkedDay($requestData){
+        $data = $this->validateDataForStorageWorkDay($requestData);
+
+        if($this->checkDateNotUsedWorkDayPerEmployee($data['idEmployee'], $data['date']) > 0){
+            throw new Exception("This date has already been saved as a worked day.");
+        }
+
+        $idPaymentPerEmployeePerDay = $this->saveWorkedDay($data['idEmployee'], $data['date'],
+            $data['baseAmountPaid'], $data['bonusTime'], $data['bonusDeliveries']);
+
+        $this->storeWorkDayDetails($idPaymentPerEmployeePerDay, $data['idEmployeeType'],
+            $data['idEmployeeTypePerformed'], $data['contractType'], $data['hoursPerWorkDay'],
+            $data['paymentPerHour'], $data['perHourBonus'], $data['deliveries'], $data['bonusPerDelivery']);
 
         return array('status' => 'success', 'message' => 'The worked day has been saved.', 'data' => $requestData);
     }
+
+    /**
+     * Wrapper method to update a worked day for an employee
+     *
+     * @param $requestData object
+     * @return array
+     * @throws Exception
+     */
+    function updateWorkDay($requestData){
+        $data = $this->validateDataForStorageWorkDay($requestData);
+
+        $this->dissablePaymentPerDayDetailsByEmployeeAndDate($data['idEmployee'], $data['date']);
+
+        $idPaymentPerEmployeePerDay = $this->findIdPaymentPerDayByEmployeeAndDate($data['idEmployee'], $data['date']);
+
+        $this->updateWorkedDayPayments($idPaymentPerEmployeePerDay, $data['baseAmountPaid'], $data['bonusTime'], $data['bonusDeliveries']);
+
+        $this->storeWorkDayDetails($idPaymentPerEmployeePerDay, $data['idEmployeeType'],
+            $data['idEmployeeTypePerformed'], $data['contractType'], $data['hoursPerWorkDay'],
+            $data['paymentPerHour'], $data['perHourBonus'], $data['deliveries'], $data['bonusPerDelivery']);
+
+        return array('status' => 'success', 'message' => 'The worked day has been updated.', 'data' => $requestData);
+    }
+
+    /**
+     * The number of days the employee has worked for a given year and month only
+     * taking into accout the active ones
+     *
+     * @param $idEmployee integer
+     * @param $year integer
+     * @param $month integer
+     * @return integer
+     * @throws Exception
+     */
+    function findNumberWorkedOfDaysByEmployeeAndDate($idEmployee, $year, $month){
+        $this->asserts->isNotEmpty($idEmployee, "The code can't be empty.");
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+        $this->asserts->higherThanZero($year, "year must be higher than 0");
+        $this->asserts->higherThanZero($month, "month must be higher than 0");
+
+        $stmt = $this->pdo->prepare("SELECT
+                                    COALESCE((SELECT
+                                                    COUNT(*)
+                                                FROM
+                                                    paymentsPerEmployeePerDay
+                                                WHERE
+                                                    idEmployee = :idEmployee
+                                                        AND YEAR(date) = :year
+                                                        AND MONTH(date) = :month
+                                                        AND status = 'ACTIVE'),
+                                            0) AS workedDays");
+
+        $stmt->execute(array(':idEmployee' => $idEmployee, ':year' => $year, ':month' => $month));
+        $results = $stmt->fetchAll();
+        if(!$results){
+            throw new Exception('Unable to determine the amount of worked days.');
+        }
+        $stmt = null;
+
+        return $results[0]['workedDays'];
+    }
+
+    /**
+     * A list of the data contained from all the days the employee has worked
+     * for the given month and year
+     *
+     * @param $idEmployee integer
+     * @param $year integer
+     * @param $month integer
+     * @return array
+     * @throws Exception
+     */
+    function getDataWorkedDaysByEmployee($idEmployee, $year, $month){
+        $stmt = $this->pdo->prepare("SELECT
+                                        baseAmount, bonusTime, deliveries
+                                    FROM
+                                        paymentsPerEmployeePerDay
+                                    WHERE
+                                        idEmployee = :idEmployee AND
+                                            YEAR(date) = :year
+                                            AND MONTH(date) = :month
+                                            AND status = 'ACTIVE'");
+        $stmt->execute(array(':idEmployee' => $idEmployee, ':year' => $year, ':month' => $month));
+
+        $results = $stmt->fetchAll();
+
+        if(!$results){
+            throw new Exception("No data of the worked days could be found.");
+        }
+        $stmt = null;
+
+        return $results;
+    }
+
+    /**
+     * @param $idEmployee integer
+     * @return string
+     * @throws Exception
+     */
+    function getContractTypeByEmployee($idEmployee){
+        $this->asserts->isNotEmpty($idEmployee, "The code can't be empty.");
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
+        $stmt = $this->pdo->prepare("SELECT
+                                        contractType
+                                    FROM
+                                        employees
+                                    WHERE
+                                        id = :idEmployee");
+
+        $stmt->execute(array(':idEmployee' => $idEmployee));
+        $results = $stmt->fetchAll();
+        if(!$results){
+            throw new Exception("The employee wasn't found.");
+        }
+        $stmt = null;
+
+        return $results[0]['contractType'];
+    }
+
+    /**
+     * Creates a backup of the information used to calculate the amount that the employee
+     * will be paid for the submitted day
+     *
+     * @param $idPaymentPerEmployeePerDay integer
+     * @param $idEmployeeType integer
+     * @param $idEmployeeTypePerformed integer
+     * @param $contractType string
+     * @param $hoursWorked double
+     * @param $paymentPerHour double
+     * @param $bonusPerHour double
+     * @param $deliveries integer
+     * @param $paymentPerDelivery double
+     * @return integer
+     * @throws Exception
+     */
+    function storeWorkDayDetails($idPaymentPerEmployeePerDay, $idEmployeeType, $idEmployeeTypePerformed, $contractType, $hoursWorked,
+                                 $paymentPerHour, $bonusPerHour, $deliveries, $paymentPerDelivery){
+        $this->asserts->isNotEmpty($idPaymentPerEmployeePerDay, "The idPaymentPerEmployeePerDay can't be empty.");
+        $this->asserts->isNotEmpty($idEmployeeType, "The idEmployeeType can't be empty.");
+        $this->asserts->isNotEmpty($idEmployeeTypePerformed, "The idEmployeeTypePerformed can't be empty.");
+        $this->asserts->isNotEmpty($contractType, "The contractType can't be empty.");
+        $this->asserts->isNotEmpty($hoursWorked, "The hoursWorked can't be empty.");
+        $this->asserts->isNotEmpty($paymentPerHour, "The paymentPerHour can't be empty.");
+        $this->asserts->isNotEmpty($bonusPerHour, "The bonusPerHour can't be empty.");
+        $this->asserts->isNotEmpty($deliveries, "The deliveries can't be empty.");
+        $this->asserts->isNotEmpty($paymentPerDelivery, "The paymentPerDelivery can't be empty.");
+
+        try {
+            $stmt = $this->pdo->prepare("INSERT INTO paymentsPerEmployeePerDayDetail
+                                            (idPaymentPerEmployeePerDay, idEmployeeType, idEmployeeTypePerformed,
+                                            contractType, hoursWorked, paymentPerHour, bonusPerHour, deliveries, paymentPerDelivery)
+                                        VALUES
+                                            (:idPaymentPerEmployeePerDay, :idEmployeeType, :idEmployeeTypePerformed,
+                                            :contractType, :hoursWorked, :paymentPerHour, :bonusPerHour, :deliveries, :paymentPerDelivery)");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':idPaymentPerEmployeePerDay' => $idPaymentPerEmployeePerDay,
+                ':idEmployeeType' => $idEmployeeType,
+                ':idEmployeeTypePerformed' => $idEmployeeTypePerformed,
+                ':contractType' => $contractType,
+                ':hoursWorked' => $hoursWorked,
+                ':paymentPerHour' => $paymentPerHour,
+                ':bonusPerHour' => $bonusPerHour,
+                ':deliveries' => $deliveries,
+                ':paymentPerDelivery' => $paymentPerDelivery)
+            );
+            $id = $this->pdo->lastInsertId();
+            $this->pdo->commit();
+
+            return $id;
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+            throw new Exception("An error occured while saving the work day details.");
+        }
+    }
+
+    /**
+     * @param $date date
+     * @param $code string
+     * @return array
+     * @throws Exception
+     */
+    function getDataWorkDayByDateAndCode($date, $code){
+        $idEmployee = $this->getIdEmployeeByCode($code);
+        $this->asserts->dateIsNotInTheFuture($date, "The date can't be in the future.");
+
+        $stmt = $this->pdo->prepare("SELECT
+                                        b.idPaymentPerEmployeePerDay,
+                                        b.idEmployeeType,
+                                        b.idEmployeeTypePerformed,
+                                        b.contractType,
+                                        b.hoursWorked,
+                                        b.paymentPerHour,
+                                        b.bonusPerHour,
+                                        b.deliveries,
+                                        b.paymentPerDelivery
+                                    FROM
+                                        paymentsPerEmployeePerDay a
+                                            INNER JOIN
+                                        paymentsPerEmployeePerDayDetail b ON b.idPaymentPerEmployeePerDay = a.id
+                                    WHERE
+                                        a.idEmployee = :idEmployee
+                                            AND a.date = :date
+                                            AND a.status = 'ACTIVE'
+                                            AND b.status = 'ACTIVE'
+                                    ORDER BY b.id DESC
+                                    LIMIT 1");
+        $stmt->execute(array(':idEmployee' => $idEmployee, ':date' => $date));
+
+        $results = $stmt->fetchAll();
+
+        if(!$results){
+            throw new Exception("No data of the work day was found.");
+        }
+        $stmt = null;
+
+        foreach($results as $row){
+            $data = array(
+                'idPaymentPerEmployeePerDay' => (int)$row['idPaymentPerEmployeePerDay'],
+                'idEmployeeType' => (int)$row['idEmployeeType'],
+                'idEmployeeTypePerformed' => (int)$row['idEmployeeTypePerformed'],
+                'contractType' => $row['contractType'],
+                'hoursWorked' => (int)$row['hoursWorked'],
+                'paymentPerHour' => (int)$row['paymentPerHour'],
+                'bonusPerHour' => (int)$row['bonusPerHour'],
+                'deliveries' => (int)$row['deliveries'],
+                'paymentPerDelivery' => (int)$row['paymentPerDelivery']
+            );
+        }
+
+        return $data;
+    }
+
+    /**
+     * Gets all the worked days for an employee and determines how much they're
+     * getting paid
+     *
+     * Will only work for the current month
+     *
+     * @param $code string
+     * @return array
+     * @throws Exception
+     */
+    function calculateSalaryByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
+        $idEmployee = $this->getIdEmployeeByCode($code);
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
+        $salary = array(
+            'raw' => 0,
+            'taxes' => 0,
+            'real' => 0,
+            'vouchers' => 0
+        );
+
+        // No worked days found
+        if($this->findNumberWorkedOfDaysByEmployeeAndDate($idEmployee, date('Y'), date('m')) <= 0){
+            return $salary;
+        }
+
+        $dataWorkedDays = $this->getDataWorkedDaysByEmployee($idEmployee, date('Y'), date('m'));
+
+        $monthlyPayment = 0;
+        foreach($dataWorkedDays as $row){
+            $monthlyPayment = $monthlyPayment + $row['baseAmount'] + $row['bonusTime'] + $row['deliveries'];
+        }
+
+        $salary['raw'] = $monthlyPayment;
+
+        if($monthlyPayment >= $this->settings['amountForExtraTaxes']){
+            $this->settings['taxesAddUp']
+                ? $taxes = $monthlyPayment * ($this->settings['baseIsr'] + $this->settings['extraIsr'])
+                : $taxes = ($monthlyPayment * $this->settings['baseIsr']) + (($monthlyPayment * $this->settings['baseIsr']) * $this->settings['extraIsr']);
+        }else{
+            $taxes = $monthlyPayment * $this->settings['baseIsr'];
+        }
+
+        $salary['taxes'] = $taxes;
+        $salary['real'] = $monthlyPayment - $taxes;
+
+        $contractType = $this->getContractTypeByEmployee($idEmployee);
+
+        if($contractType == 'INTERNO'){
+            $vouchers = $monthlyPayment * $this->settings['percentOfPaymentForVouchers'];
+        }elseif ($contractType == 'EXTERNO'){
+            $this->settings['vouchersForAllContractTypes']
+                ? $vouchers = $monthlyPayment * $this->settings['percentOfPaymentForVouchers']
+                : $vouchers = 0;
+        }
+
+        $salary['vouchers'] = $vouchers;
+
+        return $salary;
+    }
 }
-?>
+?>

api-payroll/src/application/SessionApplication.php

@@ -12,8 +12,6 @@ class SessionApplication{
         $this->cryptographyService = $cryptographyService;
         $this->pdo = $mysql;
         $this->asserts = $asserts;
-
-        $this->databaseSelectQueryErrorMessage = 'There was an error inserting the record.';
     }
 
     /**

api-payroll/src/routes.php

@@ -65,12 +65,12 @@ $app->put('/api/employee', function ($request, $response) {
         ->write(json_encode($this->employeeApplication->updateEmployeeData($requestData)));
 });
 
-$app->DELETE('/api/employee/{idEmployee}', function (Request $request, Response $response, array $args) {
-    $idEmployee = $args['idEmployee'];
+$app->DELETE('/api/employee/{code}', function (Request $request, Response $response, array $args) {
+    $code = $args['code'];
 
     return $response->withStatus(200)
         ->withHeader('Content-Type', 'application/json')
-        ->write(json_encode($this->employeeApplication->disableEmployeeRecord($idEmployee)));
+        ->write(json_encode($this->employeeApplication->disableEmployeeRecord($code)));
 });
 
 $app->get('/api/employee/type/{code}', function (Request $request, Response $response, array $args) {
@@ -102,5 +102,30 @@ $app->post('/api/employee/workday', function ($request, $response) {
 
     return $response->withStatus(200)
         ->withHeader('Content-Type', 'application/json')
-        ->write(json_encode($this->employeeApplication->SaveNewWorkDay($requestData)));
-});
+        ->write(json_encode($this->employeeApplication->newWorkedDay($requestData)));
+});
+
+$app->put('/api/employee/workday', function ($request, $response) {
+    $requestData = $request->getParsedBody();
+
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->updateWorkDay($requestData)));
+});
+
+$app->get('/api/employee/salary/{code}', function (Request $request, Response $response, array $args) {
+    $code = $args['code'];
+
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->calculateSalaryByCode($code)));
+});
+
+$app->get('/api/employee/salary/date/{date}/code/{code}', function (Request $request, Response $response, array $args) {
+    $date = $args['date'];
+    $code = $args['code'];
+
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->getDataWorkDayByDateAndCode($date, $code)));
+});

api-payroll/src/service/Asserts.php

@@ -95,5 +95,16 @@ class Asserts{
             throw new Exception($errorMessage);
         }
     }
+
+    /**
+     * @param $date
+     * @param $errorMessage
+     * @throws Exception
+     */
+    function dateIsNotInTheFuture($date, $errorMessage){
+        if ($date > date('Y-m-d')){
+            throw new Exception($errorMessage);
+        }
+    }
 }
 ?>

api-payroll/src/settings.php

@@ -52,12 +52,12 @@ return [
             'perHourBonusDriver' => 10,
             'perHourBonusLoader' => 5,
             'perHourBonusAux' => 0,
-            'BaseIsr' => 9,
-            'extraIsr' => 3,
+            'baseIsr' => .09,
+            'extraIsr' => .03,
             'taxesAddUp' => true, // If true this will be total/(9 + 3) else they're subtracted separately
             'amountForExtraTaxes' => 16000,
             'vouchersForAllContractTypes' => false, // Outsourced personal won't get vouchers
-            'percentOfPaymentForVouchers' => 4,
+            'percentOfPaymentForVouchers' => .04,
         ],
     ],
 ];

database/database.sql

@@ -71,6 +71,7 @@ CREATE TABLE IF NOT EXISTS `employees` (
   `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP comment 'The date on which the registry was created',
   `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment 'The date of the last time the row was modified',
   PRIMARY KEY  (`id`),
+  INDEX `idx_contractType` (`contractType`),
   UNIQUE (`code`)
 );
 
@@ -89,3 +90,25 @@ CREATE TABLE IF NOT EXISTS `paymentsPerEmployeePerDay` (
   FOREIGN KEY (idEmployee) REFERENCES employees(id),
   UNIQUE (`idEmployee`, `date`, `status`)
 );
+
+DROP TABLE IF EXISTS paymentsPerEmployeePerDayDetail;
+CREATE TABLE IF NOT EXISTS `paymentsPerEmployeePerDayDetail` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `idPaymentPerEmployeePerDay` INT UNSIGNED NOT NULL comment 'References the payment for the work day',
+  `idEmployeeType` INT UNSIGNED NOT NULL comment 'The type of employee',
+  `idEmployeeTypePerformed` INT UNSIGNED NOT NULL comment 'The employee working for the day as',
+  `contractType` ENUM('INTERNO', 'EXTERNO') NOT NULL comment 'The type of contract',
+  `hoursWorked` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Hours worked for the day',
+  `paymentPerHour` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Payment per hour worked',
+  `bonusPerHour` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Bonus payment per hour worked',
+  `deliveries` INT UNSIGNED NOT NULL DEFAULT 0 comment 'Total amount of deliveries for the day',
+  `paymentPerDelivery` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Payment for each delivery done',
+  `status` ENUM('ACTIVE', 'INACTIVE') NOT NULL DEFAULT 'ACTIVE',
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP comment 'The date on which the registry was created',
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment 'The date of the last time the row was modified',
+  PRIMARY KEY  (`id`),
+  FOREIGN KEY (idPaymentPerEmployeePerDay) REFERENCES paymentsPerEmployeePerDay(id),
+  FOREIGN KEY (idEmployeeType) REFERENCES employeeType(id),
+  FOREIGN KEY (idEmployeeTypePerformed) REFERENCES employeeType(id),
+  FOREIGN KEY (contractType) REFERENCES employees(contractType)
+);