[fix] Reference to view body

[add] Loading views
[add] Logout uses generic error messages
2018-08-12 11:36:17 -06:00 · 2018-08-12 11:32:48 -06:00 · 2018-08-12 10:39:44 -06:00 · 2018-08-12 10:08:54 -06:00 · 2018-08-12 10:03:25 -06:00 · 2018-08-12 09:13:00 -06:00
37 changed files with 1324 additions and 82 deletions
--- a/api-payroll/.dockerignore
+++ b/api-payroll/.dockerignore
@@ -0,0 +1,5 @@
+Dockerfile
+README.md
+buildspec.yml
+CONTRIBUTING.md
+docker-compose.yml
--- a/api-payroll/.htaccess
+++ b/api-payroll/.htaccess
@@ -0,0 +1,2 @@
+Options -Indexes
+Deny from all
--- a/api-payroll/Dockerfile
+++ b/api-payroll/Dockerfile
@@ -0,0 +1,52 @@
+# Stage 1 - the build process
+FROM composer:1.7.1 as build-deps
+ENV COMPOSER_ALLOW_SUPERUSER 1
+
+WORKDIR /root
+
+COPY . .
+RUN composer install
+RUN composer test
+
+# Stage 2 - the production environment
+FROM ubuntu:16.04
+
+RUN apt-get -y update && apt-get -y upgrade
+
+RUN apt-get -y install apache2 \
+php7.0 \
+libapache2-mod-php7.0 \
+php7.0-cli \
+php7.0-common \
+php7.0-mbstring \
+php7.0-gd \
+php7.0-intl \
+php7.0-xml \
+php7.0-mysql \
+php7.0-mcrypt
+
+# Enable apache mods
+RUN a2enmod php7.0
+RUN a2enmod rewrite
+
+# Update the PHP.ini file, enable <? ?> tags and quieten logging
+RUN sed -i "s/short_open_tag = Off/short_open_tag = On/" /etc/php/7.0/apache2/php.ini
+RUN sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PARSE/" /etc/php/7.0/apache2/php.ini
+
+# Manually set up the apache environment variables
+ENV APACHE_RUN_USER www-data
+ENV APACHE_RUN_GROUP www-data
+ENV APACHE_LOG_DIR /var/log/apache2
+ENV APACHE_LOCK_DIR /var/lock/apache2
+
+WORKDIR /var/www/site
+COPY --from=build-deps /root .
+
+RUN touch logs/app.log
+RUN chmod 777 logs/app.log
+
+# Update the default apache site
+ADD docker/apache-config.conf /etc/apache2/sites-enabled/000-default.conf
+
+# By default start up apache in the foreground
+CMD /usr/sbin/apache2ctl -D FOREGROUND
--- a/api-payroll/buildspec.yml
+++ b/api-payroll/buildspec.yml
@@ -14,8 +14,9 @@ phases:
      - echo Entered the build phase...
      - echo Build started on `date`
      - composer test
+      - sudo docker-compose up --build -d
  post_build:
    commands:
      - echo Entered the post_build phase...
+      - sudo docker-compose down --rmi all -v
      - echo Build completed on `date`
-
--- a/api-payroll/docker/apache-config.conf
+++ b/api-payroll/docker/apache-config.conf
@@ -0,0 +1,15 @@
+<VirtualHost *:80>
+  ServerAdmin me@mydomain.com
+  DocumentRoot /var/www/site
+
+  <Directory /var/www/site/>
+      Options Indexes FollowSymLinks MultiViews
+      AllowOverride All
+      Order deny,allow
+      Allow from all
+  </Directory>
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>
--- a/api-payroll/logs/app.log
+++ b/api-payroll/logs/app.log
--- a/api-payroll/public/.htaccess
+++ b/api-payroll/public/.htaccess
@@ -1,3 +1,5 @@
+allow from all
+
 <IfModule mod_rewrite.c>
  RewriteEngine On

