Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d522a21
css added
hiranlowe Jan 1, 2020
0d5e94a
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
hiranlowe Jan 1, 2020
1f7a7dd
db updated
minullamahewage Jan 1, 2020
5fb4ce6
Pay Grade Report CSS
kavindaperera Jan 1, 2020
f8a69e8
Leaves by Department for Given Period Report css
kavindaperera Jan 1, 2020
a951b82
Welcome Logo
kavindaperera Jan 1, 2020
e0182c3
css'
kavindaperera Jan 1, 2020
693cb55
added css
hiranlowe Jan 1, 2020
9cb4883
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
hiranlowe Jan 1, 2020
ce8b993
updated sql file with DB roles & users
JudeRanidu Jan 2, 2020
0bf562e
user access
minullamahewage Jan 2, 2020
9e8c1a9
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
0cfed1a
css added
hiranlowe Jan 2, 2020
d267e09
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
4ba68b1
link added
hiranlowe Jan 2, 2020
cb50839
css added
hiranlowe Jan 2, 2020
03c43df
link removed data
hiranlowe Jan 2, 2020
7270f5c
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
033d704
login page fixed
kavindaperera Jan 2, 2020
471279f
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
kavindaperera Jan 2, 2020
4ab9905
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
368b330
vendor login
kavindaperera Jan 2, 2020
683153c
change tp validation
hiranlowe Jan 2, 2020
73b0354
updated sql query
minullamahewage Jan 2, 2020
1f427d7
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
08a16bd
fixed validaition message
minullamahewage Jan 2, 2020
78dd2d4
updated emp telephone
minullamahewage Jan 2, 2020
a04b7ea
validation view added
hiranlowe Jan 2, 2020
de8a237
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
404236d
age changed
hiranlowe Jan 2, 2020
899295e
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
4d81460
fixed date
minullamahewage Jan 2, 2020
02d95b7
validation nic corrected
hiranlowe Jan 2, 2020
5591296
edited css
minullamahewage Jan 2, 2020
6a42925
Merge branch 'master' of https://github.com/minullamahewage/hrmanagement
minullamahewage Jan 2, 2020
1a8beab
form edited
hiranlowe Jan 2, 2020
b8d4880
form edited 2
hiranlowe Jan 2, 2020
879b86c
emergency contact changed
hiranlowe Jan 2, 2020
f178cd2
fixed user access and fixed dependent
minullamahewage Jan 2, 2020
47f8f88
Bump symfony/http-kernel from 5.0.1 to 5.1.5
dependabot[bot] Sep 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
573 changes: 448 additions & 125 deletions composer.lock

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions config/packages/security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ security:
- { path: ^/empcustom, roles: [ROLE_ADMIN, ROLE_MANAGER] }
- { path: ^/empdata, roles: ROLE_ADMIN }
- { path: ^/employhistory/emp, roles: ROLE_USER }
- { path: ^/employhistory, roles: ROLE_ADMIN }
- { path: ^/employhistory/new, roles: ROLE_ADMIN }
- { path: ^/employhistory, roles: [ROLE_ADMIN, ROLE_MANAGER] }
- { path: ^/employmentstatus/new, roles: ROLE_ADMIN }
- { path: ^/employmentstatus, roles: [ROLE_ADMIN, ROLE_MANAGER] }
- { path: ^/emptelephone, roles: ROLE_ADMIN }
Expand All @@ -68,8 +69,10 @@ security:
- { path: ^/leave/admin, roles: ROLE_ADMIN }
- { path: ^/leavelimit, roles: ROLE_ADMIN }
- { path: ^/leavetype, roles: ROLE_ADMIN }
- { path: ^/paygrade, roles: ROLE_ADMIN }
# - { path: ^/register, roles: ROLE_ADMIN }
- { path: ^/paygrade/new, roles: ROLE_ADMIN }
- { path: ^/paygrade, roles: [ROLE_ADMIN, ROLE_MANAGER] }
- { path: ^/register, roles: ROLE_ADMIN }
- { path: ^/report, roles: ROLE_ADMIN}



4 changes: 3 additions & 1 deletion hrmanagement.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: localhost
-- Generation Time: Jan 01, 2020 at 05:00 PM
-- Generation Time: Jan 01, 2020 at 05:04 PM
-- Server version: 10.4.11-MariaDB
-- PHP Version: 7.4.1

Expand All @@ -21,6 +21,8 @@ SET time_zone = "+00:00";
--
-- Database: `hrmanagement`
--
CREATE DATABASE IF NOT EXISTS `hrmanagement` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
USE `hrmanagement`;

-- --------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion public/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ iframe {
display: block;
width: 100%;
position: absolute;
top: 16px;
top: -2px;
left: 0px;
padding-left: 5px;

Expand Down
Loading