Compare commits
No commits in common. "master" and "genericAsserts" have entirely different histories.
master
...
genericAss
71
README.rst
71
README.rst
@ -1,71 +0,0 @@
|
||||
=================
|
||||
Payroll manager
|
||||
=================
|
||||
|
||||
|codebuild|
|
||||
|
||||
This is a simple system to keep a record of employees where they will perform different tasks within the company and will be paid accordingly in a monthly bases.
|
||||
|
||||
.. contents::
|
||||
|
||||
Getting started
|
||||
-----------------
|
||||
|
||||
The system requires the following:
|
||||
- Ubuntu 16.04
|
||||
- php 7.0
|
||||
- composer
|
||||
- docker
|
||||
- docker-compose
|
||||
- mysql 5.7
|
||||
|
||||
Installation
|
||||
-----------------
|
||||
|
||||
Alternatively to installing all the packages and configuring the server it's possible to start up an instance of the system with docker-compose
|
||||
|
||||
To install docker
|
||||
.. code-block:: bash
|
||||
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
|
||||
|
||||
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
|
||||
|
||||
sudo apt-get update
|
||||
|
||||
apt-cache policy docker-ce
|
||||
|
||||
sudo apt-get install -y docker-ce
|
||||
|
||||
To install docker compose
|
||||
.. code-block:: bash
|
||||
sudo curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
|
||||
|
||||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
|
||||
And finally the containers can be initialized by running
|
||||
.. code-block:: bash
|
||||
sudo docker-compose up --build -d
|
||||
|
||||
Sign in
|
||||
-----------------
|
||||
|
||||
The login page can be accessed at **http://localhost:8085/public/html/login.php**
|
||||
|
||||
To access the platform the user is **sloth** and the pasword **slothness**
|
||||
|
||||
Further reading
|
||||
-----------------
|
||||
To further read about the api and it's front-end
|
||||
`api-payroll <https://github.com/PootisPenserHere/payroll_manager/blob/master/api-payroll/README.rst>`_
|
||||
|
||||
More about the database `database <https://github.com/PootisPenserHere/payroll_manager/blob/master/database/README.rst>`_
|
||||
|
||||
|
||||
Data volumes
|
||||
-----------------
|
||||
Since the application is designed to run within containers a number of volumes has been created to persist the data, they can be found in the volumes directory on the root of the project
|
||||
|
||||
.. |codebuild| image:: https://s3.amazonaws.com/codefactory-us-east-1-prod-default-build-badges/passing.svg
|
||||
:target: https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiWm42eW80VzA2OXRTc2xIMXErZ1hlS1RpNnFCaDVMWENqSSsyU2x3dUpReEpCRUtaZGRmbklYaFN0anVEWW9NaGYvQ21PNk9tR25rZGtZMjNvR1ArbGdVPSIsIml2UGFyYW1ldGVyU3BlYyI6IjVXYjl3TWZnUVQ1MFZDQ0kiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master
|
||||
:alt: Build status of the master branch on amazon codebuild
|
||||
@ -1,2 +1 @@
|
||||
Options -Indexes
|
||||
Deny from all
|
||||
|
||||
@ -1,29 +1,10 @@
|
||||
# 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
|
||||
|
||||
# Updating
|
||||
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
|
||||
# Installing php, apache and supplementary software
|
||||
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 php7.0-zip curl git unzip composer
|
||||
|
||||
# Enable apache mods
|
||||
RUN a2enmod php7.0
|
||||
@ -39,14 +20,24 @@ ENV APACHE_RUN_GROUP www-data
|
||||
ENV APACHE_LOG_DIR /var/log/apache2
|
||||
ENV APACHE_LOCK_DIR /var/lock/apache2
|
||||
|
||||
# Expose apache
|
||||
EXPOSE 80
|
||||
|
||||
# Copy this repo into place.
|
||||
ADD . /var/www/site
|
||||
WORKDIR /var/www/site
|
||||
COPY --from=build-deps /root .
|
||||
|
||||
RUN touch logs/app.log
|
||||
RUN chmod 777 logs/app.log
|
||||
# Testing permisions
|
||||
RUN chmod 777 -R .
|
||||
|
||||
# Update the default apache site
|
||||
ADD docker/apache-config.conf /etc/apache2/sites-enabled/000-default.conf
|
||||
# Installing dependencies
|
||||
RUN composer install
|
||||
|
||||
# By default start up apache in the foreground
|
||||
# Unit tests
|
||||
RUN composer test
|
||||
|
||||
# Update the default apache site with the config we created.
|
||||
ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
|
||||
|
||||
# By default start up apache in the foreground, override with /bin/bash for interative
|
||||
CMD /usr/sbin/apache2ctl -D FOREGROUND
|
||||
|
||||
27
api-payroll/README.md
Normal file
27
api-payroll/README.md
Normal file
@ -0,0 +1,27 @@
|
||||
# Slim Framework 3 Skeleton Application
|
||||
|
||||
Use this skeleton application to quickly setup and start working on a new Slim Framework 3 application. This application uses the latest Slim 3 with the PHP-View template renderer. It also uses the Monolog logger.
|
||||
|
||||
This skeleton application was built for Composer. This makes setting up a new Slim Framework application quick and easy.
|
||||
|
||||
## Install the Application
|
||||
|
||||
Run this command from the directory in which you want to install your new Slim Framework application.
|
||||
|
||||
php composer.phar create-project slim/slim-skeleton [my-app-name]
|
||||
|
||||
Replace `[my-app-name]` with the desired directory name for your new application. You'll want to:
|
||||
|
||||
* Point your virtual host document root to your new application's `public/` directory.
|
||||
* Ensure `logs/` is web writeable.
|
||||
|
||||
To run the application in development, you can run these commands
|
||||
|
||||
cd [my-app-name]
|
||||
php composer.phar start
|
||||
|
||||
Run this command in the application directory to run the test suite
|
||||
|
||||
php composer.phar test
|
||||
|
||||
That's it! Now go build something cool.
|
||||
@ -1,34 +0,0 @@
|
||||
=======
|
||||
The api
|
||||
=======
|
||||
|
||||
.. contents::
|
||||
|
||||
About
|
||||
-------
|
||||
The project has been built with slim in the backed and jquery with bootstrap for the front, both of them share the public folder from which they can be accessed by the general public.
|
||||
|
||||
Auth
|
||||
------
|
||||
The system uses cookie based sessions which are handled by a midleware, have a time to live of 10 minutes and are refreshed each time a new request is made to the api, further more the contents of the session itself has been secured with openssl.
|
||||
|
||||
Database
|
||||
---------
|
||||
To connect to the database pdo is used, its configuration can be found at **src/settings.php** under the mysql section. The following settings are set as default:
|
||||
- **PDO::ATTR_EMULATE_PREPARES** Has been set to true in order to lower the strain on the database by processing the prepare statements on the server side, if cache performance is desired this option should be changed to false
|
||||
- **PDO::ATTR_ERRMODE** Uses **PDO::ERRMODE_EXCEPTION** which will return all mysql errors as exceptions to prevent further execution of the software
|
||||
- **PDO::ATTR_DEFAULT_FETCH_MODE** uses **PDO::FETCH_ASSOC** and as such the query ouput system wide is expected as an associative array
|
||||
|
||||
Data protection
|
||||
----------------
|
||||
| Encryption has been applied to sensitive data, passwords are protected with with bcrypt and it's configuration can be found in the settings.php file, by default a cost of 12 is used for the hashing as well as a 16 characters randomly generated string (128 bits) as an iv.
|
||||
|
||||
| For data that needs to be both read and written such as names AES in mode cbc with 256 block size has been used.
|
||||
|
||||
| The reason to have choosen AES is the desire to make the process of securing the data both secure and affordable since many hardware manufacturers already have architectures designed to improce the speed of AES.
|
||||
|
||||
| **Important note**: While in this project the encryption password has been saved into the settings.php file it's adviced that in a real use case it's stored more securely or else where entirely such as a key management service.
|
||||
|
||||
Error handling
|
||||
---------------
|
||||
Should an exception be encountered it'll be caught by a middleware that will form a new response body, returning it with a 500 http code and a json object containing the keys status set to error as well as a message key that will contain the exception that was raised.
|
||||
@ -17,8 +17,7 @@
|
||||
"slim/php-view": "^2.0",
|
||||
"monolog/monolog": "^1.17",
|
||||
"respect/validation": "^1.1",
|
||||
"tuupola/cors-middleware": "^0.5.2",
|
||||
"adbario/slim-secure-session-middleware": "^1.3"
|
||||
"tuupola/cors-middleware": "^0.5.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": ">=4.8 < 6.0"
|
||||
|
||||
140
api-payroll/composer.lock
generated
140
api-payroll/composer.lock
generated
@ -4,96 +4,9 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "19bc193d641803843178e87bf0465afe",
|
||||
"content-hash": "9eb8d110ad374a60767f92d76018504a",
|
||||
"hash": "93a9656f4e6eb0e25be1bad59ac6f487",
|
||||
"content-hash": "a3fc18885cc45d2733b77fa2081bdc72",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adbario/php-dot-notation",
|
||||
"version": "1.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/adbario/php-dot-notation.git",
|
||||
"reference": "5e4b1fe29a8ae1140e370d520ed8b85dd5130a1f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/adbario/php-dot-notation/zipball/5e4b1fe29a8ae1140e370d520ed8b85dd5130a1f",
|
||||
"reference": "5e4b1fe29a8ae1140e370d520ed8b85dd5130a1f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.4"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Adbar\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Riku Särkinen",
|
||||
"email": "riku@adbar.io"
|
||||
}
|
||||
],
|
||||
"description": "PHP dot notation array access",
|
||||
"homepage": "https://github.com/adbario/php-dot-notation",
|
||||
"keywords": [
|
||||
"ArrayAccess",
|
||||
"dotnotation",
|
||||
"php"
|
||||
],
|
||||
"time": "2017-03-26 17:44:47"
|
||||
},
|
||||
{
|
||||
"name": "adbario/slim-secure-session-middleware",
|
||||
"version": "1.3.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/adbario/slim-secure-session-middleware.git",
|
||||
"reference": "f107191506b2c362f06f201f998891f315d6aaec"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/adbario/slim-secure-session-middleware/zipball/f107191506b2c362f06f201f998891f315d6aaec",
|
||||
"reference": "f107191506b2c362f06f201f998891f315d6aaec",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"adbario/php-dot-notation": "~1.2.0",
|
||||
"paragonie/random_compat": "^2.0",
|
||||
"php": ">=5.5",
|
||||
"slim/slim": "~3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Adbar\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Riku Särkinen",
|
||||
"email": "riku@adbar.io"
|
||||
}
|
||||
],
|
||||
"description": "Secure session middleware for Slim 3 framework",
|
||||
"homepage": "https://github.com/adbario/slim-secure-session-middleware",
|
||||
"keywords": [
|
||||
"middleware",
|
||||
"session",
|
||||
"slim"
|
||||
],
|
||||
"time": "2017-08-04 13:51:00"
|
||||
},
|
||||
{
|
||||
"name": "container-interop/container-interop",
|
||||
"version": "1.2.0",
|
||||
@ -304,55 +217,6 @@
|
||||
],
|
||||
"time": "2018-02-13 20:26:39"
|
||||
},
|
||||
{
|
||||
"name": "paragonie/random_compat",
|
||||
"version": "v2.0.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/random_compat.git",
|
||||
"reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
|
||||
"reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "4.*|5.*"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
"lib/random.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Paragon Initiative Enterprises",
|
||||
"email": "security@paragonie.com",
|
||||
"homepage": "https://paragonie.com"
|
||||
}
|
||||
],
|
||||
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
|
||||
"keywords": [
|
||||
"csprng",
|
||||
"polyfill",
|
||||
"pseudorandom",
|
||||
"random"
|
||||
],
|
||||
"time": "2018-07-04 16:31:37"
|
||||
},
|
||||
{
|
||||
"name": "pimple/pimple",
|
||||
"version": "v3.2.3",
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
allow from all
|
||||
|
||||
<IfModule mod_rewrite.c>
|
||||
RewriteEngine On
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,243 +0,0 @@
|
||||
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;
|
||||
}
|
||||
|
||||
.modalHeaderError{
|
||||
background-color: #d9534f;
|
||||
}
|
||||
|
||||
|
||||
.modalHeaderSuccess{
|
||||
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;
|
||||
}
|
||||
@ -18,7 +18,7 @@ body {
|
||||
padding: 20px;
|
||||
background: #fff;
|
||||
border-radius: 5px;
|
||||
border-top: 5px solid #5bc0de;
|
||||
border-top: 5px solid #bdb035;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.login-block h1 {
|
||||
@ -58,15 +58,15 @@ body {
|
||||
background-size: 16px 80px;
|
||||
}
|
||||
.login-block input:active, .login-block input:focus {
|
||||
border: 1px solid #5bc0de;
|
||||
border: 1px solid #bdb035;
|
||||
}
|
||||
.login-block #loginButon {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
background: #009bad;
|
||||
background: #bdb035;
|
||||
box-sizing: border-box;
|
||||
border-radius: 5px;
|
||||
border: 1px solid #000;
|
||||
border: 1px solid #6d661c;
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
text-transform: uppercase;
|
||||
@ -75,7 +75,7 @@ body {
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#modalLoginErrorHeader{
|
||||
background-color: #d9534f;
|
||||
}
|
||||
.login-block button:hover {
|
||||
background: #c7b935;
|
||||
border: 1px solid #6d661c;
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,113 +0,0 @@
|
||||
<script src="../js/getBaseUrl.js"></script>
|
||||
<script src="../js/editEmployee.js"></script>
|
||||
|
||||
<form class="form-horizontal" id="editEmployee">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Edit employee</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmploySearch">Employee</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmploySearch" name="editEmploySearch" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeFirstName">First name</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeFirstName" name="editEmployeeFirstName" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeMiddleName">Middle name</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeMiddleName" name="editEmployeeMiddleName" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeLastName">Last name</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeLastName" name="editEmployeeLastName" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeBirthDate">Birth date</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeBirthDate" name="editEmployeeBirthDate" type="text" class="form-control input-md datepicker">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" id="hidenEmployeeCode">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeCode">Code</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeCode" name="editEmployeeCode" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeEmail">Email</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeeEmail" name="editEmployeeEmail" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeePhone">Phone</label>
|
||||
<div class="col-md-5">
|
||||
<input id="editEmployeePhone" name="editEmployeePhone" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeType">Rol</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="editEmployeeType" id="editEmployeeType">
|
||||
<option>Employee type</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="editEmployeeContractType">Contract type</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="editEmployeeContractType" id="editEmployeeContractType">
|
||||
<option>Contract type</option>
|
||||
<option value="INTERNO">interno</option>
|
||||
<option value="EXTERNO">Externo</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-md-offset-6">
|
||||
<div class="form-group">
|
||||
<a href="#" class="btn btn-lg btn-success " onclick="updateEmployee();">Update</a>
|
||||
<a href="#" class="btn btn-lg btn-primary " onclick="loadView(currentView);">Clear</a>
|
||||
<a href="#" class="btn btn-lg btn-danger " onclick="deleteEmployee();">Delete</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -1,219 +0,0 @@
|
||||
<!-- 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="#" data-nav_accion="registerWorkDays.php" ><span class="glyphicon glyphicon-tasks"></span> Management</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="modalErrorInternetConnection" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalError404" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalError500" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalErrorParsererror" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalErrorTimeout" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalErrorOther" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</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="modalServerResponseError" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderError">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h4 class="modal-title">An error has occurred</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p id="modalResponseError"></p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Cerrar</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="modalServerResponseSuccess" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header modalHeaderSuccess" id="modalHeaderServerResponseSuccess">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h4 class="modal-title">Success</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p id="serverResponseSuccess"></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>
|
||||
<script src="../js/bootstrap-datepicker.min.js"></script>
|
||||
<script src="../js/typeahead.bundle.js"></script>
|
||||
|
||||
<link href="../css/bootstrap-datepicker.min.css" rel="stylesheet">
|
||||
<link href="../css/landing.css" rel="stylesheet">
|
||||
@ -41,5 +41,4 @@
|
||||
</div>
|
||||
|
||||
<script src="../js/login.js"></script>
|
||||
<script src="../js/getBaseUrl.js"></script>
|
||||
<link href="../css/login.css" rel="stylesheet">
|
||||
@ -1,94 +0,0 @@
|
||||
<script src="../js/newEmployee.js"></script>
|
||||
<script src="../js/getBaseUrl.js"></script>
|
||||
|
||||
<form class="form-horizontal" id="newEmployeeForm">
|
||||
<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="col-md-6">
|
||||
<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="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="newEmployeeLastName">Last name</label>
|
||||
<div class="col-md-5">
|
||||
<input id="newEmployeeLastName" name="newEmployeeLastName" 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="newEmployeeBirthDate">Birth date</label>
|
||||
<div class="col-md-5">
|
||||
<input id="newEmployeeBirthDate" name="newEmployeeBirthDate" type="text" class="form-control input-md datepicker">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="newEmployeeEmail">Email</label>
|
||||
<div class="col-md-5">
|
||||
<input id="newEmployeeEmail" name="newEmployeeEmail" 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="newEmployeePhone">Phone</label>
|
||||
<div class="col-md-5">
|
||||
<input id="newEmployeePhone" name="newEmployeePhone" 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="newEmployeeType">Rol</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="newEmployeeType" id="newEmployeeType">
|
||||
<option>Employee type</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="NewEmpployyContractType">Contract type</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="NewEmpployyContractType" id="NewEmpployyContractType">
|
||||
<option>Contract type</option>
|
||||
<option value="INTERNO">interno</option>
|
||||
<option value="EXTERNO">Externo</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-md-offset-6">
|
||||
<div class="form-group">
|
||||
<a href="#" class="btn btn-lg btn-success " onclick="saveNewEmployee();">Create</a>
|
||||
<a href="#" class="btn btn-lg btn-primary " onclick="loadView(currentView);">Clear</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -1,143 +0,0 @@
|
||||
<script src="../js/getBaseUrl.js"></script>
|
||||
<script src="../js/registerWorkDays.js"></script>
|
||||
|
||||
<form class="form-horizontal" id="workDaysForm">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Managing work days</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<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">
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="workDaysEmployeeName">Name</label>
|
||||
<div class="col-md-5">
|
||||
<input id="workDaysEmployeeName" name="workDaysEmployeeName" 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="workDaysEmployeeRol">Rol</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="workDaysEmployeeRol" id="workDaysEmployeeRol" disabled>
|
||||
<option></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="workDaysEmployeeContractType">Contract type</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="workDaysEmployeeContractType" id="workDaysEmployeeContractType" disabled>
|
||||
<option>Contract type</option>
|
||||
<option value="INTERNO">interno</option>
|
||||
<option value="EXTERNO">Externo</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="workDaysEmployeeWorkedDay">Date</label>
|
||||
<div class="col-md-5">
|
||||
<input id="workDaysEmployeeWorkedDay" name="workDaysEmployeeWorkedDay" type="text" class="form-control input-md datepicker">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="workDaysEmployeeDeliveries">Deliveries</label>
|
||||
<div class="col-md-5">
|
||||
<input id="workDaysEmployeeDeliveries" name="workDaysEmployeeDeliveries" type="number" value="0" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="workDaysEmployeePerformedRol">Performed rol</label>
|
||||
<div class="col-md-5">
|
||||
<select class="form-control input-md" name="workDaysEmployeePerformedRol" id="workDaysEmployeePerformedRol" disabled>
|
||||
<option>Employee type</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</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>
|
||||
|
||||
|
||||
<div class="row" id="hidenEmployeeCodeForWorkDays">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="hidenEmployeeCodeForWorkDaysCode">Code</label>
|
||||
<div class="col-md-5">
|
||||
<input id="hidenEmployeeCodeForWorkDaysCode" name="hidenEmployeeCodeForWorkDaysCode" type="text" class="form-control input-md">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-md-offset-6">
|
||||
<div class="form-group">
|
||||
<a href="#" class="btn btn-lg btn-success " onclick="processSaveActionWorkDay();">Save</a>
|
||||
<a href="#" class="btn btn-lg btn-primary " onclick="loadView(currentView);">Clear</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@ -11,6 +11,8 @@ if (PHP_SAPI == 'cli-server') {
|
||||
|
||||
require __DIR__ . '/../vendor/autoload.php';
|
||||
|
||||
session_start();
|
||||
|
||||
// Instantiate the app
|
||||
$settings = require __DIR__ . '/../src/settings.php';
|
||||
$app = new \Slim\App($settings);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,217 +0,0 @@
|
||||
/**
|
||||
* Bootstrapping the starting actions for the module
|
||||
*/
|
||||
$(document).ready(function(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
loadEmployeeTypes();
|
||||
|
||||
$('.datepicker').datepicker({
|
||||
format: "yyyy/mm/dd",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
// Not to be edited
|
||||
$("#hidenEmployeeCode").hide();
|
||||
|
||||
// Setting up bloodhound typeahead
|
||||
let employeesList = new Bloodhound({
|
||||
datumTokenizer: Bloodhound.tokenizers.obj.whitespace("name"),
|
||||
queryTokenizer: Bloodhound.tokenizers.whitespace,
|
||||
remote: {
|
||||
'cache': false,
|
||||
url: baseUrl + '/api/employee/find',
|
||||
|
||||
replace: function(url, uriEncodedQuery) {
|
||||
|
||||
return url + '/' + uriEncodedQuery
|
||||
|
||||
},
|
||||
wildcard: '%QUERY',
|
||||
filter: function (data) {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
employeesList.initialize();
|
||||
|
||||
$("#editEmploySearch").typeahead({
|
||||
hint: true,
|
||||
highlight: true,
|
||||
minLength: 3
|
||||
},
|
||||
{
|
||||
name: "result",
|
||||
displayKey: "fullName",
|
||||
source: employeesList.ttAdapter()
|
||||
}).bind("typeahead:selected", function(obj, datum, name) {
|
||||
$(this).data("id", datum.code);
|
||||
loadEmployeeData(datum.code);
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Loads the the employee types into their select option
|
||||
*/
|
||||
function loadEmployeeTypes(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/types',
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$(data).each(function(i,v){
|
||||
$('#editEmployeeType').append(
|
||||
'<option value="' + v.id + '">'+ v.name + '</option>'
|
||||
);
|
||||
});
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches the employee data by its employee code and loads it
|
||||
* into the form to be edited and updated
|
||||
*
|
||||
* @param code string
|
||||
*/
|
||||
function loadEmployeeData(code){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/code/' + code,
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#editEmployeeFirstName').val(data['firstName']);
|
||||
$('#editEmployeeMiddleName').val(data['middleName']);
|
||||
$('#editEmployeeLastName').val(data['lastName']);
|
||||
$('#editEmployeeBirthDate').val(data['birthDate']);
|
||||
$('#editEmployeeCode').val(data['code']);
|
||||
$('#editEmployeeEmail').val(data['email']);
|
||||
$('#editEmployeePhone').val(data['phone']);
|
||||
$('#editEmployeeType').val(data['idEmployeeType']);
|
||||
$('#editEmployeeContractType').val(data['contractType']);
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Will change the status of an employee to remove them from the
|
||||
* active employee list
|
||||
*/
|
||||
function deleteEmployee(){
|
||||
let baseUrl = getbaseUrl();
|
||||
let code = $('#editEmployeeCode').val();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/' + code,
|
||||
type: 'DELETE',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#modalServerResponseSuccess').modal('show');
|
||||
document.getElementById('serverResponseSuccess').innerHTML = 'The employee ' + data['firstName'] + ' ' + data['middleName'] + ' ' + data['lastName'] + ' has been deleted.';
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function updateEmployee(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
let parameters = {
|
||||
"firstName":$('#editEmployeeFirstName').val(),
|
||||
"middleName":$('#editEmployeeMiddleName').val(),
|
||||
"lastName":$('#editEmployeeLastName').val(),
|
||||
"birthDate":$('#editEmployeeBirthDate').val(),
|
||||
"code":$('#editEmployeeCode').val(),
|
||||
"email":$('#editEmployeeEmail').val(),
|
||||
"phone":$('#editEmployeePhone').val(),
|
||||
"idEmployeeType":$('#editEmployeeType').val(),
|
||||
"contractType":$('#editEmployeeContractType').val()
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee',
|
||||
type: 'PUT',
|
||||
dataType: 'json',
|
||||
data: parameters,
|
||||
success:function(data){
|
||||
$('#modalServerResponseSuccess').modal('show');
|
||||
document.getElementById('serverResponseSuccess').innerHTML = 'The employee ' + data['fullName'] + ' has been updated.';
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
/**
|
||||
* 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/'));
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
// will contain the current loaded view
|
||||
let currentView;
|
||||
|
||||
/**
|
||||
* 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) {
|
||||
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 {
|
||||
$('#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){
|
||||
currentView = requestedView;
|
||||
|
||||
$("#newViewBody").hide().html(data).show('slow');
|
||||
},
|
||||
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 {
|
||||
$('#modal_error_otro').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reloads the last view that was accessed as a way of fully clearing and
|
||||
* resetting the values of the form
|
||||
*/
|
||||
function clearView(view){
|
||||
loadView(view);
|
||||
}
|
||||
@ -1,37 +1,24 @@
|
||||
/**
|
||||
* Maps the enter key to the login action
|
||||
*/
|
||||
$(document).keypress(function(e) {
|
||||
if(e.which == 13) {
|
||||
processLogin();
|
||||
}
|
||||
});
|
||||
function getbaseUrl(uriPath){
|
||||
var url = window.location.href;
|
||||
return url.substring(0, url.indexOf(uriPath));
|
||||
}
|
||||
|
||||
/**
|
||||
* 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() {
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
let parameters = {
|
||||
console.log(getbaseUrl('html/'));
|
||||
var parametros = {
|
||||
"userName":$('#userName').val(),
|
||||
"password":$('#password').val()
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/session/login',
|
||||
url: getbaseUrl('/html/') + '/index.php/api/session/login',
|
||||
type: 'POST',
|
||||
dataType: 'json',
|
||||
data: parameters,
|
||||
data: parametros,
|
||||
success:function(data){
|
||||
console.log(JSON.stringify(data));
|
||||
if(data["status"] == "success"){
|
||||
window.location.replace(baseUrl + '/html/landing.php');
|
||||
|
||||
redirect("http://stackoverflow.com");
|
||||
}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.";
|
||||
@ -44,4 +31,8 @@ function processLogin() {
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function redirect(url){
|
||||
window.location.replace(url);
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
/**
|
||||
* Bootstrapping the starting actions for the module
|
||||
*/
|
||||
$(document).ready(function(){
|
||||
loadEmployeeTypes();
|
||||
|
||||
$('.datepicker').datepicker({
|
||||
format: "yyyy/mm/dd",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
* Loads the the enmployee types into their select option
|
||||
*/
|
||||
function loadEmployeeTypes(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/types',
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$(data).each(function(i,v){
|
||||
$('#newEmployeeType').append(
|
||||
'<option value="' + v.id + '">'+ v.name + '</option>'
|
||||
);
|
||||
});
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function saveNewEmployee(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
let parameters = {
|
||||
"firstName":$('#newEmployeeFirstName').val(),
|
||||
"middleName":$('#newEmployeeMiddleName').val(),
|
||||
"lastName":$('#newEmployeeLastName').val(),
|
||||
"birthDate":$('#newEmployeeBirthDate').val(),
|
||||
"email":$('#newEmployeeEmail').val(),
|
||||
"phone":$('#newEmployeePhone').val(),
|
||||
"idEmployeeType":$('#newEmployeeType').val(),
|
||||
"contractType":$('#NewEmpployyContractType').val()
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee',
|
||||
type: 'POST',
|
||||
dataType: 'json',
|
||||
data: parameters,
|
||||
success:function(data){
|
||||
$('#modalServerResponseSuccess').modal('show');
|
||||
document.getElementById('serverResponseSuccess').innerHTML = 'The employee ' + data['fullName'] + ' has been created with the code ' + data['employeeCode'];
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#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');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -1,359 +0,0 @@
|
||||
/**
|
||||
* Bootstrapping the starting actions for the module
|
||||
*/
|
||||
$(document).ready(function(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
loadEmployeeTypesForWorkDays();
|
||||
|
||||
$('.datepicker').datepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
// Not to be edited
|
||||
$("#hidenEmployeeCodeForWorkDays").hide();
|
||||
|
||||
// Setting up bloodhound typeahead
|
||||
let employeesList = new Bloodhound({
|
||||
datumTokenizer: Bloodhound.tokenizers.obj.whitespace("name"),
|
||||
queryTokenizer: Bloodhound.tokenizers.whitespace,
|
||||
remote: {
|
||||
'cache': false,
|
||||
url: baseUrl + '/api/employee/find',
|
||||
|
||||
replace: function(url, uriEncodedQuery) {
|
||||
|
||||
return url + '/' + uriEncodedQuery
|
||||
|
||||
},
|
||||
wildcard: '%QUERY',
|
||||
filter: function (data) {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
employeesList.initialize();
|
||||
|
||||
$("#workDaysSearchEmployee").typeahead({
|
||||
hint: true,
|
||||
highlight: true,
|
||||
minLength: 3
|
||||
},
|
||||
{
|
||||
name: "result",
|
||||
displayKey: "fullName",
|
||||
source: employeesList.ttAdapter()
|
||||
}).bind("typeahead:selected", function(obj, datum, name) {
|
||||
$(this).data("id", datum.code);
|
||||
|
||||
loadEmployeeDataForWorkDays(datum.code);
|
||||
validateEmployeeCanDoOtherRoles(datum.code);
|
||||
loadSalaryDetails(datum.code);
|
||||
$('#hidenEmployeeCodeForWorkDaysCode').val(datum.code); // For future reference
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* Loads the the employee types into their select option
|
||||
*/
|
||||
function loadEmployeeTypesForWorkDays(){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/types',
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$(data).each(function(i,v){
|
||||
$('#workDaysEmployeeRol').append(
|
||||
'<option value="' + v.id + '">'+ v.name + '</option>'
|
||||
);
|
||||
|
||||
$('#workDaysEmployeePerformedRol').append(
|
||||
'<option value="' + v.id + '">'+ v.name + '</option>'
|
||||
);
|
||||
});
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Searches the employee data by its employee code and loads it
|
||||
* into the form to be edited and saved
|
||||
*
|
||||
* @param code string
|
||||
*/
|
||||
function loadEmployeeDataForWorkDays(code){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/code/' + code,
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
let fullName = data['firstName'] + ' ' + data['middleName'] + ' ' + data['lastName'];
|
||||
|
||||
$('#workDaysEmployeeName').val(fullName);
|
||||
$('#workDaysEmployeeRol').val(data['idEmployeeType']);
|
||||
$('#workDaysEmployeePerformedRol').val(data['idEmployeeType']);
|
||||
$('#workDaysEmployeeContractType').val(data['contractType']);
|
||||
},
|
||||
error:function(x,e) {
|
||||
let responseText = $.parseJSON(x["responseText"]);
|
||||
|
||||
if (x.status==0) {
|
||||
$('#modalErrorInternetConnection').modal('show');
|
||||
} else if(x.status==404) {
|
||||
$('#modalError404').modal('show');
|
||||
} else if(x.status==500) {
|
||||
$('#modalServerResponseError').modal('show');
|
||||
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||
} else if(e=='parsererror') {
|
||||
$('#modalErrorParsererror').modal('show');
|
||||
} else if(e=='timeout'){
|
||||
$('#modalErrorTimeout').modal('show');
|
||||
} else {
|
||||
$('#modalErrorOther').modal('show');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Based on the employee code determines their type to decide if
|
||||
* they should be able to cover for other roles or not
|
||||
*
|
||||
* @param code string
|
||||
*/
|
||||
function validateEmployeeCanDoOtherRoles(code){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/type/' + code,
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
if(data == 3){
|
||||
$("#workDaysEmployeePerformedRol").prop('disabled', false);
|
||||
}
|
||||
},
|
||||
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 loadSalaryDetails(code){
|
||||
let baseUrl = getbaseUrl();
|
||||
|
||||
$.ajax({
|
||||
url: baseUrl + '/api/employee/salary/' + code,
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#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"]);
|
||||
|
||||
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');
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 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');
|
||||
}
|
||||
},
|
||||
});
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4,24 +4,23 @@ namespace App\Application;
|
||||
use Exception;
|
||||
|
||||
class SessionApplication{
|
||||
private $session;
|
||||
private $pdo;
|
||||
private $cryptographyService;
|
||||
private $asserts;
|
||||
|
||||
function __construct($session, $mysql, $cryptographyService, $asserts){
|
||||
$this->session = $session;
|
||||
function __construct($mysql, $cryptographyService, $asserts){
|
||||
$this->cryptographyService = $cryptographyService;
|
||||
$this->pdo = $mysql;
|
||||
$this->asserts = $asserts;
|
||||
|
||||
$this->databaseSelectQueryErrorMessage = 'There was an error inserting the record.';
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
function verifySession(){
|
||||
$userName = $this->session->get('userName');
|
||||
return isset($userName);
|
||||
return isset($_SESSION['userName']);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -33,7 +32,7 @@ class SessionApplication{
|
||||
$session['loggedIn'] = $this->verifySession();
|
||||
|
||||
if($this->verifySession()){
|
||||
$session['userName'] = $this->session->get('userName');
|
||||
$session['userName'] = $_SESSION['userName'];
|
||||
}
|
||||
|
||||
return $session;
|
||||
@ -42,7 +41,6 @@ class SessionApplication{
|
||||
/**
|
||||
* @param $userName string
|
||||
* @return mixed
|
||||
* @throws Exception
|
||||
*/
|
||||
function getPassword($userName){
|
||||
$this->asserts->isNotEmpty($userName, "The username can't be empty");
|
||||
@ -53,7 +51,7 @@ class SessionApplication{
|
||||
$stmt->execute(array(':userName' => $userName));
|
||||
$results = $stmt->fetchAll();
|
||||
if(!$results){
|
||||
throw new Exception('The user or password didnt match, please try again.');
|
||||
exit($this->databaseSelectQueryErrorMessage);
|
||||
}
|
||||
$stmt = null;
|
||||
return $results[0]['password'];
|
||||
@ -86,12 +84,7 @@ class SessionApplication{
|
||||
}
|
||||
|
||||
if($this->cryptographyService->decryptPassword($password, $storedPassword)){
|
||||
$this->session->set('userName', $userName);
|
||||
|
||||
if(!$this->verifySession()){
|
||||
throw new Exception('An error occurred while trying to create the session.');
|
||||
}
|
||||
|
||||
$_SESSION['userName'] = $userName;
|
||||
return true;
|
||||
}
|
||||
else{
|
||||
@ -123,17 +116,12 @@ class SessionApplication{
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
* @throws Exception
|
||||
* @return string
|
||||
*/
|
||||
function destroySession(){
|
||||
$this->session->clear();
|
||||
session_destroy();
|
||||
|
||||
if($this->verifySession()){
|
||||
throw new Exception('An error occurred while trying to end the session.');
|
||||
}
|
||||
|
||||
return array('status' => 'success', 'message' => 'Successfully logged out.');
|
||||
return "Sucessfully logged out.";
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -18,13 +18,6 @@ $container['logger'] = function ($c) {
|
||||
return $logger;
|
||||
};
|
||||
|
||||
// Session handler
|
||||
$container['session'] = function ($container) {
|
||||
return new \Adbar\Session(
|
||||
$container->get('settings')['session']['namespace']
|
||||
);
|
||||
};
|
||||
|
||||
// Mysql connection
|
||||
$container['mysql'] = function ($c) {
|
||||
$mysqlSettings = $c->get('settings')['mysql'];
|
||||
@ -67,8 +60,7 @@ $container['asserts'] = function ($c) {
|
||||
|
||||
// The session application
|
||||
$container['sessionApplication'] = function ($c) {
|
||||
$sessionApplication = new App\Application\SessionApplication($c['session'], $c['mysql'],
|
||||
$c['cryptographyService'], $c['asserts']);
|
||||
$sessionApplication = new App\Application\SessionApplication($c['mysql'], $c['cryptographyService'], $c['asserts']);
|
||||
return $sessionApplication;
|
||||
};
|
||||
|
||||
@ -76,6 +68,6 @@ $container['sessionApplication'] = function ($c) {
|
||||
$container['employeeApplication'] = function ($c) {
|
||||
$employeeSettings = $c->get('settings')['employee'];
|
||||
$employeeApplication = new App\Application\EmployeeApplication($employeeSettings,
|
||||
$c['mysql'], $c['cryptographyService'], $c['asserts'], $c['sessionApplication']);
|
||||
$c['mysql'], $c['cryptographyService'], $c['asserts']);
|
||||
return $employeeApplication;
|
||||
};
|
||||
|
||||
@ -19,6 +19,4 @@ $app->add(new \Tuupola\Middleware\Cors([
|
||||
->withHeader("Content-Type", "application/json")
|
||||
->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
||||
}
|
||||
]));
|
||||
|
||||
$app->add(new \Adbar\SessionMiddleware($app->getContainer()->get('settings')['session']));
|
||||
]));
|
||||
@ -41,12 +41,10 @@ $app->get('/api/employee/types', function (Request $request, Response $response,
|
||||
->write(json_encode($this->employeeApplication->listEmployeeTypes()));
|
||||
});
|
||||
|
||||
$app->get('/api/employee/find/{partialName}', function (Request $request, Response $response, array $args) {
|
||||
$partialName = $args['partialName'];
|
||||
|
||||
$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->findEmployeeByFullName($partialName)));
|
||||
->write(json_encode($this->employeeApplication->listAllActiveEmployees()));
|
||||
});
|
||||
|
||||
$app->post('/api/employee', function ($request, $response) {
|
||||
@ -65,12 +63,12 @@ $app->put('/api/employee', function ($request, $response) {
|
||||
->write(json_encode($this->employeeApplication->updateEmployeeData($requestData)));
|
||||
});
|
||||
|
||||
$app->DELETE('/api/employee/{code}', function (Request $request, Response $response, array $args) {
|
||||
$code = $args['code'];
|
||||
$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($code)));
|
||||
->write(json_encode($this->employeeApplication->disableEmployeeRecord($idEmployee)));
|
||||
});
|
||||
|
||||
$app->get('/api/employee/type/{code}', function (Request $request, Response $response, array $args) {
|
||||
@ -95,37 +93,4 @@ $app->get('/api/employee/code/{code}', function (Request $request, Response $res
|
||||
return $response->withStatus(200)
|
||||
->withHeader('Content-Type', 'application/json')
|
||||
->write(json_encode($this->employeeApplication->getEmployeeDataByCode($code)));
|
||||
});
|
||||
|
||||
$app->post('/api/employee/workday', function ($request, $response) {
|
||||
$requestData = $request->getParsedBody();
|
||||
|
||||
return $response->withStatus(200)
|
||||
->withHeader('Content-Type', 'application/json')
|
||||
->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)));
|
||||
});
|
||||
});
|
||||
@ -56,55 +56,5 @@ class Asserts{
|
||||
throw new Exception($errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares a string against a regex to determine if it's an email
|
||||
*
|
||||
* @param $string string
|
||||
* @param $errorMessage string
|
||||
* @throws Exception
|
||||
*/
|
||||
function isEmail($string, $errorMessage){
|
||||
if(!filter_var($string, FILTER_VALIDATE_EMAIL)){
|
||||
throw new Exception($errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $string string
|
||||
* @param $array array
|
||||
* @param $errorMessage string
|
||||
* @throws Exception
|
||||
*/
|
||||
function existInArray($string, $array, $errorMessage){
|
||||
if(!in_array($string, $array)){
|
||||
throw new Exception($errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares two dates to dertermine if they have the same month
|
||||
*
|
||||
* @param $firstDate date
|
||||
* @param $secondDate date
|
||||
* @param $errorMessage string
|
||||
* @throws Exception
|
||||
*/
|
||||
function datesHaveSameMonth($firstDate, $secondDate, $errorMessage){
|
||||
if (date("m",strtotime($firstDate)) != date("m",strtotime($secondDate))){
|
||||
throw new Exception($errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $date
|
||||
* @param $errorMessage
|
||||
* @throws Exception
|
||||
*/
|
||||
function dateIsNotInTheFuture($date, $errorMessage){
|
||||
if ($date > date('Y-m-d')){
|
||||
throw new Exception($errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@ -16,35 +16,6 @@ return [
|
||||
'level' => \Monolog\Logger::DEBUG,
|
||||
],
|
||||
|
||||
// Session handle settings
|
||||
'session' => [
|
||||
// Session cookie settings
|
||||
'name' => 'payroll-laziness-rocks',
|
||||
'lifetime' => 10,
|
||||
'path' => '/',
|
||||
'domain' => null,
|
||||
'secure' => false,
|
||||
'httponly' => true,
|
||||
|
||||
// Set session cookie path, domain and secure automatically
|
||||
'cookie_autoset' => true,
|
||||
|
||||
// Path where session files are stored, PHP's default path will be used if set null
|
||||
'save_path' => null,
|
||||
|
||||
// Session cache limiter
|
||||
'cache_limiter' => 'nocache',
|
||||
|
||||
// Extend session lifetime after each user activity
|
||||
'autorefresh' => true,
|
||||
|
||||
// Encrypt session data if string is set
|
||||
'encryption_key' => '7de431684c34cf2c898268cff71392f38c4175dde050c9ee69502b81571484e0',
|
||||
|
||||
// Session namespace
|
||||
'namespace' => 'slim'
|
||||
],
|
||||
|
||||
// Cryptography settings
|
||||
'cryptography' => [
|
||||
'encryptionAlgorithm' => 'AES-256-CBC',
|
||||
@ -74,19 +45,6 @@ return [
|
||||
// Employee settings
|
||||
'employee' => [
|
||||
'codeLength' => '3',
|
||||
'contractTypes' => array('INTERNO', 'EXTERNO'),
|
||||
'hoursPerWorkDay' => 8,
|
||||
'paymentPerHour' => 30,
|
||||
'bonusPerDelivery' => 5,
|
||||
'perHourBonusDriver' => 10,
|
||||
'perHourBonusLoader' => 5,
|
||||
'perHourBonusAux' => 0,
|
||||
'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' => .04,
|
||||
],
|
||||
],
|
||||
];
|
||||
|
||||
@ -20,7 +20,7 @@ class BaseTestCase extends \PHPUnit_Framework_TestCase
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
protected $withMiddleware = false;
|
||||
protected $withMiddleware = true;
|
||||
|
||||
/**
|
||||
* Process the application given a request method and URI
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 MiB |
@ -1,22 +0,0 @@
|
||||
================
|
||||
``The database``
|
||||
================
|
||||
|
||||
.. contents::
|
||||
|
||||
About the container
|
||||
--------------------
|
||||
|
||||
The database container is created in two stages to bypass some limitations with docker, firstly a new image will be created based on the Dockerfile which will be based on mysql 5.7 and it'll be passed the .sql scripts to initialize the database as well as a config file to configure the port that will be exposed.
|
||||
|
||||
Initializing
|
||||
-------------
|
||||
When the database is being created as an image it'll take all the scripts in the **/docker-entrypoint-initdb.d** directory and execute them in alphabetical order which will result in the database with its tables and initial data being created.
|
||||
|
||||
Accession
|
||||
----------
|
||||
The newly created container will have two users *root** and **sloth** both of which will have the password **12345678** and it'll be accessible in the port 3307
|
||||
|
||||
Persistence
|
||||
-----------
|
||||
A volume containing the data from **/var/lib/mysql** will be created to persist the information, once its created running the container build again will execute the starting scripts
|
||||
@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `persons` (
|
||||
`lastName` varbinary(500) comment 'The last name of the person',
|
||||
`birthDate` DATE NOT NULL DEFAULT '1900-01-01' comment 'Date of birth of the person',
|
||||
`email` varbinary(500) NOT NULL comment 'The email adress of the person',
|
||||
`phone` BIGINT(10) UNSIGNED NOT NULL comment 'The phone number of the person should be the mobile one but leaves room for home ones',
|
||||
`phone` INT(10) UNSIGNED NOT NULL comment 'The phone number of the person should be the mobile one but leaves room for home ones',
|
||||
`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',
|
||||
@ -71,44 +71,5 @@ 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`)
|
||||
);
|
||||
|
||||
DROP TABLE IF EXISTS paymentsPerEmployeePerDay;
|
||||
CREATE TABLE IF NOT EXISTS `paymentsPerEmployeePerDay` (
|
||||
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`idEmployee` INT UNSIGNED NOT NULL comment 'The employee to who this payment will be made',
|
||||
`date` DATE NOT NULL DEFAULT '1900-01-01' comment 'Date of the worked day',
|
||||
`baseAmount` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Amount paid for the hours worked',
|
||||
`bonusTime` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Bonus paid for the hours worked',
|
||||
`deliveries` DOUBLE(10,2) NOT NULL DEFAULT 0.0 comment 'Bonus for the number of deliveries',
|
||||
`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 (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)
|
||||
);
|
||||
@ -6,7 +6,7 @@ services:
|
||||
ports:
|
||||
- "8085:80"
|
||||
volumes:
|
||||
- ./volumes/apache-logs:/var/log/apache2
|
||||
- api-payroll:/var/www/site
|
||||
depends_on:
|
||||
- mysql
|
||||
mysql:
|
||||
@ -18,11 +18,11 @@ services:
|
||||
ports:
|
||||
- "3307:3307"
|
||||
volumes:
|
||||
- ./volumes/mysql-data:/var/lib/mysql
|
||||
- my-datavolume:/var/lib/mysql
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: '12345678'
|
||||
MYSQL_USER: 'sloth'
|
||||
MYSQL_PASS: '12345678'
|
||||
volumes:
|
||||
mysql-data:
|
||||
apache-logs:
|
||||
api-payroll:
|
||||
my-datavolume:
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
================
|
||||
Documentation
|
||||
================
|
||||
|
||||
.. contents::
|
||||
|
||||
Requirements
|
||||
----------------------------------
|
||||
Funtional:
|
||||
- A user name and password auth
|
||||
- Encrypted sensitive data
|
||||
- The employee need to have their full name captured
|
||||
- The last name must tolerate being null
|
||||
- An email will be needed for the employee
|
||||
- The email format must be formated
|
||||
- Employees will need a phone number
|
||||
- Searching employees despite the encryption
|
||||
- Employees must have a unique code to reference them
|
||||
- Being able to modify the name, email and phone values of already existing employees
|
||||
- Having the values for the different payments parametrized
|
||||
- Allowing for employees to perform other roles during their work day
|
||||
- Only for the auxiliary personnel
|
||||
- Taking into account only the current month for the salary
|
||||
- Reducing the taxes for the salary
|
||||
- If it goes beyond the threshold a different percentage is paid in taxes
|
||||
- The way the extra tax is handled should be parametrized
|
||||
|
||||
|
||||
Funtional:
|
||||
- Session management
|
||||
- Data integrity
|
||||
- Data security
|
||||
- Accessible through web
|
||||
- Containerized
|
||||
|
||||
Software behaivor
|
||||
-----------------
|
||||
In:
|
||||
- Employee details
|
||||
- First name
|
||||
- Middle name
|
||||
- Last name
|
||||
- Birth date
|
||||
- Email
|
||||
- Phone number
|
||||
- Work per day
|
||||
- Number of deliveries
|
||||
- Rol performed
|
||||
Process:
|
||||
- Register a new employee
|
||||
- Modify employee
|
||||
- Search employee
|
||||
- Add new work day for employee
|
||||
- Calculate monthly payment for employee
|
||||
|
||||
Out:
|
||||
- Upon registering
|
||||
- Employee code
|
||||
- In the work days registry
|
||||
- Raw salary for the the month
|
||||
- Taxes discounted
|
||||
- Real salary for the month
|
||||
- Vouchers (if applicable)
|
||||
|
||||
Calculating the monthly salary
|
||||
--------------------------------
|
||||
.. image:: https://raw.githubusercontent.com/PootisPenserHere/payroll_manager/master/documentation/calculatingSalary.bmp
|
||||
|
||||
Tests cases
|
||||
-----------------
|
||||
+----+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
|
||||
| Id | Description | Input | Expected output |
|
||||
+----+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
|
||||
| 1 | Displaying current salary for the outgoing month | Selecting an employee from the search field | On the right side of the window a break down of the employee's salary for the month will be displayed |
|
||||
+----+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
|
||||
| 2 | Submitting incomplete form | All of the input but one of the fields | An error shown in a red modal describing the missing field |
|
||||
+----+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
|
||||
| 3 | Altering the sent data to change the performed rol to one that can't be done by the employee | A employee other than aux performing a different rol than their own | An error displaying that the employee can't perform that task |
|
||||
+----+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------+
|
||||
|
||||
Executed tests
|
||||
---------------
|
||||
+----+----------------------------------------------------------------------------------------------+--------------------------------------------------------------------------+------------------+
|
||||
| Id | Description | Result | What went wrong? |
|
||||
+----+----------------------------------------------------------------------------------------------+--------------------------------------------------------------------------+------------------+
|
||||
| 1 | Displaying current salary for the outgoing month | When the employee was selected the current salary was loaded succesfully | |
|
||||
+----+----------------------------------------------------------------------------------------------+--------------------------------------------------------------------------+------------------+
|
||||
| 2 | Submitting incomplete form | Got the error "The number of deliveries cannot be empty or 0" | |
|
||||
+----+----------------------------------------------------------------------------------------------+--------------------------------------------------------------------------+------------------+
|
||||
| 3 | Altering the sent data to change the performed rol to one that can't be done by the employee | Got the error "The selected rol can't be done by this type of employee" | |
|
||||
+----+----------------------------------------------------------------------------------------------+--------------------------------------------------------------------------+------------------+
|
||||
|
||||
Tools
|
||||
----------------------------------
|
||||
The following tools and software were used:
|
||||
- phpstorm
|
||||
- git
|
||||
- docker && docker-compose
|
||||
- Ubuntu 16
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 MiB |
2
volumes/.gitignore
vendored
2
volumes/.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
mysql-data/
|
||||
apache-logs/
|
||||
@ -1 +0,0 @@
|
||||
# Do not delete this directory, it'll contain the volumes created by the containers
|
||||
Loading…
Reference in New Issue
Block a user