--- a/api-payroll/public/css/bootstrap.min.css
+++ b/api-payroll/public/css/bootstrap.min.css
--- a/api-payroll/public/css/landing.css
+++ b/api-payroll/public/css/landing.css
@@ -0,0 +1,246 @@
+body {
+    background-color: #e3e3e3;
+    color: #000;
+}
+
+.datepicker{
+    color: black;
+}
+
+#newViewBody{
+    top:17%;
+    left:1%;
+    width:98%;
+    float:left;
+}
+
+#navigation_spot{
+    margin: 0;
+    padding: 0;
+}
+
+#footer {
+
+}
+
+#newViewBody .modal-body{
+    color: #000;
+    border:none;
+}
+
+#newViewBody .panel-default{
+    border: 3px solid #4A89A5;
+    border-radius: 5px;
+}
+
+#newViewBody .panel > .panel-heading {
+    background-image: none;
+    background-color: #4A89A5;
+    color: white;
+    border-radius: 0;
+}
+
+#newViewBody .btn-default{
+    border: 2px solid #62655F;
+    background: #F9DFAF;
+}
+
+#newViewBody .btn-default:hover{
+    border: 2px solid #62655F;
+    background: #F9DFAF;
+}
+
+#newViewBody .alert-success{
+    background: #C6E97C;
+}
+
+#modal_header_error{
+    background-color: #d9534f;
+}
+
+#modal_header_respuesa_servidor_error{
+    background-color: #d9534f;
+}
+
+#modal_header_respuesa_servidor_success{
+    background-color: #5bc0de;
+}
+
+
+.metro{
+    width:auto;
+    height:auto;
+}
+.metroBox{
+    margin: 0 auto;
+    width:100%;
+    padding: 0;
+    height:auto;
+    display:table;
+    overflow: hidden;
+}
+.metroBox h3{
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
+.metroBox a{
+    text-decoration: none;
+    color: #fff;
+}
+.boxElement{
+    color: #fff;
+    height:210px;
+    width: 318px;
+    float:left;
+    margin:0 5px 5px 0;
+    padding:0 1% 0 1%;
+}
+.boxElement:hover{
+    color: #fff;
+    background: #483D8B;
+    text-decoration: none;
+}
+.amarelo{
+    background:#f4c20d;
+}
+.vermelho{
+    background:#da542d;
+}
+.azul{
+    background:#009bad;
+}
+.azulFuerte{
+    background:#5636b0;
+}
+.verde{
+    background-color: #009f00;
+}
+.violet{
+    background-color: #a400ab;
+}
+.iconPanel{
+    font-size: 130px;
+}
+@media (max-width: 310px){
+    .boxElement{
+        width: 245px;
+    }
+}
+@media (min-width: 311px) and (max-width: 353px){
+    .boxElement{
+        width: 265px;
+    }
+}
+@media (min-width: 354px) and (max-width: 365px){
+    .boxElement{
+        width: 320px;
+    }
+}
+@media (min-width: 366px) and (max-width: 520px){
+    .boxElement{
+        width: 320px;
+    }
+}
+@media (min-width: 521px) and (max-width: 549px){
+    .boxElement{
+        width: 235px;
+    }
+}
+@media (min-width: 550px) and (max-width: 590px){
+    .boxElement{
+        width: 250px;
+    }
+}
+@media (min-width: 591px) and (max-width: 610px){
+    .boxElement{
+        width: 265px;
+    }
+}
+@media (min-width: 611px) and (max-width: 630px){
+    .boxElement{
+        width: 275px;
+    }
+}
+@media (min-width: 631px) and (max-width: 655px){
+    .boxElement{
+        width: 280px;
+    }
+}
+@media (min-width: 656px) and (max-width: 699px){
+    .boxElement{
+        width: 300px;
+    }
+}
+@media (min-width: 700px) and (max-width: 739px){
+    .boxElement{
+        width: 320px;
+    }
+}
+@media (min-width: 740px) and (max-width: 769px){
+    .boxElement{
+        width: 340px;
+    }
+}
+@media (min-width: 770px) and (max-width: 1230px){
+    .boxElement{
+        width: 280px;
+    }
+}
+
+
+.formato_texto_custom{
+    width: 97%;
+    float: left;
+    border: 1px solid #222;
+    padding: 1%;
+    margin: .5%;
+}
+
+.cliente_muestra_producto{
+    width: 96%;
+    padding: 1%;
+    margin: 0 1% 2% 1%;
+}
+
+textarea{
+    resize: none;
+}
+
+#custom-bootstrap-menu.navbar-default .navbar-brand {
+    color: rgba(255, 255, 255, 1);
+}
+#custom-bootstrap-menu.navbar-default {
+    font-size: 14px;
+    background-color: rgba(27, 35, 78, 1);
+    border-width: 1px;
+    border-radius: 4px;
+}
+#custom-bootstrap-menu.navbar-default .navbar-nav>li>a {
+    color: rgba(255, 255, 255, 1);
+    background-color: rgba(27, 35, 78, 1);
+}
+#custom-bootstrap-menu.navbar-default .navbar-nav>li>a:hover,
+#custom-bootstrap-menu.navbar-default .navbar-nav>li>a:focus {
+    color: rgba(106, 171, 232, 1);
+    background-color: rgba(27, 35, 78, 1);
+}
+#custom-bootstrap-menu.navbar-default .navbar-nav>.active>a,
+#custom-bootstrap-menu.navbar-default .navbar-nav>.active>a:hover,
+#custom-bootstrap-menu.navbar-default .navbar-nav>.active>a:focus {
+    color: rgba(255, 255, 255, 1);
+    background-color: rgba(27, 35, 78, 1);
+}
+#custom-bootstrap-menu.navbar-default .navbar-toggle {
+    border-color: #1b234e;
+}
+#custom-bootstrap-menu.navbar-default .navbar-toggle:hover,
+#custom-bootstrap-menu.navbar-default .navbar-toggle:focus {
+    background-color: #1b234e;
+}
+#custom-bootstrap-menu.navbar-default .navbar-toggle .icon-bar {
+    background-color: #1b234e;
+}
+#custom-bootstrap-menu.navbar-default .navbar-toggle:hover .icon-bar,
+#custom-bootstrap-menu.navbar-default .navbar-toggle:focus .icon-bar {
+    background-color: #1b234e;
+}
--- a/api-payroll/public/css/login.css
+++ b/api-payroll/public/css/login.css
@@ -0,0 +1,81 @@
+body {
+    background: url(../imagenes/grey_background.jpg);
+    background-size: cover;
+    font-family: Montserrat;
+}
+@media only screen and (min-device-width: 480px) {
+    body {
+        background: url('../imagenes/grey_background.jpg') no-repeat fixed center center;
+    }
+}
+.logo {
+    width: 213px;
+    height: 60px;
+    margin: 30px auto;
+}
+.login-block {
+    width: 320px;
+    padding: 20px;
+    background: #fff;
+    border-radius: 5px;
+    border-top: 5px solid #5bc0de;
+    margin: 0 auto;
+}
+.login-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+.login-block input {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    font-family: Montserrat;
+    padding: 0 20px 0 50px;
+    outline: none;
+}
+.login-block input#user {
+    background: #fff url('../imagenes/login_username.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#user:focus {
+    background: #fff url('../imagenes/login_username.png') 20px bottom no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#password {
+    background: #fff url('../imagenes/login_password.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input#password:focus {
+    background: #fff url('../imagenes/login_password.png') 20px bottom no-repeat;
+    background-size: 16px 80px;
+}
+.login-block input:active, .login-block input:focus {
+    border: 1px solid #5bc0de;
+}
+.login-block #loginButon {
+    width: 100%;
+    height: 40px;
+    background: #009bad;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #000;
+    color: #fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    font-family: Montserrat;
+    outline: none;
+    cursor: pointer;
+}
+
+#modalLoginErrorHeader{
+    background-color: #d9534f;
+}
--- a/api-payroll/public/fonts/glyphicons-halflings-regular.ttf
+++ b/api-payroll/public/fonts/glyphicons-halflings-regular.ttf
--- a/api-payroll/public/fonts/glyphicons-halflings-regular.woff
+++ b/api-payroll/public/fonts/glyphicons-halflings-regular.woff
--- a/api-payroll/public/fonts/glyphicons-halflings-regular.woff2
+++ b/api-payroll/public/fonts/glyphicons-halflings-regular.woff2
--- a/api-payroll/public/html/NewEmployee.php
+++ b/api-payroll/public/html/NewEmployee.php
@@ -0,0 +1,38 @@
+<script src="../js/NewEmployee.js"></script>
+
+<form class="form-horizontal" id="newEmployeeForm">
+    <div class="col-md-12">
+        <div class="col-md-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">New employee</h3>
+                </div>
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="form-group">
+                            <label class="col-md-4 control-label" for="newEmployeeFirstName">First name</label>
+                            <div class="col-md-5">
+                                <input id="newEmployeeFirstName" name="newEmployeeFirstName" 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="newEmployeeMiddleName">Middle name</label>
+                            <div class="col-md-5">
+                                <input id="newEmployeeMiddleName" name="newEmployeeMiddleName" type="number" class="form-control input-md">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="row">
+                            <div class="form-group">
+                                <a href="#" class="btn btn-lg btn-success" onclick="saveNewEmployee();">Save</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
--- a/api-payroll/public/html/landing.php
+++ b/api-payroll/public/html/landing.php
@@ -0,0 +1,228 @@
+<?php
+session_start();
+
+if(!isset($_SESSION['userName'])){
+    header("Location: ./login.php");
+    exit();
+}
+?>
+
+<!-- Latest compiled and minified CSS -->
+<link rel="stylesheet" href="../css/bootstrap.min.css">
+
+<!-- jQuery library -->
+<script src="../js/jquery.min.js"></script>
+
+<!-- Latest compiled JavaScript -->
+<script src="../js/bootstrap.min.js"></script>
+
+<body>
+    <div class="col-md-12" id="navigation_spot">
+        <!-- NavBar-->
+        <div id="custom-bootstrap-menu" class="navbar navbar-default " role="navigation">
+            <div class="container-fluid">
+                <div class="navbar-header"><a class="navbar-brand" href="#"></a>
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-menubuilder"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
+                    </button>
+                </div>
+                <div class="collapse navbar-collapse navbar-menubuilder">
+                        <ul class="nav navbar-nav navbar-left" id="nevatation-options">
+
+                            <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="EditEmployee.php"> Modify employee</a></li>
+                                </ul>
+                            </li>
+
+
+                            <li>
+                                <a href="#" onclick="loadView();"><span class="glyphicon glyphicon-tasks"></span> Management</a>
+                            </li>
+
+                            <li>
+                                <a href="#" onclick="loadView();"><span class="glyphicon glyphicon-wrench"></span> Change password</a>
+                            </li>
+                        </ul>
+                    <ul class="nav navbar-nav navbar-right">
+                        <li>
+                            <a href="#" onclick="logout();"><span class="fa fa-fw fa-power-off"></span> logout</a>
+                        </li>
+                    </ul>
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-12" id="newViewBody"></div>
+
+    <!--
+    =================================================================================
+                           Modals for errors encountered by ajax
+    =================================================================================
+    -->
+
+    <div id="modal_error_internet" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <p>Please verify your internet connection and try again.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_error_404" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <p>Unable to find the requested url in the sever.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_error_500" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <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>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_error_parsererror" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <p>The response from the sever wasn't a proper JSON format</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_error_timeout" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <p>The request timeout, please try again or verify your connection.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_error_otro" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <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>
+                <div class="modal-body">
+                    <p>An unknown error occurred.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <!--
+    =================================================================================
+                            Generic response modals
+    =================================================================================
+    -->
+
+    <div id="modal_server_response_error" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <div class="modal-header" id="modal_header_server_response_error">
+                    <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>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="modal_server_response_success" class="modal fade" role="dialog">
+        <div class="modal-dialog">
+
+            <div class="modal-content">
+                <div class="modal-header" id="modal_header_server_response_success">
+                    <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>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</body>
+
+<script src="../js/getBaseUrl.js"></script>
+<script src="../js/landing.js"></script>
+<link href="../css/landing.css" rel="stylesheet">
--- a/api-payroll/public/html/login.php
+++ b/api-payroll/public/html/login.php
@@ -0,0 +1,54 @@
+<?php
+session_start();
+
+if(isset($_SESSION['userName'])){
+    header("Location: ./landing.php");
+    exit();
+}
+?>
+
+<!-- Latest compiled and minified CSS -->
+<link rel="stylesheet" href="../css/bootstrap.min.css">
+
+<!-- jQuery library -->
+<script src="../js/jquery.min.js"></script>
+
+<!-- Latest compiled JavaScript -->
+<script src="../js/bootstrap.min.js"></script>
+
+<link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
+<div class="container">
+    <div class="logo"></div>
+    <div class="login-block">
+        <form action="" method="post" name="Login_Form" class="login">
+            <h1>Login</h1>
+            <input type="text" value="" placeholder="User" id="userName" name="user" required="" autofocus=""/>
+            <input type="password" value="" placeholder="Password" id="password" name="password" required=""/>
+            <a href="#" class="btn btn-lg btn-warning btn-default" id="loginButon" name="login" value="Login" onclick="processLogin();">Login</a>
+        </form>
+    </div>
+</div>
+
+<div id="modalLoginError" class="modal fade" role="dialog">
+    <div class="modal-dialog">
+
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header" id="modalLoginErrorHeader">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title"><center>Ha ocurrido un error</center></h4>
+            </div>
+            <div class="modal-body">
+                <p id="modalLoginErrorBody"></p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
+            </div>
+        </div>
+
+    </div>
+</div>
+
+<script src="../js/login.js"></script>
+<script src="../js/getBaseUrl.js"></script>
+<link href="../css/login.css" rel="stylesheet">
--- a/api-payroll/public/imagenes/grey_background.jpg
+++ b/api-payroll/public/imagenes/grey_background.jpg
--- a/api-payroll/public/imagenes/login_password.png
+++ b/api-payroll/public/imagenes/login_password.png
--- a/api-payroll/public/imagenes/login_username.png
+++ b/api-payroll/public/imagenes/login_username.png
--- a/api-payroll/public/js/NewEmployee.js
+++ b/api-payroll/public/js/NewEmployee.js
@@ -0,0 +1,3 @@
+function saveNewEmployee(){
+    console.log('saving...');
+}
--- a/api-payroll/public/js/bootstrap.min.js
+++ b/api-payroll/public/js/bootstrap.min.js
--- a/api-payroll/public/js/getBaseUrl.js
+++ b/api-payroll/public/js/getBaseUrl.js
@@ -0,0 +1,10 @@
+/**
+ * Returns the entry point url for the system, this url will be used
+ * to access both the api and the static resources
+ *
+ * @returns {string}
+ */
+function getbaseUrl(){
+    var url = window.location.href;
+    return url.substring(0, url.indexOf('/html/'));
+}
--- a/api-payroll/public/js/jquery.min.js
+++ b/api-payroll/public/js/jquery.min.js
--- a/api-payroll/public/js/landing.js
+++ b/api-payroll/public/js/landing.js
@@ -0,0 +1,77 @@
+/**
+ * Destorys the session for the current user and redirects
+ * back to the login form
+ */
+function logout() {
+    let baseUrl = getbaseUrl();
+
+    $.ajax({
+        url: baseUrl + '/api/session/logout',
+        type: 'GET',
+        dataType: 'json',
+        success:function(data){
+            window.location.replace(baseUrl + '/html/login.php');
+        },
+        error:function(x,e) {
+            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');
+            } else if(e=='parsererror') {
+                $('#modal_error_parsererror').modal('show');
+            } else if(e=='timeout'){
+                $('#modal_error_timeout').modal('show');
+            } else {
+                $('#modal_error_otro').modal('show');
+            }
+        },
+    });
+}
+
+/**
+ * Entry point for loading elements from the navatation var, this functuion
+ * will filter the junk clicks that have landed in a dropdown menu and pass
+ * only the ones containing an action to the actual view loader
+ */
+$('#nevatation-options li a').click(function(){
+
+    let view = $(this).data('nav_accion');
+
+    if (view != "#" && view != undefined) {
+        loadView(view);
+    }
+});
+
+/**
+ * Will fetch the html of the desired view and load it into the landing page
+ *
+ * @param requestedView string
+ */
+function loadView(requestedView){
+    let baseUrl = getbaseUrl();
+
+    $.ajax({
+        url: baseUrl + '/html/' + requestedView,
+        type: 'get',
+        success:function(data){
+            $("#newViewBody").hide().html(data).show('slow');
+        },
+        error:function(x,e) {
+            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');
+            } else if(e=='parsererror') {
+                $('#modal_error_parsererror').modal('show');
+            } else if(e=='timeout'){
+                $('#modal_error_timeout').modal('show');
+            } else {
+                $('#modal_error_otro').modal('show');
+            }
+        },
+    });
+}
--- a/api-payroll/public/js/login.js
+++ b/api-payroll/public/js/login.js
@@ -0,0 +1,48 @@
+/**
+ * Maps the enter key to the login action
+ */
+$(document).keypress(function(e) {
+    if(e.which == 13) {
+        processLogin();
+    }
+});
+
+/**
+ * Takes the input from the username and password fields and send theem to the backend
+ * to be validated
+ *
+ * The response from the api will contain a status that will determine if the login was
+ * successful or not and a message that will contain feedback which can be used to
+ * display errors to the user
+ */
+function processLogin() {
+    var baseUrl = getbaseUrl();
+
+    var parameters = {
+        "userName":$('#userName').val(),
+        "password":$('#password').val()
+    };
+
+    $.ajax({
+        url: baseUrl + '/api/session/login',
+        type: 'POST',
+        dataType: 'json',
+        data: parameters,
+        success:function(data){
+            console.log(JSON.stringify(data));
+            if(data["status"] == "success"){
+                window.location.replace(baseUrl + '/html/landing.php');
+
+            }else if(data["status"] == "success" || (data["status"] === undefined)){
+                $('#modalLoginError').modal('show');
+                document.getElementById('modalLoginErrorBody').innerHTML = "The server didn't respond in time, please try again or refresh this page.";
+            }
+        },
+        error:function(x) {
+            if (x.status==500){
+                $('#modalLoginError').modal('show');
+                document.getElementById('modalLoginErrorBody').innerHTML = "The user or password didnt match, please try again";
+            }
+        },
+    });
+}
--- a/api-payroll/src/application/EmployeeApplication.php
+++ b/api-payroll/src/application/EmployeeApplication.php
@@ -1,6 +1,8 @@
 <?php
 namespace App\Application;

+use phpDocumentor\Reflection\Types\Integer;
+
 class EmployeeApplication{
    private $pdo;
    private $cryptographyService;
@@ -36,24 +38,29 @@ class EmployeeApplication{
        }
        $stmt = null;

-        return $results;
+        $employeeTypes = array();
+        foreach($results as $row){
+            $employeeTypes[] = array('id' => (int)$row['id'], 'name' => $row['name']);
+        }
+
+        return $employeeTypes;
    }

    /**
-     * @param $firstName varbinary
-     * @param $middleName varbinary
-     * @param $lastName varbinary or null
+     * @param $firstName binary
+     * @param $middleName binary
+     * @param $lastName binary or null
     * @param $birthDate date yyyy-mm-dd
     * @param $email string
     * @param $phone string
     * @return integer
     */
    function saveNewPerson($firstName, $middleName, $lastName, $birthDate, $email, $phone){
-        $this->asserts->firstName($firstName);
-        $this->asserts->middleName($middleName);
-        $this->asserts->birthDate($birthDate);
-        $this->asserts->email($email);
-        $this->asserts->phone($phone);
+        $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->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) 
@@ -82,6 +89,10 @@ class EmployeeApplication{
     * @return mixed
     */
    function savePersonAsEmployee($idEmployeeType, $idPerson, $code, $contractType){
+        $this->asserts->higherThanZero($idEmployeeType, "idEmployeeType must be higher than 0");
+        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
+        $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) 
                                          VALUES (:idEmployeeType, :idPerson, :code, :contractType)");
@@ -108,21 +119,29 @@ class EmployeeApplication{
    function saveNewEmployee($requestData){
        // Getting and validating the data
        $firstName = $requestData['firstName'];
-        $this->asserts->firstName($firstName);
+        $this->asserts->isNotEmpty($firstName, "The first name can't be empty.");
+        $this->asserts->isString($firstName, "The first name must be a string.");
+        $this->asserts->betweenLength($firstName, 1, 50, "The first name must have a length between 1 and 50 characters.");

        $middleName = $requestData['middleName'];
-        $this->asserts->middleName($middleName);
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
+        $this->asserts->isString($middleName, "The middle name must be a string.");
+        $this->asserts->betweenLength($middleName, 1, 50, "The middle name must have a length between 1 and 50 characters.");

-        $lastName = isset($requestData['lastName']) ? $requestData['lastName'] : null;
+        $lastName = isset($requestData['lastName'])
+            ? $requestData['lastName']
+            : null;

        $birthDate = $requestData['birthDate'];
-        $this->asserts->birthDate($birthDate);
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");

        $email = $requestData['email'];
-        $this->asserts->email($email);
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
+        $this->asserts->betweenLength($email, 1, 100, "The middle name must have a length between 1 and 100 characters.");

        $phone = $requestData['phone'];
-        $this->asserts->phone($phone);
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
+        $this->asserts->betweenLength($phone, 10, 10, "The phone number must be 10 digits without special characters.");

        $idEmployeeType = $requestData{'idEmployeeType'};
        $contractType = $requestData{'contractType'};
@@ -158,10 +177,38 @@ class EmployeeApplication{
    }

    /**
-     * @param $code
-     * @return mixed
+     * @param $idEmployee
+     * @return Integer
+     */
+    function getIdPersonByIdEmployee($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
+        $stmt = $this->pdo->prepare("SELECT 
+                                        COALESCE((SELECT 
+                                                        idPerson
+                                                    FROM
+                                                        employees
+                                                    WHERE
+                                                        id = :idEmployee),
+                                                0) AS id");
+
+        $stmt->execute(array(':idEmployee' => $idEmployee));
+        $results = $stmt->fetchAll();
+        if(!$results){
+            exit($this->databaseSelectQueryErrorMessage);
+        }
+        $stmt = null;
+
+        return $results[0]['id'];
+    }
+
+    /**
+     * @param $code string
+     * @return integer
     */
    function getIdEmployeeTypeByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
        $stmt = $this->pdo->prepare("SELECT COALESCE((SELECT 
                                        et.id
                                    FROM
@@ -188,6 +235,8 @@ class EmployeeApplication{
     * @return array
     */
    function getEmployeeDataById($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
        $stmt = $this->pdo->prepare("SELECT 
                                        p.id AS idPerson,
                                        p.firstName,
@@ -222,6 +271,8 @@ class EmployeeApplication{
     * @return array
     */
    function proxyGetEmployeeDataById($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
        $employeeData = $this->getEmployeeDataById($idEmployee);

        $response = array(
@@ -241,7 +292,224 @@ class EmployeeApplication{
        );

        return $response;
+    }

+    /**
+     * @param $code string
+     * @return array
+     */
+    function getEmployeeDataByCode($code){
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+
+        $idEmployee = $this->getIdEmployeeTypeByCode($code);
+
+        return $this->proxyGetEmployeeDataById($idEmployee);
+    }
+
+    /**
+     * @param $idPerson integer
+     * @param $firstName  binary
+     * @param $middleName binary
+     * @param $lastName binary
+     * @param $birthDate date
+     * @param $email binary
+     * @param $phone string
+     */
+    function updatePerson($idPerson, $firstName, $middleName, $lastName, $birthDate, $email, $phone){
+        $this->asserts->higherThanZero($idPerson, "idPerson must be higher than 0");
+        $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->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 
+                                            firstName = :firstName,
+                                            middleName = :middleName,
+                                            lastName = :lastName,
+                                            birthDate = :birthDate,
+                                            email = :email,
+                                            phone = :phone
+                                        WHERE
+                                            id = :idPerson");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':firstName' => $firstName, ':middleName' => $middleName, ':lastName' => $lastName,
+                ':birthDate' => $birthDate, ':email' => $email, ':phone' => $phone, ':idPerson' => $idPerson));
+            $this->pdo->commit();
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+        }
+    }
+
+    /**
+     * @param $idEmployee integer
+     * @param $code string
+     * @param $idEmployeeType integer
+     * @param $contractType string
+     */
+    function updateEmployee($idEmployee, $code, $idEmployeeType, $contractType){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+        $this->asserts->isNotEmpty($code, "The code can't be empty.");
+        $this->asserts->higherThanZero($idEmployeeType, "idEmployeeType must be higher than 0");
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
+
+        try {
+            $stmt = $this->pdo->prepare("UPDATE employees 
+                                        SET 
+                                            idEmployeeType = :idEmployeeType,
+                                            code = :code,
+                                            contractType = :contractType
+                                        WHERE
+                                            id = :idEmployee");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':idEmployeeType' => $idEmployeeType, ':code' => $code, ':contractType' => $contractType,
+                ':idEmployee' => $idEmployee));
+            $this->pdo->commit();
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+        }
+    }
+
+    /**
+     * @param $requestData object
+     * @return array
+     */
+    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.");
+
+        $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.");
+        $this->asserts->betweenLength($firstName, 1, 50, "The first name must have a length between 1 and 50 characters.");
+
+        $middleName = $requestData['middleName'];
+        $this->asserts->isNotEmpty($middleName, "The middle name can't be empty.");
+        $this->asserts->isString($middleName, "The middle name must be a string.");
+        $this->asserts->betweenLength($middleName, 1, 50, "The middle name must have a length between 1 and 50 characters.");
+
+        $lastName = isset($requestData['lastName']) ? $requestData['lastName'] : null;
+
+        $birthDate = $requestData['birthDate'];
+        $this->asserts->isNotEmpty($birthDate, "The birth date can't be empty.");
+
+        $email = $requestData['email'];
+        $this->asserts->isNotEmpty($email, "The email can't be empty.");
+        $this->asserts->betweenLength($email, 1, 100, "The middle name must have a length between 1 and 100 characters.");
+
+        $phone = $requestData['phone'];
+        $this->asserts->isNotEmpty($phone, "The phone number can't be empty.");
+        $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 0");
+
+        $contractType = $requestData{'contractType'};
+        $this->asserts->isNotEmpty($contractType, "The contract type can't be empty.");
+
+        // Encrypting the sensitive data
+        $securedFirstName = $this->cryptographyService->encryptString($firstName);
+        $securedMiddleName = $this->cryptographyService->encryptString($middleName);
+
+        if (isset($lastName)) {
+            $securedLastName = $this->cryptographyService->encryptString($lastName);
+        } else {
+            $securedLastName = null;
+        }
+
+        $securedEmail = $this->cryptographyService->encryptString($email);
+
+        // Update process
+        $this->updatePerson($idPerson, $securedFirstName, $securedMiddleName, $securedLastName,
+            $birthDate, $securedEmail, $phone);
+
+        $this->updateEmployee($idEmployee, $code, $idEmployeeType, $contractType);
+
+        $response = array(
+            "fullName" => "$firstName $middleName $lastName",
+            "idEmployee" => $idEmployee,
+            "email" => $email,
+            "phone" => $phone,
+            "birthDate" => $birthDate,
+            "idEmployeeType" => $idEmployeeType,
+            "contractType" => $contractType
+        );
+
+        return $response;
+    }
+
+    function disableEmployeeRecord($idEmployee){
+        $this->asserts->higherThanZero($idEmployee, "idEmployee must be higher than 0");
+
+        try {
+            $stmt = $this->pdo->prepare("UPDATE employees 
+                                        SET 
+                                            status = 'INACTIVE'
+                                        WHERE
+                                            id = :idEmployee");
+            $this->pdo->beginTransaction();
+            $stmt->execute(array(':idEmployee' => $idEmployee));
+            $this->pdo->commit();
+
+            $stmt = null;
+        } catch( PDOExecption $e ) {
+            $this->pdo->rollback();
+        }
+    }
+
+    /**
+     * Intended for internal use
+     *
+     * This method will bring a list of ids of all the employees that are
+     * currently active in the system
+     *
+     * @return array
+     */
+    function getIdEmployeeFromAllActiveEmployees(){
+        $stmt = $this->pdo->prepare("SELECT 
+                                        id
+                                    FROM
+                                        employees
+                                    WHERE
+                                        status = 'ACTIVE';");
+        $stmt->execute();
+
+        $results = $stmt->fetchAll();
+
+        if(!$results){
+            exit($this->databaseSelectQueryErrorMessage);
+        }
+        $stmt = null;
+
+        return $results;
+    }
+
+    /**
+     * @return array
+     */
+    function listAllActiveEmployees(){
+        $ids = $this->getIdEmployeeFromAllActiveEmployees();
+
+        $result = array();
+
+        foreach($ids as $row){
+            $result[] = $this->proxyGetEmployeeDataById($row['id']);
+        }
+
+        return $result;
    }
 }
 ?>
--- a/api-payroll/src/application/SessionApplication.php
+++ b/api-payroll/src/application/SessionApplication.php
@@ -41,15 +41,18 @@ class SessionApplication{
    /**
     * @param $userName string
     * @return mixed
+     * @throws Exception
     */
    function getPassword($userName){
-        $this->asserts->userName($userName);
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");

        $stmt = $this->pdo->prepare("SELECT password FROM users WHERE name = :userName");
        $stmt->execute(array(':userName' => $userName));
        $results = $stmt->fetchAll();
        if(!$results){
-            exit($this->databaseSelectQueryErrorMessage);
+            throw new Exception('The user or password didnt match, please try again.');
        }
        $stmt = null;
        return $results[0]['password'];
@@ -62,14 +65,18 @@ class SessionApplication{
     * @throws Exception
     */
    function newSession($userName, $password){
-        $this->asserts->userName($userName);
-        $this->asserts->password($password);
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");
+        $this->asserts->isNotEmpty($password, "The password can't be empty");
+        $this->asserts->isString($password, "The password must be a string.");
+        $this->asserts->betweenLength($password, 1, 50, "The password must have a length between 1 and 50 characters.");

        $storedPassword = $this->getPassword($userName);

        // If the credentials don't match anything in the the records
        if(!isset($storedPassword)){
-            throw new Exception('The user or password didnt match, please try again.');
+            return false;
        }

        // Already has a session
@@ -82,17 +89,40 @@ class SessionApplication{
            return true;
        }
        else{
-            return false;
+            throw new Exception('The user or password didnt match, please try again.');
        }
    }

    /**
-     * @return string
+     * @param $userName
+     * @param $password
+     * @return array
+     * @throws Exception
+     */
+    function login($userName, $password){
+        $this->asserts->isNotEmpty($userName, "The username can't be empty");
+        $this->asserts->isString($userName, "The username must be a string.");
+        $this->asserts->betweenLength($userName, 1, 50, "The username must have a length between 1 and 50 characters.");
+        $this->asserts->isNotEmpty($password, "The password can't be empty");
+        $this->asserts->isString($password, "The password must be a string.");
+        $this->asserts->betweenLength($password, 1, 50, "The password must have a length between 1 and 50 characters.");
+
+
+        if($this->newSession($userName, $password)){
+            return array('status' => 'success', 'message' => 'Logged in successfully.');
+        }
+        else{
+            throw new Exception('The user or password didnt match, please try again.');
+        }
+    }
+
+    /**
+     * @return array
     */
    function destroySession(){
        session_destroy();

-        return "Sucessfully logged out.";
+        return array('status' => 'success', 'message' => 'Successfully logged out.');
    }
 }
 ?>
--- a/api-payroll/src/dependencies.php
+++ b/api-payroll/src/dependencies.php
@@ -24,6 +24,7 @@ $container['mysql'] = function ($c) {

    // The database parameters
    $host = $mysqlSettings['host'];
+    $port = $mysqlSettings['port'];
    $database = $mysqlSettings['database'];
    $user = $mysqlSettings['user'];
    $password = $mysqlSettings['password'];
@@ -34,7 +35,7 @@ $container['mysql'] = function ($c) {
    $databaseConnectionErrorMessage = $mysqlSettings['databaseConnectionErrorMessage'];

    // Initiate the connection
-    $dsn = "mysql:host=$host;dbname=$database;charset=$charset";
+    $dsn = "mysql:host=$host;port=$port;dbname=$database;charset=$charset";
    try {
        $pdo = new PDO($dsn, $user, $password, $pdoConnectionOptions);
    } catch (Exception $e) {
@@ -69,4 +70,4 @@ $container['employeeApplication'] = function ($c) {
    $employeeApplication = new App\Application\EmployeeApplication($employeeSettings,
        $c['mysql'], $c['cryptographyService'], $c['asserts']);
    return $employeeApplication;
-};
+};
--- a/api-payroll/src/routes.php
+++ b/api-payroll/src/routes.php
@@ -22,14 +22,14 @@ $app->get('/api/session', function (Request $request, Response $response, array
 $app->post('/api/session/login', function ($request, $response) {
    $requestData = $request->getParsedBody();

-    $data = $this->sessionApplication->newSession($requestData['userName'], $requestData['password']);
+    $data = $this->sessionApplication->login($requestData['userName'], $requestData['password']);

    return $response->withStatus(200)
        ->withHeader('Content-Type', 'application/json')
        ->write(json_encode($data));
 });

-$app->post('/api/session/logout', function (Request $request, Response $response, array $args) {
+$app->get('/api/session/logout', function (Request $request, Response $response, array $args) {
    return $response->withStatus(200)
        ->withHeader('Content-Type', 'application/json')
        ->write(json_encode($this->sessionApplication->destroySession()));
@@ -41,6 +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) {
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->listAllActiveEmployees()));
+});
+
 $app->post('/api/employee', function ($request, $response) {
    $requestData = $request->getParsedBody();

@@ -49,6 +55,22 @@ $app->post('/api/employee', function ($request, $response) {
        ->write(json_encode($this->employeeApplication->saveNewEmployee($requestData)));
 });

+$app->put('/api/employee', function ($request, $response) {
+    $requestData = $request->getParsedBody();
+
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->updateEmployeeData($requestData)));
+});
+
+$app->DELETE('/api/employee/{idEmployee}', function (Request $request, Response $response, array $args) {
+    $idEmployee = $args['idEmployee'];
+
+    return $response->withStatus(200)
+        ->withHeader('Content-Type', 'application/json')
+        ->write(json_encode($this->employeeApplication->disableEmployeeRecord($idEmployee)));
+});
+
 $app->get('/api/employee/type/{code}', function (Request $request, Response $response, array $args) {
    $code = $args['code'];

@@ -57,10 +79,18 @@ $app->get('/api/employee/type/{code}', function (Request $request, Response $res
        ->write(json_encode($this->employeeApplication->getIdEmployeeTypeByCode($code)));
 });

-$app->get('/api/employee/{idEmployee}', function (Request $request, Response $response, array $args) {
+$app->get('/api/employee/id/{idEmployee}', function (Request $request, Response $response, array $args) {
    $idEmployee = $args['idEmployee'];

    return $response->withStatus(200)
        ->withHeader('Content-Type', 'application/json')
        ->write(json_encode($this->employeeApplication->proxyGetEmployeeDataById($idEmployee)));
+});
+
+$app->get('/api/employee/code/{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->getEmployeeDataByCode($code)));
 });
--- a/api-payroll/src/service/Asserts.php
+++ b/api-payroll/src/service/Asserts.php
@@ -6,78 +6,54 @@ use Respect\Validation\Validator as v;

 class Asserts{
    /**
-     * @param $string
+     * @param $string string
+     * @param $errorMessage string
     * @throws Exception
     */
-    function userName($string){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 50)->validate($string);
+    function isString($string, $errorMessage){
+        $validation = v::stringType()->validate($string);

-        if(!$validateFirstName){
-            throw new Exception('The user name must be a string between 1 and 50 characters');
+        if(!$validation){
+            throw new Exception($errorMessage);
        }
    }

    /**
-     * @param $string
+     * @param $string string
+     * @param $errorMessage string
     * @throws Exception
     */
-    function password($string){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 50)->validate($string);
+    function isNotEmpty($string, $errorMessage){
+        $validation = v::notEmpty()->validate($string);

-        if(!$validateFirstName){
-            throw new Exception('The password must be a string between 1 and 50 characters');
+        if(!$validation){
+            throw new Exception($errorMessage);
        }
    }

    /**
-     * @param $string
+     * @param $string string
+     * @param $min integer
+     * @param $max integer
+     * @param $errorMessage string
     * @throws Exception
     */
-    function firstName($string){
-        $validateFirstName = v::stringType()->notEmpty()->length(1, 100)->validate($string);
+    function betweenLength($string, $min, $max, $errorMessage){
+        $validation = v::length($min, $max)->validate($string);

-        if(!$validateFirstName){
-            throw new Exception('The first name must be a string between 1 and 100 characters');
+        if(!$validation){
+            throw new Exception($errorMessage);
        }
    }

    /**
-     * @param $string
+     * @param $number integer
+     * @param $errorMessage string
     * @throws Exception
     */
-    function middleName($string){
-        if(!v::stringType()->notEmpty()->length(1, 100)->validate($string)){
-            throw new Exception('The middle name must be a string between 1 and 100 characters');
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function birthDate($string){
-        if(!v::date('Y-m-d')->notEmpty()->validate($string)){
-            throw new Exception('The birth date must be in the yyyy-mm-dd format');
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function email($string){
-        if(!v::stringType()->notEmpty()->length(1, 100)->validate($string)){
-            throw new Exception('The email must be a string between 1 and 100 characters');
-        }
-    }
-
-    /**
-     * @param $string
-     * @throws Exception
-     */
-    function phone($string){
-        if(!v::digit()->notEmpty()->length(10, 10)->validate($string)){
-            throw new Exception('The phone must be a numeric value of 10 digits');
+    function higherThanZero($number, $errorMessage){
+        if($number <= 0){
+            throw new Exception($errorMessage);
        }
    }
 }
--- a/api-payroll/src/settings.php
+++ b/api-payroll/src/settings.php
@@ -26,7 +26,8 @@ return [

        // Datanase settings
        'mysql' => [
-            'host' => 'localhost',
+            'host' => 'mysql',
+            'port' => '3307',
            'database' => 'payroll',
            'user' => 'root',
            'password' => '12345678',
@@ -43,7 +44,7 @@ return [

        // Employee settings
        'employee' => [
-            'codeLength' => '5',
+            'codeLength' => '3',
        ],
    ],
 ];
--- a/database/.dockerignore
+++ b/database/.dockerignore
@@ -0,0 +1 @@
+Dockerfile
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -0,0 +1,7 @@
+FROM mysql:5.7
+
+# Starting scripts
+ADD . /docker-entrypoint-initdb.d
+
+# Config
+ADD my.cnf /etc/mysql
--- a/database/my.cnf
+++ b/database/my.cnf
@@ -0,0 +1,20 @@
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+[mysqld]
+port = 3307
+
+!includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/mysql.conf.d/
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '3'
+services:
+  api:
+    container_name: payroll_api
+    build: api-payroll/
+    ports:
+     - "8085:80"
+    volumes:
+      - ./volumes/apache-logs:/var/log/apache2
+    depends_on:
+      - mysql
+  mysql:
+    container_name: payroll_mysql
+    restart: always
+    build: database
+    expose:
+      - "3307"
+    ports:
+     - "3307:3307"
+    volumes:
+      - ./volumes/mysql-data:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: '12345678'
+      MYSQL_USER: 'sloth'
+      MYSQL_PASS: '12345678'
+volumes:
+  mysql-data:
+  apache-logs:
--- a/volumes/.gitignore
+++ b/volumes/.gitignore
@@ -0,0 +1,2 @@
+mysql-data/
+apache-logs/
--- a/volumes/README.md
+++ b/volumes/README.md
@@ -0,0 +1 @@
+# Do not delete this directory, it'll contain the volumes created by the containers
Author	SHA1	Message	Date
Jose Pabl Domingo Aramburo Sanchez	b829f09330	[fix] Reference to view body	2018-08-12 11:36:17 -06:00
Jose Pabl Domingo Aramburo Sanchez	b03d152f11	[add] Loading views	2018-08-12 11:32:48 -06:00
Jose Pabl Domingo Aramburo Sanchez	0ec20a4c67	[add] Logout uses generic error messages Refactored some messages from the generic modals	2018-08-12 10:39:44 -06:00
Jose Pablo Domingo Aramburo Sanchez	1605b1cea3	Merge pull request #17 from PootisPenserHere/interactionBetweenLoginAndPanel Interaction between login and panel	2018-08-12 10:08:54 -06:00
Jose Pabl Domingo Aramburo Sanchez	d4fadf08bc	[add] Logout Also made general fixes to the css	2018-08-12 10:03:25 -06:00
Jose Pabl Domingo Aramburo Sanchez	de84da4482	[add] Mapping enter key	2018-08-12 09:13:00 -06:00
Jose Pabl Domingo Aramburo Sanchez	697d0fe769	[mod] getBaseUrl moved to its own file	2018-08-12 09:07:48 -06:00
Jose Pabl Domingo Aramburo Sanchez	cb5d30b4e0	[add] Verifying session	2018-08-12 08:51:22 -06:00
Jose Pablo Domingo Aramburo Sanchez	6c91cad46c	Merge pull request #16 from PootisPenserHere/qualityChangesToDocker Quality changes to docker	2018-08-11 20:07:07 -06:00
Jose Pablo Domingo Aramburo Sanchez	ccd9e10351	Merge pull request #15 from PootisPenserHere/landingPage Landing page	2018-08-11 20:06:13 -06:00
Jose Pabl Domingo Aramburo Sanchez	30f755c0b2	[fix] Misleading error when login	2018-08-11 20:03:28 -06:00
Jose Pabl Domingo Aramburo Sanchez	231e7fe2e6	[add] Access config	2018-08-12 01:43:37 +00:00
Jose Pabl Domingo Aramburo Sanchez	f820a22a4f	[add] Volumes directory	2018-08-12 01:25:11 +00:00
Jose Pabl Domingo Aramburo Sanchez	0cdfd21fa2	[mod] Config files moved to a directory	2018-08-12 01:06:40 +00:00
Jose Pabl Domingo Aramburo Sanchez	fee3db486f	[add] Composer decoupled from prod build	2018-08-12 00:58:12 +00:00
Jose Pabl Domingo Aramburo Sanchez	87181696e1	[add] Looks of the dockerfile	2018-08-12 00:49:03 +00:00
Jose Pabl Domingo Aramburo Sanchez	8b22c0db9c	[add] Composer compileed in multi stagre	2018-08-12 00:38:39 +00:00
Jose Pabl Domingo Aramburo Sanchez	7feb3a6f5d	[add] Landing page skeleton	2018-08-10 01:31:25 -06:00
Jose Pabl Domingo Aramburo Sanchez	18ee0ad333	[add] Downloading composer dependencies	2018-08-10 06:53:13 +00:00
Jose Pablo Domingo Aramburo Sanchez	e5d90bc32d	Merge pull request #14 from PootisPenserHere/genericAsserts Generic asserts	2018-08-09 23:29:58 -06:00
Jose Pabl Domingo Aramburo Sanchez	1500aef977	[add] Higher than zero asserting	2018-08-09 23:26:25 -06:00
Jose Pabl Domingo Aramburo Sanchez	112f78c1de	[del] Old asserts	2018-08-09 22:48:42 -06:00
Jose Pabl Domingo Aramburo Sanchez	08702b2cdf	[add] Generic assers in employee application	2018-08-09 22:47:19 -06:00
Jose Pabl Domingo Aramburo Sanchez	21013cf6ac	[add] Generic asserts with custom errors	2018-08-09 21:55:39 -06:00
Jose Pabl Domingo Aramburo Sanchez	4928481f72	[add] Empty log file with permisions	2018-08-10 03:51:17 +00:00
Jose Pablo Domingo Aramburo Sanchez	2d11218076	[fix] php volume	2018-08-09 13:42:13 -06:00
Jose Pablo Domingo Aramburo Sanchez	59a4d6e4a5	Merge pull request #13 from PootisPenserHere/loginFront Login front	2018-08-09 02:35:11 -06:00
Jose Pabl Domingo Aramburo Sanchez	7cf083a612	[add] Simple redirect	2018-08-09 02:33:21 -06:00
Jose Pabl Domingo Aramburo Sanchez	d4135188bd	[add] Local bootstrap libraries	2018-08-09 02:30:39 -06:00
Jose Pabl Domingo Aramburo Sanchez	6d29ac3f23	[add] Error handling in the login	2018-08-09 02:26:16 -06:00
Jose Pabl Domingo Aramburo Sanchez	0449f202ef	[add] Added wrapper for login method Also changed the logout endpoint to get	2018-08-09 01:35:44 -06:00
Jose Pabl Domingo Aramburo Sanchez	23868b60ee	[add] Login functionality	2018-08-09 01:28:36 -06:00
Jose Pablo Domingo Aramburo Sanchez	8a2d5b2afa	Merge pull request #12 from PootisPenserHere/fixEmployeeTypesReturnsIdAsInt [mod] Returning id as int	2018-08-08 23:07:37 -06:00
Jose Pabl Domingo Aramburo Sanchez	7ceb2aad93	[mod] Returning id as int	2018-08-08 23:06:38 -06:00
Jose Pablo Domingo Aramburo Sanchez	3902435690	Merge pull request #11 from PootisPenserHere/adaptingMysqlForOtherPort Adapting mysql for other port	2018-08-08 21:35:55 -06:00
Jose Pabl Domingo Aramburo Sanchez	f16e9fe72c	[add] Parametrizing	2018-08-08 16:15:45 -06:00
Jose Pabl Domingo Aramburo Sanchez	d2b9163537	[add] Configuring the mysql port	2018-08-08 15:58:55 -06:00
Jose Pablo Domingo Aramburo Sanchez	403541580d	Merge pull request #10 from PootisPenserHere/dockerizing Dockerizing	2018-08-08 01:46:39 -06:00
Jose Pabl Domingo Aramburo Sanchez	663ea7cc3e	[add] Testing the docker build in CI	2018-08-08 07:41:29 +00:00
Jose Pabl Domingo Aramburo Sanchez	f93b41f14e	[add] Index protection	2018-08-08 07:37:27 +00:00
Jose Pabl Domingo Aramburo Sanchez	24f1ce1ed7	[add] Docker ignore for php	2018-08-08 07:32:54 +00:00
Jose Pabl Domingo Aramburo Sanchez	b25346e3d5	[add] Database initiated along with container	2018-08-08 07:14:22 +00:00
Jose Pabl Domingo Aramburo Sanchez	f2237d9209	[add] Connecting to mysql from pdo	2018-08-08 05:24:02 +00:00
Jose Pablo Domingo Aramburo Sanchez	7fc9ca8c75	[add] Mysql container	2018-08-07 19:25:20 -06:00
Jose Pablo Domingo Aramburo Sanchez	97fca1d7d3	[add] Docker compose	2018-08-07 17:33:21 -06:00
Jose Pablo Domingo Aramburo Sanchez	058e19a49a	[add] Apache conf for the docker container	2018-08-07 17:32:32 -06:00
Jose Pablo Domingo Aramburo Sanchez	bffeb6e9f4	[add] Dockerfile	2018-08-07 17:31:02 -06:00
Jose Pablo Domingo Aramburo Sanchez	9a3e876afe	Merge pull request #9 from PootisPenserHere/employeeDataByCode [add] Emṕloyee data by code	2018-08-06 15:22:05 -06:00
Jose Pabl Domingo Aramburo Sanchez	dadea504d0	[add] Emṕloyee data by code	2018-08-06 15:17:31 -06:00
Jose Pablo Domingo Aramburo Sanchez	1390427ec0	Merge pull request #8 from PootisPenserHere/listAllEmployees [add] List of all active employees	2018-08-06 03:51:09 -06:00
Jose Pabl Domingo Aramburo Sanchez	6c4e42e337	[add] List of all active employees	2018-08-06 03:49:42 -06:00
Jose Pablo Domingo Aramburo Sanchez	f4d1ce1ab7	Merge pull request #7 from PootisPenserHere/updatingEmployeeData Updating employee data	2018-08-06 03:35:09 -06:00
Jose Pabl Domingo Aramburo Sanchez	ba307555f0	[add] Delete employee	2018-08-06 03:33:18 -06:00
Jose Pabl Domingo Aramburo Sanchez	57ee1fbd72	[add] Updating the employee table	2018-08-06 03:27:22 -06:00
Jose Pabl Domingo Aramburo Sanchez	63a7186464	[add] Update to the person table	2018-08-06 03:15:28 -06:00
Jose Pablo Domingo Aramburo Sanchez	4a8df33184	Merge pull request #6 from PootisPenserHere/dataFromEmployee Data from employee	2018-08-06 02:18:25 -06:00
				`@@ -0,0 +1 @@`
				`# Do not delete this directory, it'll contain the volumes created by the containers`